Merge pull request #232 from FlowFuse/customHostname

Make the oauth callback URL relative
FlowFuse · May 24, 2024 · 5d685d8 · 5d685d8
2 parents d1519b3 + 73375ea
commit 5d685d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/auth/adminAuth.js b/lib/auth/adminAuth.js
@@ -13,7 +13,7 @@ module.exports = (options) => {
     const forgeURL = options.forgeURL
     const baseURL = options.baseURL
 
-    const callbackURL = `${baseURL}/auth/strategy/callback`
+    const callbackURL = '/auth/strategy/callback'
     const authorizationURL = `${forgeURL}/account/authorize`
     const tokenURL = `${forgeURL}/account/token`
     const userInfoURL = `${forgeURL}/api/v1/user`

diff --git a/lib/auth/httpAuthMiddleware.js b/lib/auth/httpAuthMiddleware.js
@@ -95,7 +95,7 @@ module.exports = {
         // any path
 
         const nodeUrl = new URL(options.baseURL)
-        const callbackURL = `${nodeUrl.origin}/_ffAuth/callback`
+        const callbackURL = '/_ffAuth/callback'
         const authorizationURL = `${options.forgeURL}/account/authorize`
         const tokenURL = `${options.forgeURL}/account/token`
         const userInfoURL = `${options.forgeURL}/api/v1/user`