wip: create external account and user

lib/routes/index.js

@@ -69,7 +69,8 @@ module.exports = function(crowi, app) {
 
   // OAuth
   app.post('/_api/admin/security/passport-google', loginRequired(crowi, app) , middleware.adminRequired() , csrf, form.admin.securityPassportGoogle, admin.api.securityPassportGoogleSetting);
-  // app.get('/auth/passport/google/callback', loginPassport.loginPassportGoogleCallback);
+  app.get('/passport/google', loginPassport.loginPassportGoogle);
+  app.get('/passport/google/callback', loginPassport.loginPassportGoogleCallback);
 
   // markdown admin
   app.get('/admin/markdown'                   , loginRequired(crowi, app) , middleware.adminRequired() , admin.markdown.index);

lib/routes/login-passport.js

@@ -239,10 +239,34 @@ module.exports = function(crowi, app) {
     })(req, res, next);
   };
 
+  const loginPassportGoogle = function(req, res) {
+    if (!passportService.isGoogleStrategySetup) {
+      debug('GoogleStrategy has not been set up');
+      return;
+    }
+
+    passport.authenticate('google', {
+      scope: ['profile']
+    })(req, res);
+  };
+
+  const loginPassportGoogleCallback = function(req, res, next) {
+    console.log('loginPassportGoogleCallback');
+    passport.authenticate('google', { failureRedirect: '/login' }, (req, res) => {
+      // Do something here
+      console.log(req, '---------req')
+      console.log(res, '---------res')
+
+    })(req, res, next);
+    return res.redirect('/');
+  };
+
   return {
     loginFailure,
     loginWithLdap,
     testLdapCredentials,
     loginWithLocal,
+    loginPassportGoogle,
+    loginPassportGoogleCallback,
   };
 };

lib/service/passport.js

@@ -2,7 +2,8 @@ const debug = require('debug')('growi:service:PassportService');
 const passport = require('passport');
 const LocalStrategy = require('passport-local').Strategy;
 const LdapStrategy = require('passport-ldapauth');
-const GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
+// const GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
+const GoogleStrategy = require('passport-google-oauth20').Strategy;
 
 /**
  * the service class of Passport
@@ -264,31 +265,20 @@ class PassportService {
 
     debug('GoogleStrategy: setting up..');
 
-    // passport.use(new LdapStrategy(this.getLdapConfigurationFunc(config, {passReqToCallback: true}),
-    //   (req, ldapAccountInfo, done) => {
-    //     debug('LDAP authentication has succeeded', ldapAccountInfo);
-
-    //     // store ldapAccountInfo to req
-    //     req.ldapAccountInfo = ldapAccountInfo;
-
-    //     done(null, ldapAccountInfo);
-    //   }
-    // ));
-    console.log(config.crowi['security:passport-google:clientId'])
-    console.log(config.crowi['security:passport-google:clientSecret'])
-
     passport.use(new GoogleStrategy({
       clientID: config.crowi['security:passport-google:clientId'],
       clientSecret: config.crowi['security:passport-google:clientSecret'],
-      callbackURL: '/auth/passport/google/callback',
-    },
-    function(accessToken, refreshToken, profile, done) {
-      console.log(profile)
-      // User.findOrCreate({ googleId: profile.id }, function(err, user) {
-      //   return done(err, user);
-      // });
-    }
-    ));
+      callbackURL: '/passport/google/callback',
+    }, function(accessToken, refreshToken, profile, done) {
+      // Do something here
+      console.log(profile);
+      if (profile) {
+        return done(null, profile);
+      }
+      else {
+        return done(null, false);
+      }
+    }));
 
     this.isGoogleStrategySetup = true;
     debug('GoogleStrategy: setup is done');

lib/views/login.html

@@ -148,11 +148,10 @@
         <hr>
         <div class="input-group m-t-15 m-b-10 mx-auto d-flex flex-row justify-content-around flex-wrap">
           {#% if passportGoogleLoginEnabled() %#}
-          <form role="form" action="/auth/passport/google" method="get">
-            <input type="hidden" name="_csrf" value="{{ csrf() }}">
+          <form role="form" action="/passport/google" method="get">
             <button type="submit" class="fcbtn btn btn-danger btn-1b btn-login-google">
               <span class="btn-label"><i class="icon-social-google"></i></span>
-              {{ t('Sign in') }}(passport)
+              {{ t('Sign in') }}
             </button>
             <div class="small text-right">by Google Account</div>
           </form>