@waline/vercel 1.36.4 → 1.37.0

package/__tests__/xss.spec.js

@@ -3,8 +3,7 @@ import { describe, expect, it } from 'vitest';
 
 import { sanitize } from '../src/service/markdown/xss';
 
-const parser = (content) =>
-  sanitize(new MarkdownIt({ html: true }).render(content));
+const parser = (content) => sanitize(new MarkdownIt({ html: true }).render(content));
 
 describe('XSS test', () => {
   it('Should render', () => {
@@ -36,20 +35,16 @@ Waline is a good framework. :money:
   });
 
   it('Should protect', () => {
-    expect(parser(`<img src="x" onerror="alert('img')">`)).toEqual(
-      '<img src="x">',
-    );
+    expect(parser(`<img src="x" onerror="alert('img')">`)).toEqual('<img src="x">');
     expect(parser('<script>alert("hello world")</script>')).toEqual('');
 
     expect(
-      parser(
-        '<p>Waline is <iframe//src=jaVa&Tab;script:alert(3)></iframe>awesome</p>',
-      ),
+      parser('<p>Waline is <iframe//src=jaVa&Tab;script:alert(3)></iframe>awesome</p>'),
     ).toEqual('<p>Waline is awesome</p>');
 
-    expect(
-      parser('<p>Waline is <iframe//src=jaVa&Tab;script:alert(3)>awesome</p>'),
-    ).toEqual('<p>Waline is </p>');
+    expect(parser('<p>Waline is <iframe//src=jaVa&Tab;script:alert(3)>awesome</p>')).toEqual(
+      '<p>Waline is </p>',
+    );
   });
 
   it('Should resolve unmatching html tags', () => {
@@ -78,11 +73,7 @@ Waline is a good framework. :money:
     expect(parser('[link](https://example.com)')).toEqual(
       '<p><a href="https://example.com" target="_blank" rel="nofollow noreferrer noopener">link</a></p>\n',
     );
-    expect(
-      parser(
-        '<p><a href="https://example.com" rel="opener prefetch">link</a></p>',
-      ),
-    ).toEqual(
+    expect(parser('<p><a href="https://example.com" rel="opener prefetch">link</a></p>')).toEqual(
       '<p><a href="https://example.com" rel="nofollow noreferrer noopener" target="_blank">link</a></p>',
     );
   });
@@ -94,9 +85,7 @@ Waline is a good framework. :money:
 
   it('Should forbid style', () => {
     expect(
-      parser(
-        '<div style="position:fixed;top:0;left:0;width:100vh;height:100vh;">广告文字</div>',
-      ),
+      parser('<div style="position:fixed;top:0;left:0;width:100vh;height:100vh;">广告文字</div>'),
     ).toEqual('<div>广告文字</div>');
     expect(
       parser(

package/development.js

@@ -21,6 +21,7 @@ instance.run();
 let config = {};
 
 try {
+  // oxlint-disable-next-line node/global-require
   config = require('./config.js');
 } catch {
   // do nothing

package/index.js

@@ -4,7 +4,7 @@ const path = require('node:path');
 const Application = require('thinkjs');
 const Loader = require('thinkjs/lib/loader');
 
-module.exports = function (configParams = {}) {
+module.exports = function main(configParams = {}) {
   const { env, ...config } = configParams;
 
   const app = new Application({
@@ -20,10 +20,11 @@ module.exports = function (configParams = {}) {
 
   loader.loadAll('worker');
 
+  // oxlint-disable-next-line func-names
   return function (req, res) {
-    for (const k in config) {
+    for (const key in config) {
       // fix https://github.com/walinejs/waline/issues/2649 with alias model config name
-      think.config(k === 'model' ? 'customModel' : k, config[k]);
+      think.config(key === 'model' ? 'customModel' : key, config[key]);
     }
 
     return think

package/package.json

@@ -1,43 +1,45 @@
 {
   "name": "@waline/vercel",
-  "version": "1.36.4",
+  "version": "1.37.0",
   "description": "vercel server for waline comment system",
   "keywords": [
-    "waline",
-    "vercel",
+    "blog",
     "comment",
-    "blog"
+    "vercel",
+    "waline"
   ],
+  "license": "MIT",
+  "author": "lizheming <i@imnerd.org>",
   "repository": {
     "url": "https://github.com/walinejs/waline",
     "directory": "packages/server"
   },
-  "license": "MIT",
-  "author": "lizheming <i@imnerd.org>",
+  "publishConfig": {
+    "provenance": true
+  },
   "scripts": {
     "dev": "node development.js 9090"
   },
   "dependencies": {
-    "@cloudbase/node-sdk": "^3.14.2",
+    "@cloudbase/node-sdk": "^3.18.0",
     "@koa/cors": "^5.0.0",
     "@mdit/plugin-katex": "0.23.4-cjs.0",
     "@mdit/plugin-mathjax": "0.23.4-cjs.0",
     "@mdit/plugin-sub": "0.22.5-cjs.0",
     "@mdit/plugin-sup": "0.22.5-cjs.0",
     "akismet": "^2.0.7",
-    "deta": "^2.0.0",
-    "dompurify": "^3.3.0",
-    "dy-node-ip2region": "^1.0.1",
+    "dompurify": "^3.3.1",
     "fast-csv": "^5.0.5",
     "form-data": "^4.0.5",
+    "ip2region": "^2.3.0",
     "jsdom": "^19.0.0",
-    "jsonwebtoken": "^9.0.2",
+    "jsonwebtoken": "^9.0.3",
     "koa-compose": "^4.1.0",
     "leancloud-storage": "^4.15.2",
-    "markdown-it": "^14.1.0",
+    "markdown-it": "^14.1.1",
     "markdown-it-emoji": "^3.0.0",
     "mathjax-full": "^3.2.2",
-    "nodemailer": "^7.0.11",
+    "nodemailer": "^8.0.1",
     "nunjucks": "^3.2.4",
     "phpass": "^0.1.1",
     "prismjs": "^1.30.0",
@@ -52,16 +54,13 @@
     "think-mongo": "^2.2.1",
     "think-router-rest": "^1.0.5",
     "thinkjs": "4.0.0-alpha.0",
-    "ua-parser-js": "^2.0.6"
+    "ua-parser-js": "^2.0.9"
   },
   "devDependencies": {
-    "dotenv": "17.2.3",
+    "dotenv": "17.2.4",
     "think-watcher": "3.0.4"
   },
   "engines": {
     "node": ">=20"
-  },
-  "publishConfig": {
-    "provenance": true
   }
 }

package/src/config/adapter.js

@@ -6,9 +6,10 @@ const Postgresql = require('think-model-postgresql');
 let Sqlite;
 
 try {
+  // oxlint-disable-next-line node/global-require
   Sqlite = require('think-model-sqlite');
 } catch (err) {
-  // eslint-disable-next-line @typescript-eslint/no-extraneous-class
+  // oxlint-disable-next-line typescript/no-extraneous-class
   Sqlite = class {};
   console.log(err);
 }
@@ -65,11 +66,11 @@ if (MONGO_AUTHSOURCE) mongoOpt.authSource = MONGO_AUTHSOURCE;
 if (MONGO_DB) {
   type = 'mongo';
   for (const envKeys in process.env) {
-    if (/MONGO_OPT_/.test(envKeys)) {
+    if (envKeys.includes('MONGO_OPT_')) {
       const key = envKeys
         .slice(10)
         .toLocaleLowerCase()
-        .replace(/_([a-z])/g, (_, b) => b.toUpperCase());
+        .replaceAll(/_([a-z])/g, (_, b) => b.toUpperCase());
 
       mongoOpt[key] = process.env[envKeys];
     }
@@ -88,7 +89,9 @@ exports.model = {
   type,
   common: {
     logSql: true,
-    logger: (msg) => think.logger.info(msg),
+    logger: (msg) => {
+      think.logger.info(msg);
+    },
   },
 
   mongo: {
@@ -97,11 +100,7 @@ exports.model = {
         ? JSON.parse(MONGO_HOST)
         : MONGO_HOST
       : '127.0.0.1',
-    port: MONGO_PORT
-      ? MONGO_PORT.startsWith('[')
-        ? JSON.parse(MONGO_PORT)
-        : MONGO_PORT
-      : 27017,
+    port: MONGO_PORT ? (MONGO_PORT.startsWith('[') ? JSON.parse(MONGO_PORT) : MONGO_PORT) : 27017,
     user: MONGO_USER,
     password: MONGO_PASSWORD,
     database: MONGO_DB,
@@ -118,8 +117,7 @@ exports.model = {
     connectionLimit: 1,
     prefix: PG_PREFIX || POSTGRES_PREFIX || 'wl_',
     ssl:
-      (PG_SSL || POSTGRES_SSL) == 'true' ||
-      POSTGRES_URL?.includes('sslmode=require')
+      (PG_SSL || POSTGRES_SSL) === 'true' || POSTGRES_URL?.includes('sslmode=require')
         ? {
             rejectUnauthorized: false,
           }

package/src/config/config.js

@@ -21,7 +21,6 @@ const {
   DISABLE_REGION,
   AVATAR_PROXY,
   GITHUB_TOKEN,
-  DETA_PROJECT_KEY,
   OAUTH_URL,
 
   MARKDOWN_CONFIG = '{}',
@@ -74,9 +73,6 @@ if (LEAN_KEY) {
 } else if (think.env === 'cloudbase' || TCB_ENV) {
   storage = 'cloudbase';
   jwtKey = jwtKey || TENCENTCLOUD_SECRETKEY || TCB_KEY || TCB_ENV;
-} else if (DETA_PROJECT_KEY) {
-  storage = 'deta';
-  jwtKey = jwtKey || DETA_PROJECT_KEY;
 }
 
 if (think.env === 'cloudbase' && storage === 'sqlite') {
@@ -85,8 +81,7 @@ if (think.env === 'cloudbase' && storage === 'sqlite') {
 
 const forbiddenWords = FORBIDDEN_WORDS ? FORBIDDEN_WORDS.split(/\s*,\s*/) : [];
 
-const isFalse = (content) =>
-  content && ['0', 'false'].includes(content.toLowerCase());
+const isFalse = (content) => content && ['0', 'false'].includes(content.toLowerCase());
 
 const markdown = {
   config: JSON.parse(MARKDOWN_CONFIG),
@@ -105,7 +100,7 @@ if (isFalse(MARKDOWN_HIGHLIGHT)) markdown.config.highlight = false;
 let avatarProxy = '';
 
 if (AVATAR_PROXY) {
-  avatarProxy = !isFalse(AVATAR_PROXY) ? AVATAR_PROXY : '';
+  avatarProxy = isFalse(AVATAR_PROXY) ? '' : AVATAR_PROXY;
 }
 
 const oauthUrl = OAUTH_URL || 'https://oauth.lithub.cc';
@@ -116,13 +111,10 @@ module.exports = {
   jwtKey,
   forbiddenWords,
   disallowIPList: [],
-  secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : undefined,
+  secureDomains: SECURE_DOMAINS ? SECURE_DOMAINS.split(/\s*,\s*/) : null,
   disableUserAgent: DISABLE_USERAGENT && !isFalse(DISABLE_USERAGENT),
   disableRegion: DISABLE_REGION && !isFalse(DISABLE_REGION),
-  levels:
-    !LEVELS || isFalse(LEVELS)
-      ? false
-      : LEVELS.split(/\s*,\s*/).map((v) => Number(v)),
+  levels: !LEVELS || isFalse(LEVELS) ? false : LEVELS.split(/\s*,\s*/).map(Number),
 
   audit: COMMENT_AUDIT && !isFalse(COMMENT_AUDIT),
   avatarProxy,

package/src/config/extend.js

@@ -3,8 +3,6 @@ const Mongo = require('think-mongo');
 
 const { isNetlify, netlifyFunctionPrefix } = require('./netlify');
 
-const isDeta = think.env === 'deta' || process.env.DETA_RUNTIME === 'true';
-
 module.exports = [
   Model(think.app),
   Mongo(think.app),
@@ -23,10 +21,6 @@ module.exports = [
           return `${protocol}://${host}${netlifyFunctionPrefix}`;
         }
 
-        if (isDeta) {
-          return `https://${host}`;
-        }
-
         return `${protocol}://${host}`;
       },
       async webhook(type, data) {

package/src/config/middleware.js

@@ -5,9 +5,7 @@ const { isNetlify, netlifyFunctionPrefix } = require('./netlify.js');
 
 const isDev = think.env === 'development';
 const isTcb = think.env === 'cloudbase';
-const isDeta = think.env === 'deta' || process.env.DETA_RUNTIME === 'true';
-const isAliyunFC =
-  think.env === 'aliyun-fc' || Boolean(process.env.FC_RUNTIME_VERSION);
+const isAliyunFC = think.env === 'aliyun-fc' || Boolean(process.env.FC_RUNTIME_VERSION);
 
 module.exports = [
   {
@@ -26,8 +24,7 @@ module.exports = [
     options: {
       logRequest: isDev,
       sendResponseTime: isDev,
-      requestTimeoutCallback:
-        isTcb || isDeta || isAliyunFC || isNetlify ? false : () => {},
+      requestTimeoutCallback: isTcb || isAliyunFC || isNetlify ? false : () => {},
     },
   },
 

package/src/controller/article.js

@@ -11,14 +11,14 @@ module.exports = class extends BaseRest {
     const { deprecated } = this.ctx.state;
 
     // path is required
-    if (!Array.isArray(path) || !path.length) {
+    if (!Array.isArray(path) || path.length === 0) {
       return this.jsonOrSuccess(0);
     }
 
     const resp = await this.modelInstance.select({ url: ['IN', path] });
 
     if (think.isEmpty(resp)) {
-      const counters = new Array(path.length).fill(
+      const counters = Array(path.length).fill(
         type.length === 1 && deprecated
           ? 0
           : type.reduce((o, field) => {
@@ -38,9 +38,7 @@ module.exports = class extends BaseRest {
       //   - single path and multiple type: [{[type]: 0}]
       //   - multiple path and single type: [{[type]: 0}]
       //   - multiple path and multiple type: [{[type]: 0}]
-      return this.jsonOrSuccess(
-        path.length === 1 && deprecated ? counters[0] : counters,
-      );
+      return this.jsonOrSuccess(path.length === 1 && deprecated ? counters[0] : counters);
     }
 
     const respObj = resp.reduce((o, n) => {
@@ -89,17 +87,12 @@ module.exports = class extends BaseRest {
 
     const ret = await this.modelInstance.update(
       (counter) => ({
-        [type]:
-          action === 'desc'
-            ? (counter[type] || 1) - 1
-            : (counter[type] || 0) + 1,
+        [type]: action === 'desc' ? (counter[type] || 1) - 1 : (counter[type] || 0) + 1,
         updatedAt: new Date(),
       }),
       { objectId: ['IN', resp.map(({ objectId }) => objectId)] },
     );
 
-    return this.jsonOrSuccess(
-      deprecated ? ret[0][type] : [{ [type]: ret[0][type] }],
-    );
+    return this.jsonOrSuccess(deprecated ? ret[0][type] : [{ [type]: ret[0][type] }]);
   }
 };

package/src/controller/comment.js

@@ -4,12 +4,13 @@ const { getMarkdownParser } = require('../service/markdown/index.js');
 
 const markdownParser = getMarkdownParser();
 
-async function formatCmt(
+// oxlint-disable-next-line max-statements
+const formatCmt = async (
   { ua, ip, ...comment },
   users = [],
   { avatarProxy, deprecated },
   loginUser,
-) {
+) => {
   ua = think.uaParser(ua);
   if (!think.config('disableUserAgent')) {
     comment.browser = `${ua.browser.name || ''}${(ua.browser.version || '')
@@ -29,13 +30,11 @@ async function formatCmt(
     comment.label = user.label;
   }
 
-  const avatarUrl = user?.avatar
-    ? user.avatar
-    : await think.service('avatar').stringify(comment);
+  const avatarUrl = user?.avatar ? user.avatar : await think.service('avatar').stringify(comment);
 
   comment.avatar =
     avatarProxy && !avatarUrl.includes(avatarProxy)
-      ? avatarProxy + '?url=' + encodeURIComponent(avatarUrl)
+      ? `${avatarProxy}?url=${encodeURIComponent(avatarUrl)}`
       : avatarUrl;
 
   const isAdmin = loginUser && loginUser.type === 'administrator';
@@ -69,7 +68,7 @@ async function formatCmt(
   delete comment.updatedAt;
 
   return comment;
-}
+};
 
 module.exports = class extends BaseRest {
   constructor(ctx) {
@@ -81,12 +80,12 @@ module.exports = class extends BaseRest {
     const { type } = this.get();
 
     const fnMap = {
-      recent: this.getRecentCommentList,
-      count: this.getCommentCount,
-      list: this.getAdminCommentList,
+      recent: this['getRecentCommentList'],
+      count: this['getCommentCount'],
+      list: this['getAdminCommentList'],
     };
 
-    const fn = fnMap[type] || this.getCommentList;
+    const fn = fnMap[type] || this['getCommentList'];
     const data = await fn.call(this);
 
     return this.jsonOrSuccess(data);
@@ -124,7 +123,7 @@ module.exports = class extends BaseRest {
 
       if (
         think.isArray(disallowIPList) &&
-        disallowIPList.length &&
+        disallowIPList.length > 0 &&
         disallowIPList.includes(data.ip)
       ) {
         think.logger.debug(`Comment IP ${data.ip} is in disallowIPList`);
@@ -144,9 +143,7 @@ module.exports = class extends BaseRest {
       });
 
       if (!think.isEmpty(duplicate)) {
-        think.logger.debug(
-          'The comment author had post same comment content before',
-        );
+        think.logger.debug('The comment author had post same comment content before');
 
         return this.fail(this.locale('Duplicate Content'));
       }
@@ -175,9 +172,9 @@ module.exports = class extends BaseRest {
       think.logger.debug(`Comment initial status is ${data.status}`);
 
       if (data.status === 'approved') {
-        const spam = await akismet(data, this.ctx.serverURL).catch((err) =>
-          console.log(err),
-        ); // ignore akismet error
+        const spam = await akismet(data, this.ctx.serverURL).catch((err) => {
+          console.log(err);
+        }); // ignore akismet error
 
         if (spam === true) {
           data.status = 'spam';
@@ -255,9 +252,7 @@ module.exports = class extends BaseRest {
 
       await notify.run(
         { ...cmtReturn, mail: resp.mail, rawComment: comment },
-        parentReturn
-          ? { ...parentReturn, mail: parentComment.mail }
-          : undefined,
+        parentReturn ? { ...parentReturn, mail: parentComment.mail } : undefined,
       );
     }
 
@@ -280,7 +275,7 @@ module.exports = class extends BaseRest {
   async putAction() {
     const { userInfo } = this.ctx.state;
     const isAdmin = userInfo.type === 'administrator';
-    let data = isAdmin ? this.post() : this.post('comment,like');
+    const data = isAdmin ? this.post() : this.post('comment,like');
     let oldData = await this.modelInstance.select({ objectId: this.id });
 
     if (think.isEmpty(oldData) || think.isEmpty(data)) {
@@ -292,8 +287,7 @@ module.exports = class extends BaseRest {
       const likeIncMax = this.config('LIKE_INC_MAX') || 1;
 
       data.like =
-        (Number(oldData.like) || 0) +
-        (data.like ? Math.ceil(Math.random() * likeIncMax) : -1);
+        (Number(oldData.like) || 0) + (data.like ? Math.ceil(Math.random() * likeIncMax) : -1);
       data.like = Math.max(data.like, 0);
     }
 
@@ -325,11 +319,7 @@ module.exports = class extends BaseRest {
       userInfo,
     );
 
-    if (
-      oldData.status === 'waiting' &&
-      data.status === 'approved' &&
-      oldData.pid
-    ) {
+    if (oldData.status === 'waiting' && data.status === 'approved' && oldData.pid) {
       let pComment = await this.modelInstance.select({
         objectId: oldData.pid,
       });
@@ -390,7 +380,7 @@ module.exports = class extends BaseRest {
     const { path: url, page, pageSize, sortBy } = this.get();
     const where = { url };
 
-    if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
+    if (think.isEmpty(userInfo)) {
       where.status = ['NOT IN', ['waiting', 'spam']];
     } else if (userInfo.type !== 'administrator') {
       where._complex = {
@@ -462,9 +452,7 @@ module.exports = class extends BaseRest {
       rootComments.forEach(({ objectId }) => {
         rootIds[objectId] = true;
       });
-      comments = comments.filter(
-        (cmt) => rootIds[cmt.objectId] || rootIds[cmt.rid],
-      );
+      comments = comments.filter((cmt) => rootIds[cmt.objectId] || rootIds[cmt.rid]);
     } else {
       comments = await this.modelInstance.select(
         { ...where, rid: undefined },
@@ -488,12 +476,10 @@ module.exports = class extends BaseRest {
     }
 
     const userModel = this.getModel('Users');
-    const user_ids = Array.from(
-      new Set(comments.map(({ user_id }) => user_id).filter((v) => v)),
-    );
+    const user_ids = [...new Set(comments.map(({ user_id }) => user_id).filter((v) => v))];
     let users = [];
 
-    if (user_ids.length) {
+    if (user_ids.length > 0) {
       users = await userModel.select(
         { objectId: ['IN', user_ids] },
         {
@@ -508,14 +494,12 @@ module.exports = class extends BaseRest {
         _complex: {},
       };
 
-      if (user_ids.length) {
+      if (user_ids.length > 0) {
         countWhere._complex.user_id = ['IN', user_ids];
       }
-      const mails = Array.from(
-        new Set(comments.map(({ mail }) => mail).filter((v) => v)),
-      );
+      const mails = [...new Set(comments.map(({ mail }) => mail).filter((v) => v))];
 
-      if (mails.length) {
+      if (mails.length > 0) {
         countWhere._complex.mail = ['IN', mails];
       }
       if (!think.isEmpty(countWhere._complex)) {
@@ -629,13 +613,11 @@ module.exports = class extends BaseRest {
     });
 
     const userModel = this.getModel('Users');
-    const user_ids = Array.from(
-      new Set(comments.map(({ user_id }) => user_id).filter((v) => v)),
-    );
+    const user_ids = [...new Set(comments.map(({ user_id }) => user_id).filter((v) => v))];
 
     let users = [];
 
-    if (user_ids.length) {
+    if (user_ids.length > 0) {
       users = await userModel.select(
         { objectId: ['IN', user_ids] },
         {
@@ -668,7 +650,7 @@ module.exports = class extends BaseRest {
     const { userInfo } = this.ctx.state;
     const where = {};
 
-    if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
+    if (think.isEmpty(userInfo)) {
       where.status = ['NOT IN', ['waiting', 'spam']];
     } else {
       where._complex = {
@@ -700,13 +682,11 @@ module.exports = class extends BaseRest {
     });
 
     const userModel = this.getModel('Users');
-    const user_ids = Array.from(
-      new Set(comments.map(({ user_id }) => user_id).filter((v) => v)),
-    );
+    const user_ids = [...new Set(comments.map(({ user_id }) => user_id).filter((v) => v))];
 
     let users = [];
 
-    if (user_ids.length) {
+    if (user_ids.length > 0) {
       users = await userModel.select(
         { objectId: ['IN', user_ids] },
         {
@@ -730,9 +710,9 @@ module.exports = class extends BaseRest {
   async getCommentCount() {
     const { url } = this.get();
     const { userInfo } = this.ctx.state;
-    const where = Array.isArray(url) && url.length ? { url: ['IN', url] } : {};
+    const where = Array.isArray(url) && url.length > 0 ? { url: ['IN', url] } : {};
 
-    if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
+    if (think.isEmpty(userInfo)) {
       where.status = ['NOT IN', ['waiting', 'spam']];
     } else {
       where._complex = {

package/src/controller/db.js

@@ -38,15 +38,9 @@ module.exports = class extends BaseRest {
     }
 
     if (storage === 'mysql') {
-      if (item.insertedAt)
-        item.insertedAt = think.datetime(
-          item.insertedAt,
-          'YYYY-MM-DD HH:mm:ss',
-        );
-      if (item.createdAt)
-        item.createdAt = think.datetime(item.createdAt, 'YYYY-MM-DD HH:mm:ss');
-      if (item.updatedAt)
-        item.updatedAt = think.datetime(item.updatedAt, 'YYYY-MM-DD HH:mm:ss');
+      if (item.insertedAt) item.insertedAt = think.datetime(item.insertedAt, 'YYYY-MM-DD HH:mm:ss');
+      if (item.createdAt) item.createdAt = think.datetime(item.createdAt, 'YYYY-MM-DD HH:mm:ss');
+      if (item.updatedAt) item.updatedAt = think.datetime(item.updatedAt, 'YYYY-MM-DD HH:mm:ss');
     }
 
     delete item.objectId;

package/src/controller/oauth.js

@@ -10,8 +10,7 @@ module.exports = class extends think.Controller {
     const { code, oauth_verifier, oauth_token, type, redirect } = this.get();
     const { oauthUrl } = this.config();
 
-    const hasCode =
-      type === 'twitter' ? oauth_token && oauth_verifier : Boolean(code);
+    const hasCode = type === 'twitter' ? oauth_token && oauth_verifier : Boolean(code);
 
     if (!hasCode) {
       const { serverURL } = this.ctx;
@@ -20,12 +19,13 @@ module.exports = class extends think.Controller {
         type,
       });
 
-      return this.redirect(
+      this.redirect(
         think.buildUrl(`${oauthUrl}/${type}`, {
           redirect: redirectUrl,
           state: this.ctx.state.token || '',
         }),
       );
+      return;
     }
 
     /**
@@ -65,7 +65,8 @@ module.exports = class extends think.Controller {
       const token = jwt.sign(userBySocial[0].objectId, this.config('jwtKey'));
 
       if (redirect) {
-        return this.redirect(think.buildUrl(redirect, { token }));
+        this.redirect(think.buildUrl(redirect, { token }));
+        return;
       }
 
       return this.success();
@@ -85,7 +86,8 @@ module.exports = class extends think.Controller {
         objectId: current.objectId,
       });
 
-      return this.redirect('/ui/profile');
+      this.redirect('/ui/profile');
+      return;
     }
 
     // when user has not login, then we create account by the social type!
@@ -109,8 +111,6 @@ module.exports = class extends think.Controller {
     // and then generate token!
     const token = jwt.sign(user.objectId, this.config('jwtKey'));
 
-    return this.redirect(
-      redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token,
-    );
+    this.redirect(redirect + (redirect.includes('?') ? '&' : '?') + 'token=' + token);
   }
 };