Shun Miyazawa 3 лет назад
Родитель
Сommit
b7d53a73ef
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      packages/app/src/server/routes/login-passport.js

+ 6 - 6
packages/app/src/server/routes/login-passport.js

@@ -106,12 +106,6 @@ module.exports = function(crowi, app) {
       }
     });
 
-    // check for redirection to '/invited'
-    const redirectTo = req.user.status === User.STATUS_INVITED ? '/invited' : req.session.redirectTo;
-
-    // remove session.redirectTo
-    delete req.session.redirectTo;
-
     const parameters = {
       ip:  req.ip,
       endpoint: req.originalUrl,
@@ -128,6 +122,12 @@ module.exports = function(crowi, app) {
       return res.redirect('/');
     }
 
+    // check for redirection to '/invited'
+    const redirectTo = req.user.status === User.STATUS_INVITED ? '/invited' : req.session.redirectTo;
+
+    // remove session.redirectTo
+    delete req.session.redirectTo;
+
     return res.apiv3({ redirectTo });
   };