feat: authentication lib integration

.gitignore

@@ -9,3 +9,6 @@ dist/*
 .idea/
 .vscode/
 www/
+
+.yalc
+yalc.lock

Dockerfile

@@ -31,13 +31,15 @@ COPY main.go .
 RUN go build -o ./reactapp
 
 
-FROM ghcr.io/bento-platform/bento_base_image:plain-debian-2024.03.01
+FROM ghcr.io/bento-platform/bento_base_image:node-debian-2024.03.01
 
 ENV BENTO_PUBLIC_PACKAGE_JSON_PATH=/bento-public/package.json
 WORKDIR /bento-public
 
 COPY entrypoint.bash .
 COPY package.json .
+COPY create_config_prod.js .
+COPY run.bash .
 
 # Copy web app
 COPY --from=nodebuilder /node/build/www /bento-public/www
@@ -46,4 +48,4 @@ COPY --from=nodebuilder /node/build/www /bento-public/www
 COPY --from=gobuilder /build/reactapp /bento-public/reactapp
 
 ENTRYPOINT [ "/bin/bash", "./entrypoint.bash" ]
-CMD [ "./reactapp" ]
+CMD ["bash", "./run.bash"]

create_config_prod.js

@@ -0,0 +1,22 @@
+const parseBoolean = (value) => ["true", "1", "yes"].includes((value || "").toLocaleLowerCase());
+
+const siteConfig = {
+    CLIENT_NAME: process.env.BENTO_PUBLIC_CLIENT_NAME || null,
+    PORTAL_URL: process.env.BENTO_PUBLIC_PORTAL_URL || null,
+    TRANSLATED: parseBoolean(process.env.BENTO_PUBLIC_TRANSLATED),
+    BEACON_URL: process.env.BEACON_URL || null,
+    BEACON_UI_ENABLED: parseBoolean(process.env.BENTO_BEACON_UI_ENABLED),
+
+    // Authentication
+    PUBLIC_URL: process.env.BENTO_PUBLIC_URL || null,
+    CLIENT_ID: process.env.CLIENT_ID || null,
+    OPENID_CONFIG_URL: process.env.OPENID_CONFIG_URL || null,
+};
+
+if (typeof require !== "undefined" && require.main === module) {
+    process.stdout.write(`BENTO_PUBLIC_CONFIG = ${JSON.stringify(siteConfig, null, 2)};\n`);
+}
+
+module.exports = {
+    siteConfig,
+};

main.go

@@ -21,17 +21,13 @@ const ConfigLogTemplate = `Config --
 	Service ID: %s
 	package.json: %s
 	Static Files: %s
-	Client Name: %s
 	Katsu URL: %v
 	Gohan URL: %v
-	Bento Portal Url: %s
 	Port: %d
-	Translated: %t
-	Beacon URL: %s
-	Beacon UI enabled: %t
 `
 
 type BentoConfig struct {
+	// App configs
 	ServiceId       string `envconfig:"BENTO_PUBLIC_SERVICE_ID"`
 	PackageJsonPath string `envconfig:"BENTO_PUBLIC_PACKAGE_JSON_PATH" default:"./package.json"`
 	StaticFilesPath string `envconfig:"BENTO_PUBLIC_STATIC_FILES_PATH" default:"./www"`
@@ -40,9 +36,6 @@ type BentoConfig struct {
 	GohanUrl        string `envconfig:"BENTO_PUBLIC_GOHAN_URL"`
 	BentoPortalUrl  string `envconfig:"BENTO_PUBLIC_PORTAL_URL"`
 	Port            int    `envconfig:"INTERNAL_PORT" default:"8090"`
-	Translated      bool   `envconfig:"BENTO_PUBLIC_TRANSLATED" default:"true"`
-	BeaconUrl       string `envconfig:"BEACON_URL"`
-	BeaconUiEnabled bool   `envconfig:"BENTO_BEACON_UI_ENABLED"`
 }
 
 type JsonLike map[string]interface{}
@@ -112,14 +105,9 @@ func main() {
 		cfg.ServiceId,
 		cfg.PackageJsonPath,
 		cfg.StaticFilesPath,
-		cfg.ClientName,
 		cfg.KatsuUrl,
 		cfg.GohanUrl,
-		cfg.BentoPortalUrl,
 		cfg.Port,
-		cfg.Translated,
-		cfg.BeaconUrl,
-		cfg.BeaconUiEnabled,
 	)
 
 	// Set up HTTP client
@@ -292,7 +280,13 @@ func main() {
 
 	// Begin MVC Routes
 	// -- Root : static files
-	e.Use(middleware.Static(cfg.StaticFilesPath))
+	e.Use(middleware.StaticWithConfig(middleware.StaticConfig{
+		Root: cfg.StaticFilesPath,
+		// Enable HTML5 mode by forwarding all not-found requests to root so that
+		// SPA (single-page application) can handle the routing.
+		// Required for react-router BrowserRouter fallback
+		HTML5: true,
+	}))
 
 	// -- GA4GH-compatible service information response
 	e.GET("/service-info", func(c echo.Context) error {
@@ -321,6 +315,7 @@ func main() {
 	// purges expired items every 10 minutes
 	var katsuCache = cache.New(5*time.Minute, 10*time.Minute)
 
+	// TODO: rm
 	e.GET("/config", func(c echo.Context) error {
 		// restore from cache if present/not expired
 		publicOverview, err := getKatsuPublicOverview(c, katsuCache)
@@ -329,15 +324,11 @@ func main() {
 		}
 
 		return c.JSON(http.StatusOK, JsonLike{
-			"clientName":         cfg.ClientName,
 			"maxQueryParameters": publicOverview["max_query_parameters"],
-			"portalUrl":          cfg.BentoPortalUrl,
-			"translated":         cfg.Translated,
-			"beaconUrl":          cfg.BeaconUrl,
-			"beaconUiEnabled":    cfg.BeaconUiEnabled,
 		})
 	})
 
+	// TODO: rm
 	e.GET("/overview", func(c echo.Context) error {
 		// restore from cache if present/not expired
 		publicOverview, err := getKatsuPublicOverview(c, katsuCache)
@@ -348,6 +339,7 @@ func main() {
 		return c.JSON(http.StatusOK, JsonLike{"overview": publicOverview})
 	})
 
+	// TODO: rm
 	// get request handler for /katsu that relays the request to the Katsu API and returns response
 	e.GET("/katsu", func(c echo.Context) error {
 		// get query parameters
@@ -362,12 +354,14 @@ func main() {
 		return katsuRequest("/api/public", qs, c, jsonDeserialize)
 	})
 
+	// TODO: rm
 	e.GET("/fields", func(c echo.Context) error {
 		// Query Katsu for publicly available search fields
 		// TODO: formalize response type
 		return katsuRequestBasic("/api/public_search_fields", c)
 	})
 
+	// TODO: rm
 	e.GET("/provenance", func(c echo.Context) error {
 		// Query Katsu for datasets provenance
 		return katsuRequestBasic("/api/public_dataset", c)