fix(Auth): Fix google login timeout

LearningLocker · Mar 13, 2020 · 53e7a57 · 53e7a57
1 parent 39080a9
commit 53e7a57
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/api/src/controllers/AuthController.js b/api/src/controllers/AuthController.js
@@ -262,14 +262,14 @@ const jwtOrganisation = (req, res) => {
   }
 };
 
-const googleSuccess = (req, res) => {
+const googleSuccess = (user, response) => {
   // we have successfully signed into google
   // create a JWT and set it in the query params (only way to return it with a redirect)
-  createUserJWT(req.user, 'google')
-    .then(token => res.redirect(`/api${AUTH_JWT_SUCCESS}?access_token=${token}`))
+  createUserJWT(user, 'google')
+    .then(token => response.redirect(`/api${AUTH_JWT_SUCCESS}?access_token=${token}`))
     .catch(
       (err) => {
-        res
+        response
           .status(status.INTERNAL_SERVER_ERROR)
           .send(err);
       }

diff --git a/api/src/routes/HttpRoutes.js b/api/src/routes/HttpRoutes.js
@@ -151,13 +151,15 @@ if (process.env.GOOGLE_ENABLED) {
         'google',
         DEFAULT_PASSPORT_OPTIONS,
         (error, user, info) => {
+          const defaultErrorMessage = 'Something bad happened';
+
           if (!user) {
-            response.redirect(`/api${routes.OAUTH2_FAILED}?error=${info.message}`);
+            response.redirect(`/api${routes.OAUTH2_FAILED}?error=${get(info, 'message', defaultErrorMessage)}`);
 
             return;
           }
 
-          AuthController.googleSuccess(request, response);
+          AuthController.googleSuccess(user, response);
         },
       )(request, response, next);
     },