change how redirection works after signing in

uselagoon · Jan 16, 2024 · 3c99eb4 · 3c99eb4
1 parent 8cff175
commit 3c99eb4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/server.js b/server.js
@@ -188,6 +188,14 @@ app
     // organizations end
 
     server.get('*', (req, res) => {
+      const { query } = req;
+
+      const redirect = query.redirect;
+
+      if (redirect) {
+        return res.redirect(301, redirect);
+      }
+
       return handle(req, res);
     });
 

diff --git a/src/lib/withKeycloak.js b/src/lib/withKeycloak.js
@@ -35,11 +35,17 @@ export default (App, initialAuth) => {
 
       if (!keycloak.authenticated) {
         const urlQuery = queryStringToObject(location.search);
-        const options = urlQuery.idpHint ? { idpHint: urlQuery.idpHint } : {};
+
+        const options = {
+          redirectUri: `${window.location.origin}?redirect=${location.pathname}`,
+        };
+
+        if (urlQuery.idpHint) {
+          options['idpHint'] = urlQuery.idpHint;
+        }
 
         await keycloak.login(options);
       }
-
       this.setAuth(keycloak);
     }