@waline/vercel 1.29.0 → 1.30.1

package/dist/src/controller/article.js

@@ -3,10 +3,7 @@ const BaseRest = require('./rest');
 module.exports = class extends BaseRest {
   constructor(ctx) {
     super(ctx);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Counter'
-    );
+    this.modelInstance = this.getModel('Counter');
   }
 
   async getAction() {

package/dist/src/controller/comment.js

@@ -68,10 +68,7 @@ async function formatCmt(
 module.exports = class extends BaseRest {
   constructor(ctx) {
     super(ctx);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Comment'
-    );
+    this.modelInstance = this.getModel('Comment');
   }
 
   async getAction() {
@@ -114,10 +111,7 @@ module.exports = class extends BaseRest {
           ],
         });
 
-        const userModel = this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        );
+        const userModel = this.getModel('Users');
         const user_ids = Array.from(
           new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
         );
@@ -212,10 +206,7 @@ module.exports = class extends BaseRest {
           offset: Math.max((page - 1) * pageSize, 0),
         });
 
-        const userModel = this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        );
+        const userModel = this.getModel('Users');
         const user_ids = Array.from(
           new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
         );
@@ -355,10 +346,7 @@ module.exports = class extends BaseRest {
           });
         }
 
-        const userModel = this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        );
+        const userModel = this.getModel('Users');
         const user_ids = Array.from(
           new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
         );
@@ -592,10 +580,7 @@ module.exports = class extends BaseRest {
       parentComment = await this.modelInstance.select({ objectId: pid });
       parentComment = parentComment[0];
       if (parentComment.user_id) {
-        parentUser = await this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        ).select({
+        parentUser = await this.getModel('Users').select({
           objectId: parentComment.user_id,
         });
         parentUser = parentUser[0];
@@ -677,10 +662,7 @@ module.exports = class extends BaseRest {
     let cmtUser;
 
     if (!think.isEmpty(newData) && newData[0].user_id) {
-      cmtUser = await this.service(
-        `storage/${this.config('storage')}`,
-        'Users'
-      ).select({
+      cmtUser = await this.getModel('Users').select({
         objectId: newData[0].user_id,
       });
       cmtUser = cmtUser[0];
@@ -706,10 +688,7 @@ module.exports = class extends BaseRest {
       let pUser;
 
       if (pComment.user_id) {
-        pUser = await this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        ).select({
+        pUser = await this.getModel('Users').select({
           objectId: pComment.user_id,
         });
         pUser = pUser[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.29.0",
+  "version": "1.30.1",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",

package/src/controller/article.js

@@ -3,10 +3,7 @@ const BaseRest = require('./rest');
 module.exports = class extends BaseRest {
   constructor(ctx) {
     super(ctx);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Counter'
-    );
+    this.modelInstance = this.getModel('Counter');
   }
 
   async getAction() {

package/src/controller/comment.js

@@ -75,10 +75,7 @@ async function formatCmt(
 module.exports = class extends BaseRest {
   constructor(ctx) {
     super(ctx);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Comment'
-    );
+    this.modelInstance = this.getModel('Comment');
   }
 
   async getAction() {
@@ -121,10 +118,7 @@ module.exports = class extends BaseRest {
           ],
         });
 
-        const userModel = this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        );
+        const userModel = this.getModel('Users');
         const user_ids = Array.from(
           new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
         );
@@ -227,10 +221,7 @@ module.exports = class extends BaseRest {
           offset: Math.max((page - 1) * pageSize, 0),
         });
 
-        const userModel = this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        );
+        const userModel = this.getModel('Users');
         const user_ids = Array.from(
           new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
         );
@@ -373,10 +364,7 @@ module.exports = class extends BaseRest {
           comments = [...rootComments, ...children];
         }
 
-        const userModel = this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        );
+        const userModel = this.getModel('Users');
         const user_ids = Array.from(
           new Set(comments.map(({ user_id }) => user_id).filter((v) => v))
         );
@@ -620,10 +608,7 @@ module.exports = class extends BaseRest {
       parentComment = await this.modelInstance.select({ objectId: pid });
       parentComment = parentComment[0];
       if (parentComment.user_id) {
-        parentUser = await this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        ).select({
+        parentUser = await this.getModel('Users').select({
           objectId: parentComment.user_id,
         });
         parentUser = parentUser[0];
@@ -710,10 +695,7 @@ module.exports = class extends BaseRest {
     let cmtUser;
 
     if (!think.isEmpty(newData) && newData[0].user_id) {
-      cmtUser = await this.service(
-        `storage/${this.config('storage')}`,
-        'Users'
-      ).select({
+      cmtUser = await this.getModel('Users').select({
         objectId: newData[0].user_id,
       });
       cmtUser = cmtUser[0];
@@ -739,10 +721,7 @@ module.exports = class extends BaseRest {
       let pUser;
 
       if (pComment.user_id) {
-        pUser = await this.service(
-          `storage/${this.config('storage')}`,
-          'Users'
-        ).select({
+        pUser = await this.getModel('Users').select({
           objectId: pComment.user_id,
         });
         pUser = pUser[0];

package/src/controller/db.js

@@ -16,8 +16,7 @@ module.exports = class extends BaseRest {
 
     for (let i = 0; i < exportData.tables.length; i++) {
       const tableName = exportData.tables[i];
-      const storage = this.config('storage');
-      const model = this.service(`storage/${storage}`, tableName);
+      const model = this.getModel(tableName);
 
       const data = await model.select({});
 
@@ -31,7 +30,7 @@ module.exports = class extends BaseRest {
     const { table } = this.get();
     const item = this.post();
     const storage = this.config('storage');
-    const model = this.service(`storage/${storage}`, table);
+    const model = this.getModel(table);
 
     if (storage === 'leancloud' || storage === 'mysql') {
       item.insertedAt && (item.insertedAt = new Date(item.insertedAt));
@@ -48,8 +47,7 @@ module.exports = class extends BaseRest {
   async putAction() {
     const { table, objectId } = this.get();
     const data = this.post();
-    const storage = this.config('storage');
-    const model = this.service(`storage/${storage}`, table);
+    const model = this.getModel(table);
 
     delete data.objectId;
     delete data.createdAt;
@@ -61,8 +59,7 @@ module.exports = class extends BaseRest {
 
   async deleteAction() {
     const { table } = this.get();
-    const storage = this.config('storage');
-    const model = this.service(`storage/${storage}`, table);
+    const model = this.getModel(table);
 
     await model.delete({});
 

package/src/controller/oauth.js

@@ -1,14 +1,10 @@
 const jwt = require('jsonwebtoken');
 const fetch = require('node-fetch');
-const { PasswordHash } = require('phpass');
 
 module.exports = class extends think.Controller {
   constructor(ctx) {
     super(ctx);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Users'
-    );
+    this.modelInstance = this.getModel('Users');
   }
 
   async indexAction() {
@@ -109,7 +105,7 @@ module.exports = class extends think.Controller {
         url: user.url,
         avatar: user.avatar,
         [type]: user.id,
-        password: new PasswordHash().hashPassword(Math.random()),
+        password: this.hashPassword(Math.random()),
         type: think.isEmpty(count) ? 'administrator' : 'guest',
       };
 

package/src/controller/token/2fa.js

@@ -8,10 +8,7 @@ module.exports = class extends BaseRest {
     const { email } = this.get();
 
     if (think.isEmpty(userInfo) && email) {
-      const userModel = this.service(
-        `storage/${this.config('storage')}`,
-        'Users'
-      );
+      const userModel = this.getModel('Users');
 
       const user = await userModel.select(
         { email },
@@ -54,10 +51,7 @@ module.exports = class extends BaseRest {
       return this.fail(this.locale('TWO_FACTOR_AUTH_ERROR_DETAIL'));
     }
 
-    const userModel = this.service(
-      `storage/${this.config('storage')}`,
-      'Users'
-    );
+    const userModel = this.getModel('Users');
     const { objectId } = this.ctx.state.userInfo;
 
     await userModel.update({ ['2fa']: data.secret }, { objectId });

package/src/controller/token.js

@@ -1,5 +1,4 @@
 const jwt = require('jsonwebtoken');
-const { PasswordHash } = require('phpass');
 const speakeasy = require('speakeasy');
 const helper = require('think-helper');
 
@@ -8,10 +7,7 @@ const BaseRest = require('./rest');
 module.exports = class extends BaseRest {
   constructor(...args) {
     super(...args);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Users'
-    );
+    this.modelInstance = this.getModel('Users');
   }
 
   getAction() {
@@ -26,10 +22,7 @@ module.exports = class extends BaseRest {
       return this.fail();
     }
 
-    const checkPassword = new PasswordHash().checkPassword(
-      password,
-      user[0].password
-    );
+    const checkPassword = this.checkPassword(password, user[0].password);
 
     if (!checkPassword) {
       return this.fail();

package/src/controller/user/password.js

@@ -19,10 +19,7 @@ module.exports = class extends BaseRest {
     }
 
     const { email } = this.post();
-    const userModel = this.service(
-      `storage/${this.config('storage')}`,
-      'Users'
-    );
+    const userModel = this.getModel('Users');
     const user = await userModel.select({ email });
 
     if (think.isEmpty(user)) {

package/src/controller/user.js

@@ -1,14 +1,9 @@
-const { PasswordHash } = require('phpass');
-
 const BaseRest = require('./rest');
 
 module.exports = class extends BaseRest {
   constructor(...args) {
     super(...args);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Users'
-    );
+    this.modelInstance = this.getModel('Users');
   }
 
   async getAction() {
@@ -81,7 +76,7 @@ module.exports = class extends BaseRest {
       ? `verify:${token}:${Date.now() + 1 * 60 * 60 * 1000}`
       : 'guest';
 
-    data.password = new PasswordHash().hashPassword(data.password);
+    data.password = this.hashPassword(data.password);
     data.type = think.isEmpty(count) ? 'administrator' : normalType;
 
     if (think.isEmpty(resp)) {
@@ -157,7 +152,7 @@ module.exports = class extends BaseRest {
     }
 
     if (password) {
-      updateData.password = new PasswordHash().hashPassword(password);
+      updateData.password = this.hashPassword(password);
     }
 
     if (think.isString(twoFactorAuth)) {
@@ -187,10 +182,7 @@ module.exports = class extends BaseRest {
 
   async getUsersListByCount() {
     const { pageSize } = this.get();
-    const commentModel = this.service(
-      `storage/${this.config('storage')}`,
-      'Comment'
-    );
+    const commentModel = this.getModel('Comment');
     const counts = await commentModel.count(
       {
         status: ['NOT IN', ['waiting', 'spam']],

package/src/controller/verification.js

@@ -3,10 +3,7 @@ const BaseRest = require('./rest');
 module.exports = class extends BaseRest {
   constructor(...args) {
     super(...args);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Users'
-    );
+    this.modelInstance = this.getModel('Users');
   }
 
   async getAction() {

package/src/extend/controller.js

@@ -1,4 +1,5 @@
 const nunjucks = require('nunjucks');
+const { PasswordHash } = require('phpass');
 
 const locales = require('../locales');
 
@@ -26,4 +27,29 @@ module.exports = {
 
     return nunjucks.renderString(message, variables);
   },
+  getModel(modelName) {
+    const { storage, model } = this.config();
+
+    if (typeof model === 'function') {
+      const modelInstance = model(modelName, this);
+
+      if (modelInstance) {
+        return modelInstance;
+      }
+    }
+
+    return this.service(`storage/${storage}`, modelName);
+  },
+  hashPassword(password) {
+    const PwdHash = this.config('encryptPassword') || PasswordHash;
+    const pwdHash = new PwdHash();
+
+    return pwdHash.hashPassword(password);
+  },
+  checkPassword(password, storeHash) {
+    const PwdHash = this.config('encryptPassword') || PasswordHash;
+    const pwdHash = new PwdHash();
+
+    return pwdHash.checkPassword(password, storeHash);
+  },
 };

package/src/logic/base.js

@@ -8,10 +8,7 @@ const helper = require('think-helper');
 module.exports = class extends think.Logic {
   constructor(...args) {
     super(...args);
-    this.modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Users'
-    );
+    this.modelInstance = this.getModel('Users');
     this.resource = this.getResource();
     this.id = this.getId();
   }

package/src/logic/comment.js

@@ -262,10 +262,7 @@ module.exports = class extends Base {
     }
 
     // 3. comment author modify comment content
-    const modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Comment'
-    );
+    const modelInstance = this.getModel('Comment');
     const commentData = await modelInstance.select({
       user_id: userInfo.objectId,
       objectId: this.id,
@@ -299,10 +296,7 @@ module.exports = class extends Base {
       return;
     }
 
-    const modelInstance = this.service(
-      `storage/${this.config('storage')}`,
-      'Comment'
-    );
+    const modelInstance = this.getModel('Comment');
     const commentData = await modelInstance.select({
       user_id: userInfo.objectId,
       objectId: this.id,