@things-factory/auth-google 6.1.186 → 6.1.188

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-google",
-  "version": "6.1.186",
+  "version": "6.1.188",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -34,5 +34,5 @@
     "passport": "^0.6.0",
     "passport-google-oauth20": "^2.0.0"
   },
-  "gitHead": "ddf508496cdd7d4b9d0e020703a2f7a586a42ec5"
+  "gitHead": "ae62986a327cfe158261052f0ae4f4586d4de55c"
 }

package/server/controllers/sync-user-info.ts

@@ -16,11 +16,11 @@ export async function syncAllUserInfo(authProvider: AuthProvider, context: Resol
     }
   }).then(res => res.json())
 
-  latestData.value
-    .filter(({ mail }) => mail)
-    .forEach(async user => {
+  for (const user of latestData.value) {
+    if (user.mail) {
       await updateUserInfo(authProvider, user, context)
-    })
+    }
+  }
 }
 
 export async function updateUserInfo(authProvider: AuthProvider, userInfo, context: ResolverContext) {

package/server/middlewares/google-authenticate-middleware.ts

@@ -8,27 +8,35 @@ const SSOGoogleConfig = config.get('sso/google/config')
 
 if (SSOGoogleConfig) {
   passport.use(
-    new GoogleStrategy(SSOGoogleConfig, async (token, tokenSecret, profile, done) => {
-      if (!profile) {
-        return done(new Error('No profile found'), null)
-      }
+    new GoogleStrategy(
+      {
+        ...SSOGoogleConfig,
+        scope: ['profile', 'https://www.googleapis.com/auth/userinfo.email']
+      },
+      async (token, tokenSecret, profile, done) => {
+        if (!profile) {
+          return done(new Error('No profile found'), null)
+        }
 
-      try {
-        const { email } = profile
+        try {
+          const { emails, photos } = profile
+          const email = emails?.[0].value
+          const photo = photos?.[0].value
 
-        const user = await User.checkAuthWithEmail({ email })
+          const user = await User.checkAuthWithEmail({ email })
 
-        const { id, userType, status } = user
+          const { id, userType, status } = user
 
-        return done(null, {
-          id,
-          userType,
-          status
-        })
-      } catch (error) {
-        return done(error)
+          return done(null, {
+            id,
+            userType,
+            status
+          })
+        } catch (error) {
+          return done(error)
+        }
       }
-    })
+    )
   )
 }
 

package/server/routes.ts

@@ -21,7 +21,7 @@ if (SSOGoogleConfig) {
     globalPublicRouter.get(
       '/auth/signin-with-google',
       passport.authenticate('google', {
-        scope: ['https://www.googleapis.com/auth/plus.login']
+        scope: ['profile', 'https://www.googleapis.com/auth/userinfo.email']
       })
     )
   })