@nocobase/plugin-verification 0.7.7-alpha.1 → 0.8.0-alpha.4

package/lib/Plugin.d.ts

@@ -1,7 +1,7 @@
+import { Context } from '@nocobase/actions';
+import { HandlerType } from '@nocobase/resourcer';
 import { Plugin } from '@nocobase/server';
 import { Registry } from '@nocobase/utils';
-import { HandlerType } from '@nocobase/resourcer';
-import { Context } from '@nocobase/actions';
 import { Provider } from './providers';
 export interface Interceptor {
     manual?: boolean;
@@ -15,7 +15,6 @@ export default class VerificationPlugin extends Plugin {
     providers: Registry<typeof Provider>;
     interceptors: Registry<Interceptor>;
     intercept: HandlerType;
-    getName(): string;
     install(): Promise<void>;
     load(): Promise<void>;
 }

package/lib/Plugin.js

@@ -15,54 +15,52 @@ function _path() {
   return data;
 }
 
-function _server() {
-  const data = require("@nocobase/server");
+function _database() {
+  const data = require("@nocobase/database");
 
-  _server = function _server() {
+  _database = function _database() {
     return data;
   };
 
   return data;
 }
 
-function _utils() {
-  const data = require("@nocobase/utils");
+function _server() {
+  const data = require("@nocobase/server");
 
-  _utils = function _utils() {
+  _server = function _server() {
     return data;
   };
 
   return data;
 }
 
-function _database() {
-  const data = require("@nocobase/database");
+function _utils() {
+  const data = require("@nocobase/utils");
 
-  _database = function _database() {
+  _utils = function _utils() {
     return data;
   };
 
   return data;
 }
 
-var _providers = _interopRequireDefault(require("./providers"));
+var _ = require(".");
 
 var _actions = _interopRequireDefault(require("./actions"));
 
 var _constants = require("./constants");
 
-var _ = require(".");
-
 var _locale = require("./locale");
 
+var _providers = _interopRequireDefault(require("./providers"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-;
-
 class VerificationPlugin extends _server().Plugin {
   constructor(...args) {
     var _this;
@@ -134,10 +132,6 @@ class VerificationPlugin extends _server().Plugin {
     }();
   }
 
-  getName() {
-    return this.getPackageName(__dirname);
-  }
-
   install() {
     var _this2 = this;
 

package/lib/actions/verifications.js

@@ -5,16 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.create = create;
 
-function _util() {
-  const data = require("util");
-
-  _util = function _util() {
-    return data;
-  };
-
-  return data;
-}
-
 function _crypto() {
   const data = require("crypto");
 
@@ -25,10 +15,10 @@ function _crypto() {
   return data;
 }
 
-function _database() {
-  const data = require("@nocobase/database");
+function _util() {
+  const data = require("util");
 
-  _database = function _database() {
+  _util = function _util() {
     return data;
   };
 
@@ -45,9 +35,15 @@ function _actions() {
   return data;
 }
 
-var _ = require("..");
+function _database() {
+  const data = require("@nocobase/database");
 
-var _constants = require("../constants");
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
+}
 
 function _moment() {
   const data = _interopRequireDefault(require("moment"));
@@ -59,6 +55,10 @@ function _moment() {
   return data;
 }
 
+var _ = require("..");
+
+var _constants = require("../constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -75,7 +75,7 @@ function _create() {
   _create = _asyncToGenerator(function* (context, next) {
     var _interceptor$expiresI;
 
-    const plugin = context.app.getPlugin('@nocobase/plugin-verification');
+    const plugin = context.app.getPlugin('verification');
     const values = context.action.params.values;
     const interceptor = plugin.interceptors.get(values === null || values === void 0 ? void 0 : values.type);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-verification",
-  "version": "0.7.7-alpha.1",
+  "version": "0.8.0-alpha.4",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -13,13 +13,13 @@
     "@alicloud/dysmsapi20170525": "2.0.17",
     "@alicloud/openapi-client": "0.4.1",
     "@alicloud/tea-util": "1.4.4",
-    "@nocobase/actions": "0.7.7-alpha.1",
-    "@nocobase/resourcer": "0.7.7-alpha.1",
-    "@nocobase/server": "0.7.7-alpha.1",
-    "@nocobase/utils": "0.7.7-alpha.1"
+    "@nocobase/actions": "0.8.0-alpha.4",
+    "@nocobase/resourcer": "0.8.0-alpha.4",
+    "@nocobase/server": "0.8.0-alpha.4",
+    "@nocobase/utils": "0.8.0-alpha.4"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.7-alpha.1"
+    "@nocobase/test": "0.8.0-alpha.4"
   },
-  "gitHead": "f82374e6f9daaf71ba63eaf156468ea7ddc042da"
+  "gitHead": "433f068ce4479a53f51d3ceac3f22b710e7bb13e"
 }

package/src/Plugin.ts

@@ -1,16 +1,16 @@
 import path from 'path';
 
-import { Plugin } from '@nocobase/server';
-import { Registry } from '@nocobase/utils';
+import { Context } from '@nocobase/actions';
 import { Op } from '@nocobase/database';
 import { HandlerType } from '@nocobase/resourcer';
-import { Context } from '@nocobase/actions';
+import { Plugin } from '@nocobase/server';
+import { Registry } from '@nocobase/utils';
 
-import initProviders, { Provider } from './providers';
+import { namespace } from '.';
 import initActions from './actions';
 import { CODE_STATUS_UNUSED, CODE_STATUS_USED, PROVIDER_TYPE_SMS_ALIYUN } from './constants';
-import { namespace } from '.';
 import { zhCN } from './locale';
+import initProviders, { Provider } from './providers';
 
 export interface Interceptor {
   manual?: boolean;
@@ -19,7 +19,7 @@ export interface Interceptor {
   getReceiver(ctx): string;
   getCode?(ctx): string;
   validate?(ctx: Context, receiver: string): boolean | Promise<boolean>;
-};
+}
 
 export default class VerificationPlugin extends Plugin {
   providers: Registry<typeof Provider> = new Registry();
@@ -49,10 +49,10 @@ export default class VerificationPlugin extends Plugin {
         type: key,
         content,
         expiresAt: {
-          [Op.gt]: new Date()
+          [Op.gt]: new Date(),
         },
-        status: CODE_STATUS_UNUSED
-      }
+        status: CODE_STATUS_UNUSED,
+      },
     });
 
     if (!item) {
@@ -70,14 +70,9 @@ export default class VerificationPlugin extends Plugin {
 
     // or delete
     await item.update({
-      status: CODE_STATUS_USED
+      status: CODE_STATUS_USED,
     });
-  }
-
-
-  getName(): string {
-    return this.getPackageName(__dirname);
-  }
+  };
 
   async install() {
     const {
@@ -86,13 +81,14 @@ export default class VerificationPlugin extends Plugin {
       INIT_ALI_SMS_ACCESS_KEY_SECRET,
       INIT_ALI_SMS_ENDPOINT = 'dysmsapi.aliyuncs.com',
       INIT_ALI_SMS_VERIFY_CODE_TEMPLATE,
-      INIT_ALI_SMS_VERIFY_CODE_SIGN
+      INIT_ALI_SMS_VERIFY_CODE_SIGN,
     } = process.env;
 
-    if (INIT_ALI_SMS_ACCESS_KEY
-      && INIT_ALI_SMS_ACCESS_KEY_SECRET
-      && INIT_ALI_SMS_VERIFY_CODE_TEMPLATE
-      && INIT_ALI_SMS_VERIFY_CODE_SIGN
+    if (
+      INIT_ALI_SMS_ACCESS_KEY &&
+      INIT_ALI_SMS_ACCESS_KEY_SECRET &&
+      INIT_ALI_SMS_VERIFY_CODE_TEMPLATE &&
+      INIT_ALI_SMS_VERIFY_CODE_SIGN
     ) {
       const ProviderRepo = this.db.getRepository('verifications_providers');
       await ProviderRepo.create({
@@ -105,9 +101,9 @@ export default class VerificationPlugin extends Plugin {
             accessKeySecret: INIT_ALI_SMS_ACCESS_KEY_SECRET,
             endpoint: INIT_ALI_SMS_ENDPOINT,
             sign: INIT_ALI_SMS_VERIFY_CODE_SIGN,
-            template: INIT_ALI_SMS_VERIFY_CODE_TEMPLATE
-          }
-        }
+            template: INIT_ALI_SMS_VERIFY_CODE_TEMPLATE,
+          },
+        },
       });
     }
   }

package/src/__tests__/Plugin.test.ts

@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
 import Database from '@nocobase/database';
+import { MockServer } from '@nocobase/test';
 
 import Plugin, { Provider } from '..';
 
@@ -21,7 +21,7 @@ describe('verification > Plugin', () => {
     app = await getApp();
     agent = app.agent();
     db = app.db;
-    plugin = <Plugin>app.getPlugin('@nocobase/plugin-verification');
+    plugin = <Plugin>app.getPlugin('verification');
     VerificationModel = db.getCollection('verifications').model;
     AuthorModel = db.getCollection('authors').model;
     AuthorRepo = db.getCollection('authors').repository;

package/src/__tests__/index.ts

@@ -1,8 +1,8 @@
-import path from 'path';
 import { MockServer, mockServer } from '@nocobase/test';
+import path from 'path';
 
-import Plugin from '..';
 import { ApplicationOptions } from '@nocobase/server';
+import Plugin from '..';
 
 export function sleep(ms: number) {
   return new Promise(resolve => {
@@ -17,7 +17,7 @@ interface MockAppOptions extends ApplicationOptions {
 export async function getApp({ manual, ...options }: MockAppOptions = {}): Promise<MockServer> {
   const app = mockServer(options);
 
-  app.plugin(Plugin);
+  app.plugin(Plugin, { name: 'verification' });
 
   await app.load();
 

package/src/actions/verifications.ts

@@ -1,17 +1,17 @@
-import { promisify } from 'util';
 import { randomInt, randomUUID } from 'crypto';
+import { promisify } from 'util';
 
-import { Op } from '@nocobase/database';
 import actions, { Context, Next } from '@nocobase/actions';
+import { Op } from '@nocobase/database';
 
+import moment from 'moment';
 import Plugin, { namespace } from '..';
 import { CODE_STATUS_UNUSED } from '../constants';
-import moment from 'moment';
 
 const asyncRandomInt = promisify(randomInt);
 
 export async function create(context: Context, next: Next) {
-  const plugin = context.app.getPlugin('@nocobase/plugin-verification') as Plugin;
+  const plugin = context.app.getPlugin('verification') as Plugin;
 
   const { values } = context.action.params;
   const interceptor = plugin.interceptors.get(values?.type);