delete comments

lib/routes/login-passport.js

@@ -244,22 +244,6 @@ module.exports = function(crowi, app) {
       debug('GoogleStrategy has not been set up');
       return;
     }
-    // ExternalAccount.findOrRegister('google', '101297323158972859647')
-    //     .catch((err) => {
-    //       throw err;
-    //     })
-    //     .then((externalAccount) => {
-    //       return externalAccount.getPopulatedUser();
-    //     })
-    //     .then((user) => {
-    //       // login
-    //       req.logIn(user, (err) => {
-    //         if (err) { console.log(err) }
-    //         else {
-    //           return loginSuccess(req, res, user);
-    //         }
-    //       });
-    //     });
 
     passport.authenticate('google', {
       scope: ['profile']
@@ -268,24 +252,29 @@ module.exports = function(crowi, app) {
 
   const loginPassportGoogleCallback = function(req, res, next) {
     passport.authenticate('google', {failureRedirect: '/login'}, (request, response) => {
-      ExternalAccount.findOrRegister('google', response.id, response.displayName, `${response.name.givenName} ${response.name.familyName}`)
-        .catch((err) => {
-          throw err;
-        })
-        .then((externalAccount) => {
-          return externalAccount.getPopulatedUser();
-        })
-        .then((user) => {
-          // login
-          req.logIn(user, err => {
-            if (err) {
-              return next();
-            }
-            else {
-              return loginSuccess(req, res, user);
-            }
-          });
+      ExternalAccount.findOrRegister(
+        'google',
+        response.id,
+        response.displayName,
+        `${response.name.givenName} ${response.name.familyName}`
+      )
+      .catch((err) => {
+        throw err;
+      })
+      .then((externalAccount) => {
+        return externalAccount.getPopulatedUser();
+      })
+      .then((user) => {
+        // login
+        req.logIn(user, err => {
+          if (err) {
+            return next();
+          }
+          else {
+            return loginSuccess(req, res, user);
+          }
         });
+      });
     })(req, res, next);
   };