feat(authentication): redirect after first authentication step instea…

…d of returning the url (#508)
ForestAdmin · Nov 24, 2020 · be4e1e4 · be4e1e4
1 parent d5a98b2
commit be4e1e4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/routes/authentication.js b/src/routes/authentication.js
@@ -48,12 +48,12 @@ async function startAuthentication(context, request, response, next) {
     const renderingId = getAndCheckRenderingId(request, context);
 
     const originalUrl = context.requestAnalyzerService.extractOriginalUrlWithoutQuery(request);
-    response.json(
-      await context.authenticationService.startAuthentication(
-        `${originalUrl}/callback`,
-        { renderingId },
-      ),
+    const result = await context.authenticationService.startAuthentication(
+      `${originalUrl}/callback`,
+      { renderingId },
     );
+
+    response.redirect(result.authorizationUrl);
   } catch (e) {
     next(e);
   }
@@ -130,4 +130,5 @@ function initAuthenticationRoutes(
 }
 
 initAuthenticationRoutes.PUBLIC_ROUTES = PUBLIC_ROUTES;
+initAuthenticationRoutes.CALLBACK_ROUTE = CALLBACK_AUTHENTICATION_ROUTE;
 module.exports = initAuthenticationRoutes;
diff --git a/test/routes/authentication.test.js b/test/routes/authentication.test.js
@@ -73,16 +73,14 @@ describe('routes > authentication', () => {
         const expectedScope = 'openid email profile';
         const expectedCallback = `${test.url}/callback`;
 
-        expect(receivedResponse.status).toBe(200);
-        expect(JSON.parse(receivedResponse.text)).toStrictEqual({
-          authorizationUrl: `https://app.forestadmin.com/oidc/authorization?client_id=${
-            encodeURI(expectedId)
-          }&scope=${
-            encodeURIComponent(expectedScope)
-          }&response_type=code&redirect_uri=${
-            encodeURIComponent(expectedCallback)
-          }&state=${encodeURIComponent(JSON.stringify({ renderingId: 42 }))}`,
-        });
+        expect(receivedResponse.status).toBe(302);
+        expect(receivedResponse.headers.location).toStrictEqual(`https://app.forestadmin.com/oidc/authorization?client_id=${
+          encodeURI(expectedId)
+        }&scope=${
+          encodeURIComponent(expectedScope)
+        }&response_type=code&redirect_uri=${
+          encodeURIComponent(expectedCallback)
+        }&state=${encodeURIComponent(JSON.stringify({ renderingId: 42 }))}`);
       } finally {
         sandbox.restore();
       }