Merge pull request #234 from checkr/zz/change-web-prefix

Use web prefix for main API
openflagr · Mar 20, 2019 · 8f3c10d · 8f3c10d
2 parents c3ef755 + 88c5da0
commit 8f3c10d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/browser/flagr-ui/config/prod.env.js b/browser/flagr-ui/config/prod.env.js
@@ -1,6 +1,6 @@
 module.exports = {
   NODE_ENV: '"production"',
-  API_URL: '"/api/v1"',
+  API_URL: '"api/v1"',
 
   // ',' separated string
   // For example

diff --git a/pkg/config/env.go b/pkg/config/env.go
@@ -167,6 +167,9 @@ var Config = struct {
 	// "HS256" and "RS256" supported
 	JWTAuthSigningMethod string `env:"FLAGR_JWT_AUTH_SIGNING_METHOD" envDefault:"HS256"`
 
-	// WebPrefix - base path for web
+	// WebPrefix - base path for web and API
+	// e.g. FLAGR_WEB_PREFIX=/foo
+	// UI path  => localhost:18000/foo"
+	// API path => localhost:18000/foo/api/v1"
 	WebPrefix string `env:"FLAGR_WEB_PREFIX" envDefault:""`
 }{}
diff --git a/pkg/config/middleware.go b/pkg/config/middleware.go
@@ -86,6 +86,10 @@ func SetupGlobalMiddleware(handler http.Handler) http.Handler {
 
 	n.Use(setupRecoveryMiddleware())
 
+	if Config.WebPrefix != "" {
+		handler = http.StripPrefix(Config.WebPrefix, handler)
+	}
+
 	if Config.PProfEnabled {
 		n.UseHandler(pprof.New()(handler))
 	} else {