Merge pull request #146 from nuts-foundation/fix-double-slashes

Fix double slashes in redirect URL, if base URL ends with a slash
nuts-foundation · Jan 25, 2025 · 5fb80bb · 5fb80bb
2 parents 55d7fa1 + c60a937
commit 5fb80bb
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/oidc/oidc.go b/oidc/oidc.go
@@ -30,11 +30,9 @@ func Setup(config Config, baseURL string, e *echo.Echo, authConfig AuthConfig) e
 		baseURL: baseURL,
 	}
 
-	if o.baseURL == "" {
-		o.baseURL = "/"
-	}
-	o.signInUrl = fmt.Sprintf("%s/auth/%s", o.baseURL, name)
-	o.callbackURL = fmt.Sprintf("%s/auth/%s/callback", o.baseURL, name)
+	normalizedBaseUrl := strings.TrimRight(baseURL, "/")
+	o.signInUrl = fmt.Sprintf("%s/auth/%s", normalizedBaseUrl, name)
+	o.callbackURL = fmt.Sprintf("%s/auth/%s/callback", normalizedBaseUrl, name)
 
 	authConfig.redirectURL = o.signInUrl