@waline/vercel 1.2.3 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "description": "vercel server for waline comment system",
   "repository": "https://github.com/walinejs/waline",
   "license": "MIT",
@@ -12,16 +12,16 @@
     "deta": "^1.0.1",
     "dompurify": "^2.3.3",
     "fast-csv": "^4.3.6",
-    "jsdom": "^17.0.0",
+    "jsdom": "^18.0.0",
     "jsonwebtoken": "^8.5.1",
-    "katex": "^0.13.18",
+    "katex": "^0.13.23",
     "leancloud-storage": "^4.12.0",
     "markdown-it": "^12.2.0",
     "markdown-it-emoji": "^2.0.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
     "mathjax-full": "^3.2.0",
-    "nodemailer": "^6.6.5",
+    "nodemailer": "^6.7.0",
     "nunjucks": "^3.2.3",
     "phpass": "^0.1.1",
     "prismjs": "^1.25.0",
@@ -35,6 +35,6 @@
     "think-mongo": "^2.1.2",
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.14",
-    "ua-parser-js": "^0.7.28"
+    "ua-parser-js": "^0.7.31"
   }
 }

package/src/config/config.js

@@ -17,6 +17,7 @@ const {
   AVATAR_PROXY,
   GITHUB_TOKEN,
   DETA_PROJECT_KEY,
+  OAUTH_URL,
 
   MARKDOWN_CONFIG = '{}',
   MARKDOWN_HIGHLIGHT,
@@ -91,6 +92,8 @@ if (AVATAR_PROXY) {
   avatarProxy = !isFalse(AVATAR_PROXY) ? AVATAR_PROXY : '';
 }
 
+const oauthUrl = OAUTH_URL || 'https://user.75.team';
+
 module.exports = {
   workers: 1,
   storage,
@@ -100,6 +103,7 @@ module.exports = {
   secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : undefined,
   disableUserAgent: !isFalse(DISABLE_USERAGENT),
   avatarProxy,
+  oauthUrl,
   markdown,
   mailSubject: MAIL_SUBJECT,
   mailTemplate: MAIL_TEMPLATE,

package/src/controller/comment.js

@@ -19,7 +19,7 @@ async function formatCmt(
   }
 
   const user = users.find(({ objectId }) => user_id === objectId);
-  if (user) {
+  if (!think.isEmpty(user)) {
     comment.nick = user.display_name;
     comment.mail = user.email;
     comment.link = user.url;
@@ -70,6 +70,7 @@ module.exports = class extends BaseRest {
               'link',
               'mail',
               'nick',
+              'url',
               'pid',
               'rid',
               'ua',
@@ -256,7 +257,7 @@ module.exports = class extends BaseRest {
     if (pid) {
       data.comment = data.comment.replace(
         '<p>',
-        `<p><a class="at" href="#${pid}">@${at}</a> , `
+        `<p><a class="at" href="#${pid}">@${at}</a>: `
       );
     }
 

package/src/controller/oauth.js

@@ -1,5 +1,7 @@
+const qs = require('querystring');
 const jwt = require('jsonwebtoken');
 const { PasswordHash } = require('phpass');
+const request = require('request-promise-native');
 module.exports = class extends think.Controller {
   constructor(ctx) {
     super(ctx);
@@ -9,16 +11,50 @@ module.exports = class extends think.Controller {
     );
   }
 
-  async githubAction() {
-    const instance = this.service('auth/github', this);
-    const userInfo = await instance.getUserInfo();
-    const { github, avatar } = userInfo;
+  async indexAction() {
+    const { code, type, redirect } = this.get();
+    const { oauthUrl } = this.config();
 
-    const userByGithub = await this.modelInstance.select({ github });
+    if (!code) {
+      const { protocol, host } = this.ctx;
+      const redirectUrl = `${protocol}://${host}/oauth?${qs.stringify({
+        redirect,
+        type,
+      })}`;
+      return this.redirect(
+        `${oauthUrl}/${type}?${qs.stringify({ redirect: redirectUrl })}`
+      );
+    }
 
-    if (!think.isEmpty(userByGithub)) {
-      const { redirect } = this.get();
-      const token = jwt.sign(userByGithub[0].email, this.config('jwtKey'));
+    /**
+     * user = { id, name, email, avatar,url };
+     */
+    const params = { code };
+    if (type === 'facebook') {
+      const { protocol, host } = this.ctx;
+      const redirectUrl = `${protocol}://${host}/oauth?${qs.stringify({
+        redirect,
+        type,
+      })}`;
+      params.state = qs.stringify({ redirect: redirectUrl, state: '' });
+    }
+
+    const user = await request({
+      url: `${oauthUrl}/${type}?${qs.stringify(params)}`,
+      method: 'GET',
+      json: true,
+      headers: {
+        'User-Agent': '@waline',
+      },
+    });
+    if (!user || !user.id) {
+      return this.fail();
+    }
+
+    const userBySocial = await this.modelInstance.select({ [type]: user.id });
+
+    if (!think.isEmpty(userBySocial)) {
+      const token = jwt.sign(userBySocial[0].email, this.config('jwtKey'));
 
       if (redirect) {
         return this.redirect(
@@ -29,19 +65,16 @@ module.exports = class extends think.Controller {
       return this.success();
     }
 
-    if (!userInfo.email) {
-      //generator a fake email if github user have no email
-      userInfo.email = `${userInfo.github}@mail.github`;
+    if (!user.email) {
+      user.email = `${user.id}@mail.${type}`;
     }
 
-    const { email } = userInfo;
     const current = this.ctx.state.userInfo;
-
     if (!think.isEmpty(current)) {
-      const updateData = { github };
+      const updateData = { [type]: user.id };
 
-      if (!current.avatar) {
-        updateData.avatar = github.avatar;
+      if (!current.avatar && user.avatar) {
+        updateData.avatar = user.avatar;
       }
 
       await this.modelInstance.update(updateData, {
@@ -51,27 +84,30 @@ module.exports = class extends think.Controller {
       return this.success();
     }
 
-    const userByEmail = await this.modelInstance.select({ email });
+    const userByEmail = await this.modelInstance.select({ email: user.email });
     if (think.isEmpty(userByEmail)) {
       const count = await this.modelInstance.count();
       const data = {
-        ...userInfo,
+        display_name: user.name,
+        email: user.email,
+        url: user.url,
+        avatar: user.avatar,
+        [type]: user.id,
         password: new PasswordHash().hashPassword(Math.random()),
         type: think.isEmpty(count) ? 'administrator' : 'guest',
       };
 
       await this.modelInstance.add(data);
     } else {
-      const updateData = { github };
+      const updateData = { [type]: user.id };
 
-      if (!userByEmail.avatar) {
-        updateData.avatar = avatar;
+      if (!userByEmail.avatar && user.avatar) {
+        updateData.avatar = user.avatar;
       }
-      await this.modelInstance.update(updateData, { email });
+      await this.modelInstance.update(updateData, { email: user.email });
     }
 
-    const { redirect } = this.get();
-    const token = jwt.sign(email, this.config('jwtKey'));
+    const token = jwt.sign(user.email, this.config('jwtKey'));
 
     if (redirect) {
       return this.redirect(

package/src/logic/base.js

@@ -43,7 +43,21 @@ module.exports = class extends think.Logic {
 
     const user = await this.modelInstance.select(
       { email: userMail },
-      { field: ['email', 'url', 'display_name', 'type', 'github', 'avatar'] }
+      {
+        field: [
+          'email',
+          'url',
+          'display_name',
+          'type',
+          'github',
+          'twitter',
+          'facebook',
+          'google',
+          'weibo',
+          'qq',
+          'avatar',
+        ],
+      }
     );
     if (think.isEmpty(user)) {
       return;

package/src/logic/comment.js

@@ -205,4 +205,30 @@ module.exports = class extends Base {
       return this.ctx.throw(401);
     }
   }
+
+  /**
+   * @api {POST} /comment/:id update comment data
+   * @apiGroup Comment
+   * @apiVersion  0.0.1
+   *
+   * @apiParam  {String}  [nick] post comment user nick name
+   * @apiParam  {String}  [mail]  post comment user mail address
+   * @apiParam  {String}  [link]  post comment user link
+   * @apiParam  {String}  [comment]  post comment text
+   * @apiParam  {String}  [url]  the artcile url path of comment
+   *
+   * @apiSuccess  (200) {Number}  errno 0
+   * @apiSuccess  (200) {String}  errmsg  return error message if error
+   */
+  putAction() {}
+
+  /**
+   * @api {DELETE} /comment/:id delete comment
+   * @apiGroup Comment
+   * @apiVersion  0.0.1
+   *
+   * @apiSuccess  (200) {Number}  errno 0
+   * @apiSuccess  (200) {String}  errmsg  return error message if error
+   */
+  deleteAction() {}
 };

package/src/logic/token.js

@@ -12,7 +12,7 @@ module.exports = class extends Base {
    * @apiSuccess  (200) {String}  data.avatar user avatar
    * @apiSuccess  (200) {String}  data.createdAt user register time
    * @apiSuccess  (200) {String}  data.display_name user nick name
-   * @apiSuccess  (200) {String}  data.emal user email address
+   * @apiSuccess  (200) {String}  data.email user email address
    * @apiSuccess  (200) {String}  data.github user github account name
    * @apiSuccess  (200) {String}  data.mailMd5 user mail md5
    * @apiSuccess  (200) {String}  data.objectId user id

package/src/logic/user.js

@@ -21,10 +21,10 @@ module.exports = class extends Base {
    * @apiGroup User
    * @apiVersion  0.0.1
    *
-   * @apiParam  {String}  display_name  user new nick name
-   * @apiParam  {String}  url user new link
-   * @apiParam  {String}  password user new password
-   * @apiParam  {String}  github user github account name
+   * @apiParam  {String}  [display_name]  user new nick name
+   * @apiParam  {String}  [url] user new link
+   * @apiParam  {String}  [password] user new password
+   * @apiParam  {String}  [github] user github account name
    *
    * @apiSuccess  (200) {Number}  errno 0
    * @apiSuccess  (200) {String}  errmsg  return error message if error

package/src/middleware/dashboard.js

@@ -1,10 +1,4 @@
-const { GITHUB_ID, GITHUB_SECRET } = process.env;
-
 module.exports = function () {
-  const socials = [['github', GITHUB_ID && GITHUB_SECRET]]
-    .filter(([, condition]) => condition)
-    .map(([name]) => name);
-
   return (ctx) => {
     ctx.type = 'html';
     ctx.body = `<!doctype html>
@@ -18,7 +12,6 @@ module.exports = function () {
     <script>
     window.SITE_URL = ${JSON.stringify(process.env.SITE_URL)};
     window.SITE_NAME = ${JSON.stringify(process.env.SITE_NAME)};
-    window.ALLOW_SOCIALS = ${JSON.stringify(socials)};
     </script>
     <script src="https://cdn.jsdelivr.net/npm/@waline/admin"></script>
   </body>

package/src/service/notify.js

@@ -242,7 +242,9 @@ module.exports = class extends think.Service {
       }
     }
 
-    const disallowList = ['github'].map((social) => 'mail.' + social);
+    const disallowList = ['github', 'twitter', 'facebook'].map(
+      (social) => 'mail.' + social
+    );
     const fakeMail = new RegExp(`@(${disallowList.join('|')})$`, 'i');
     if (parent && !fakeMail.test(parent.mail) && comment.status !== 'waiting') {
       mailList.push({

package/src/service/storage/github.js

@@ -31,6 +31,11 @@ const CSV_HEADERS = {
     'url',
     'avatar',
     'github',
+    'twitter',
+    'facebook',
+    'google',
+    'weibo',
+    'qq',
     'createdAt',
     'updatedAt',
   ],

package/src/service/auth/base.js

@@ -1,31 +0,0 @@
-const { parse } = require('url');
-
-module.exports = class extends think.Service {
-  constructor(app) {
-    super(app);
-    this.app = app;
-  }
-
-  getCompleteUrl(url = '') {
-    if (url.slice(0, 4) === 'http') {
-      try {
-        const { host } = parse(url);
-
-        if (this.app.host.toLowerCase() !== host.toLowerCase()) {
-          throw new Error(403);
-        }
-
-        return url;
-      } catch (err) {
-        // ignore error
-      }
-    }
-    const protocol = this.app.header('x-forwarded-proto') || 'http';
-
-    if (!/^\//.test(url)) {
-      url = `/${url}`;
-    }
-
-    return `${protocol}://${this.app.ctx.host}${url}`;
-  }
-};

package/src/service/auth/github.js

@@ -1,97 +0,0 @@
-const qs = require('querystring');
-const request = require('request-promise-native');
-const Base = require('./base');
-
-const OAUTH_URL = 'https://github.com/login/oauth/authorize';
-const ACCESS_TOKEN_URL = 'https://github.com/login/oauth/access_token';
-const USER_INFO_URL = 'https://api.github.com/user';
-const USER_EMAILS = 'https://api.github.com/user/emails';
-const { GITHUB_ID, GITHUB_SECRET } = process.env;
-module.exports = class extends Base {
-  getAuthUrl(opts) {
-    const params = {
-      client_id: GITHUB_ID,
-      redirect_uri: opts.rdUrl,
-      scope: 'read:user,user:email',
-    };
-    return OAUTH_URL + '?' + qs.stringify(params);
-  }
-
-  async getAccessToken(opts) {
-    const params = {
-      client_id: GITHUB_ID,
-      client_secret: GITHUB_SECRET,
-      code: opts.code,
-    };
-
-    const body = await request.post({
-      url: ACCESS_TOKEN_URL,
-      headers: { Accept: 'application/json' },
-      form: params,
-      json: true,
-    });
-
-    return body;
-  }
-
-  async getUserInfoByToken(opts) {
-    const userInfo = await request.get({
-      url: USER_INFO_URL,
-      headers: {
-        'User-Agent': '@waline',
-        Authorization: 'token ' + opts.access_token,
-      },
-      json: true,
-    });
-
-    if (!userInfo.email) {
-      const emails = await request.get({
-        url: USER_EMAILS,
-        headers: {
-          'User-Agent': '@waline',
-          Authorization: 'token ' + opts.access_token,
-        },
-        json: true,
-      });
-
-      if (emails.length) {
-        userInfo.email = emails[0].email;
-      }
-    }
-
-    return {
-      github: userInfo.login,
-      display_name: userInfo.name,
-      email: userInfo.email,
-      url: userInfo.blog,
-      avatar: userInfo.avatar_url,
-    };
-  }
-
-  async redirect() {
-    const { app } = this;
-    const { redirect, state } = app.get();
-    const rdUrlAfterLogin = this.getCompleteUrl(redirect);
-
-    const params = { redirect: rdUrlAfterLogin, state };
-    const signinUrl =
-      this.getCompleteUrl('/oauth/github') + '?' + qs.stringify(params);
-    const AUTH_URL = this.getAuthUrl({ rdUrl: signinUrl });
-
-    app.redirect(AUTH_URL);
-
-    return app.success();
-  }
-
-  async getUserInfo() {
-    const { code } = this.app.get();
-
-    if (!code) {
-      return this.redirect();
-    }
-
-    const accessTokenInfo = await this.getAccessToken({ code });
-
-    return this.getUserInfoByToken(accessTokenInfo);
-  }
-};