feat(vercel): add avatar return support

walinejs · Jan 10, 2021 · 1ab3c9f · 1ab3c9f
1 parent 79f7966
commit 1ab3c9f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 12 deletions.
diff --git a/packages/server/src/config/config.js b/packages/server/src/config/config.js
@@ -13,7 +13,8 @@ const {
   TENCENTCLOUD_SECRETKEY,
   TCB_KEY,
   SECURE_DOMAINS,
-  DISABLE_USERAGENT
+  DISABLE_USERAGENT,
+  AVATAR_PROXY
 } = process.env;
 
 let storage = 'leancloud';
@@ -52,5 +53,6 @@ module.exports = {
   forbiddenWords,
   disallowIPList: [],
   secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : undefined,
-  disableUserAgent: DISABLE_USERAGENT && !['0', 'false'].includes(DISABLE_USERAGENT.toLowerCase())
+  disableUserAgent: DISABLE_USERAGENT && !['0', 'false'].includes(DISABLE_USERAGENT.toLowerCase()),
+  avatarProxy: AVATAR_PROXY || 'https://avatar.75cdn.workers.dev/'
 };
diff --git a/packages/server/src/controller/comment.js b/packages/server/src/controller/comment.js
@@ -17,7 +17,7 @@ marked.setOptions({
   smartypants: true
 });
 
-async function formatCmt({ua, user_id, ip, ...comment}, users = []) {
+async function formatCmt({ua, user_id, ip, ...comment}, users = [], {avatarProxy}) {
   ua = parser(ua);
   if(!think.config('disableUserAgent')) {
     comment.browser = [ua.browser.name, ua.browser.version].filter(v => v).join(' ');
@@ -26,11 +26,19 @@ async function formatCmt({ua, user_id, ip, ...comment}, users = []) {
 
   if(user_id) {
     const user = users.find(({objectId}) => user_id === objectId);
+
     if(user) {
       comment.nick = user.display_name;
       comment.mail = user.email;
       comment.link = user.link;
       comment.type = user.type;
+
+      if(user.avatar) {
+        if(/(github)/i.test(user.avatar)) {
+          user.avatar = avatarProxy + '?url=' + encodeURIComponent(user.avatar);
+        }
+        comment.avatar = user.avatar;
+      }
     }
   }
   comment.mail = helper.md5(comment.mail);
@@ -77,11 +85,11 @@ module.exports = class extends BaseRest {
         let users = [];
         if(user_ids.length) {
           users = await userModel.select({objectId: ['IN',  user_ids]}, {
-            field: ['display_name', 'email', 'url', 'type']
+            field: ['display_name', 'email', 'url', 'type', 'avatar']
           });
         }
 
-        return this.json(await Promise.all(comments.map(cmt => formatCmt(cmt, users))));
+        return this.json(await Promise.all(comments.map(cmt => formatCmt(cmt, users, this.config()))));
       }
 
       case 'count': {
@@ -147,7 +155,7 @@ module.exports = class extends BaseRest {
         let users = [];
         if(user_ids.length) {
           users = await userModel.select({objectId: ['IN',  user_ids]}, {
-            field: ['display_name', 'email', 'url', 'type']
+            field: ['display_name', 'email', 'url', 'type', 'avatar']
           });
         }
 
@@ -160,10 +168,10 @@ module.exports = class extends BaseRest {
           totalPages: Math.ceil(rootCount / pageSize),
           pageSize,
           data: await Promise.all(rootComments.map(async comment => {
-            const cmt = await formatCmt(comment, users);
+            const cmt = await formatCmt(comment, users, this.config());
             cmt.children = await Promise.all(comments
               .filter(({rid}) => rid === cmt.objectId)
-              .map(cmt => formatCmt(cmt, users)));
+              .map(cmt => formatCmt(cmt, users, this.config())));
             return cmt;
           }))
         });
@@ -249,7 +257,7 @@ module.exports = class extends BaseRest {
     }
 
     await this.hook('postSave', resp, pComment);
-    return this.success(await formatCmt(resp, [ this.ctx.state.userInfo ]));
+    return this.success(await formatCmt(resp, [ this.ctx.state.userInfo ], this.config()));
   }
 
   async putAction() {

diff --git a/packages/server/src/controller/oauth.js b/packages/server/src/controller/oauth.js
@@ -9,7 +9,7 @@ module.exports = class extends think.Controller {
   async githubAction() {
     const instance = this.service('auth/github', this);
     const userInfo = await instance.getUserInfo();
-    const {github} = userInfo;
+    const {github, avatar} = userInfo;
 
     const userByGithub = await this.modelInstance.select({github});
     if(!think.isEmpty(userByGithub)) {
@@ -30,7 +30,12 @@ module.exports = class extends think.Controller {
     const {email} = userInfo;
     const current = this.ctx.state.userInfo;
     if(!think.isEmpty(current)) {
-      await this.modelInstance.update({github}, {objectId: current.objectId});
+      const updateData = {github};
+      if(!current.avatar) {
+        updateData.avatar = github.avatar;
+      }
+
+      await this.modelInstance.update(updateData, {objectId: current.objectId});
       return this.success();
     }
 
@@ -44,7 +49,11 @@ module.exports = class extends think.Controller {
       };
       await this.modelInstance.add(data);
     } else {
-      await this.modelInstance.update({github}, {email});
+      const updateData = {github};
+      if(!userByEmail.avatar) {
+        updateData.avatar = avatar;
+      }
+      await this.modelInstance.update(updateData, {email});
     }
 
     const {redirect} = this.get();

diff --git a/packages/server/src/controller/token.js b/packages/server/src/controller/token.js
@@ -25,6 +25,12 @@ module.exports = class extends BaseRest {
       return this.fail();
     }
 
+    let avatar = users[0].avatar;
+    if(/(github)/i.test(avatar)) {
+      avatar = this.config('avatarProxy') + '?url=' + encodeURIComponent(avatar);
+    }
+    users[0].avatar = avatar;
+
     return this.success({
       ...user[0], 
       password: null,