Hotfix: fix google login

Author: velopert

velog-backend/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dev": "NODE_PATH=src APP_ENV=local nodemon --inspect src/local --exec babel-node --plugins transform-es2015-modules-commonjs,transform-object-rest-spread,transform-async-to-generator --presets flow",
-    "dev:local": "NODE_PATH=src POSTGRES_HOST=localhost nodemon --inspect src/local --exec babel-node --plugins transform-es2015-modules-commonjs,transform-object-rest-spread,transform-async-to-generator --presets flow",
+    "dev:local": "NODE_PATH=src NODE_ENV=development nodemon --inspect src/local --exec babel-node --plugins transform-es2015-modules-commonjs,transform-object-rest-spread,transform-async-to-generator --presets flow",
     "migrate": "NODE_PATH=src babel-node src/scripts/migrate --plugins transform-es2015-modules-commonjs,transform-object-rest-spread,transform-async-to-generator --presets flow",
     "migrate:dev": "NODE_PATH=src POSTGRES_HOST=localhost babel-node src/scripts/migrate --plugins transform-es2015-modules-commonjs,transform-object-rest-spread,transform-async-to-generator --presets flow",
     "deploy:dev": "sls deploy --stage dev",
@@ -56,7 +56,7 @@
     "feed": "^2.0.1",
     "filesize": "^3.6.1",
     "github": "^13.1.0",
-    "googleapis": "^34.0.0",
+    "googleapis": "^44.0.0",
     "joi": "^13.0.2",
     "json-diff": "^0.5.2",
     "jsonwebtoken": "^8.1.0",
@@ -67,7 +67,7 @@
     "koa-router": "^7.3.0",
     "lodash": "^4.17.4",
     "mailgun-js": "^0.13.1",
-    "marked": "^0.5.2",
+    "marked": "^0.7.0",
     "mime-types": "^2.1.18",
     "nodemon": "^1.12.1",
     "pg": "^7.4.1",

velog-backend/src/lib/getSocialProfile.js

@@ -51,36 +51,21 @@ const profileGetters = {
       };
     });
   },
-  google(accessToken: string): Promise<Profile> {
-    const plus = google.plus({
-      version: 'v1',
-      auth: process.env.GOOGLE_SECRET,
-    });
-    return new Promise((resolve, reject) => {
-      plus.people.get(
-        {
-          userId: 'me',
-          access_token: accessToken,
-        },
-        (err, auth) => {
-          if (err) {
-            reject(err);
-            return;
-          }
-          const {
-            id, image, emails, displayName,
-          } = auth.data;
-
-          const profile = {
-            id,
-            thumbnail: image.url,
-            email: emails[0].value,
-            name: displayName && displayName.split(' (')[0],
-          };
-          resolve(profile);
-        },
-      );
+  async google(accessToken: string): Promise<Profile> {
+    const people = google.people('v1');
+    const profile = await people.people.get({
+      access_token: accessToken,
+      resourceName: 'people/me',
+      personFields: 'names,emailAddresses,photos',
     });
+    const { data } = profile;
+    const socialProfile = {
+      email: data.emailAddresses[0].value || null,
+      name: data.names[0].displayName || 'emptyname',
+      thumbnail: data.photos[0].url || null,
+      id: data.resourceName.replace('people/', ''),
+    };
+    return socialProfile;
   },
 };
 

velog-backend/src/router/auth/callback/callback.ctrl.js

@@ -102,7 +102,10 @@ export const redirectGoogleLogin: Middleware = (ctx) => {
   );
 
   const url = oauth2Client.generateAuthUrl({
-    scope: ['https://www.googleapis.com/auth/userinfo.email'],
+    scope: [
+      'https://www.googleapis.com/auth/userinfo.email',
+      'https://www.googleapis.com/auth/userinfo.profile',
+    ],
     state: JSON.stringify({ next: next || '/trending' }),
   });
 
@@ -139,7 +142,7 @@ export const googleCallback: Middleware = async (ctx) => {
     }
     const { access_token } = tokens;
     const hash = crypto.randomBytes(40).toString('hex');
-    await redisClient.set(hash, access_token, 'EX', 30);
+    await redisClient.set(hash, access_token, 'EX', 300);
     let nextUrl = `${baseUrl}callback?type=google&key=${hash}`;
     if (state) {
       const { next } = JSON.parse(state);