@nocobase/plugin-verification 0.8.0-alpha.8 → 0.8.1-alpha.3

package/lib/client/schemas/providers.js

@@ -0,0 +1,356 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function _shared() {
+  const data = require("@formily/shared");
+
+  _shared = function _shared() {
+    return data;
+  };
+
+  return data;
+}
+
+function _client() {
+  const data = require("@nocobase/client");
+
+  _client = function _client() {
+    return data;
+  };
+
+  return data;
+}
+
+var _locale = require("../locale");
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const collection = {
+  name: 'verifications_providers',
+  fields: [{
+    type: 'string',
+    name: 'id',
+    interface: 'input',
+    uiSchema: {
+      title: '{{t("ID")}}',
+      type: 'string',
+      'x-component': 'Input',
+      required: true
+    }
+  }, {
+    type: 'string',
+    name: 'title',
+    interface: 'input',
+    uiSchema: {
+      title: '{{t("Title")}}',
+      type: 'string',
+      'x-component': 'Input',
+      required: true
+    }
+  }, {
+    type: 'string',
+    name: 'type',
+    interface: 'select',
+    uiSchema: {
+      title: `{{t("Provider type", { ns: "${_locale.NAMESPACE}" })}}`,
+      type: 'string',
+      'x-component': 'Select',
+      required: true,
+      enum: [{
+        label: `{{t("Aliyun SMS", { ns: "${_locale.NAMESPACE}" })}}`,
+        value: 'sms-aliyun'
+      }]
+    }
+  }, {
+    type: 'radio',
+    name: 'default',
+    interface: 'checkbox',
+    uiSchema: {
+      title: '{{t("Default")}}',
+      type: 'boolean',
+      'x-component': 'Checkbox'
+    }
+  }]
+};
+var _default = {
+  type: 'void',
+  name: 'providers',
+  'x-decorator': 'ResourceActionProvider',
+  'x-decorator-props': {
+    collection,
+    resourceName: 'verifications_providers',
+    request: {
+      resource: 'verifications_providers',
+      action: 'list',
+      params: {
+        pageSize: 50,
+        sort: ['-default', 'id'],
+        appends: []
+      }
+    }
+  },
+  'x-component': 'CollectionProvider',
+  'x-component-props': {
+    collection
+  },
+  properties: {
+    actions: {
+      type: 'void',
+      'x-component': 'ActionBar',
+      'x-component-props': {
+        style: {
+          marginBottom: 16
+        }
+      },
+      properties: {
+        delete: {
+          type: 'void',
+          title: '{{t("Delete")}}',
+          'x-component': 'Action',
+          'x-component-props': {
+            useAction: '{{ cm.useBulkDestroyAction }}',
+            confirm: {
+              title: "{{t('Delete')}}",
+              content: "{{t('Are you sure you want to delete it?')}}"
+            }
+          }
+        },
+        create: {
+          type: 'void',
+          title: '{{t("Add new")}}',
+          'x-component': 'Action',
+          'x-component-props': {
+            type: 'primary'
+          },
+          properties: {
+            drawer: {
+              type: 'void',
+              'x-component': 'Action.Drawer',
+              'x-decorator': 'Form',
+              'x-decorator-props': {
+                useValues(options) {
+                  const ctx = (0, _client().useActionContext)();
+                  return (0, _client().useRequest)(() => Promise.resolve({
+                    data: {
+                      name: `s_${(0, _shared().uid)()}`
+                    }
+                  }), _objectSpread(_objectSpread({}, options), {}, {
+                    refreshDeps: [ctx.visible]
+                  }));
+                }
+
+              },
+              title: '{{t("Add new")}}',
+              properties: {
+                id: {
+                  'x-component': 'CollectionField',
+                  'x-decorator': 'FormItem',
+                  description: '{{t("Identifier for program usage. Support letters, numbers and underscores, must start with an letter.")}}'
+                },
+                title: {
+                  'x-component': 'CollectionField',
+                  'x-decorator': 'FormItem'
+                },
+                type: {
+                  'x-component': 'CollectionField',
+                  'x-decorator': 'FormItem'
+                },
+                options: {
+                  type: 'object',
+                  'x-component': 'ProviderOptions'
+                },
+                default: {
+                  'x-component': 'CollectionField',
+                  'x-decorator': 'FormItem'
+                },
+                footer: {
+                  type: 'void',
+                  'x-component': 'Action.Drawer.Footer',
+                  properties: {
+                    cancel: {
+                      title: '{{t("Cancel")}}',
+                      'x-component': 'Action',
+                      'x-component-props': {
+                        useAction: '{{ cm.useCancelAction }}'
+                      }
+                    },
+                    submit: {
+                      title: '{{t("Submit")}}',
+                      'x-component': 'Action',
+                      'x-component-props': {
+                        type: 'primary',
+                        useAction: '{{ cm.useCreateAction }}'
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    table: {
+      type: 'void',
+      'x-uid': 'input',
+      'x-component': 'Table.Void',
+      'x-component-props': {
+        rowKey: 'id',
+        rowSelection: {
+          type: 'checkbox'
+        },
+        useDataSource: '{{ cm.useDataSourceFromRAC }}'
+      },
+      properties: {
+        id: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            id: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true
+            }
+          }
+        },
+        title: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            title: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true
+            }
+          }
+        },
+        type: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            type: {
+              type: 'string',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true
+            }
+          }
+        },
+        default: {
+          type: 'void',
+          'x-decorator': 'Table.Column.Decorator',
+          'x-component': 'Table.Column',
+          properties: {
+            default: {
+              type: 'boolean',
+              'x-component': 'CollectionField',
+              'x-read-pretty': true
+            }
+          }
+        },
+        actions: {
+          type: 'void',
+          title: '{{t("Actions")}}',
+          'x-component': 'Table.Column',
+          properties: {
+            actions: {
+              type: 'void',
+              'x-component': 'Space',
+              'x-component-props': {
+                split: '|'
+              },
+              properties: {
+                update: {
+                  type: 'void',
+                  title: '{{t("Edit")}}',
+                  'x-component': 'Action.Link',
+                  'x-component-props': {
+                    type: 'primary'
+                  },
+                  properties: {
+                    drawer: {
+                      type: 'void',
+                      'x-component': 'Action.Drawer',
+                      'x-decorator': 'Form',
+                      'x-decorator-props': {
+                        useValues: '{{ cm.useValuesFromRecord }}'
+                      },
+                      title: '{{t("Edit")}}',
+                      properties: {
+                        id: {
+                          'x-component': 'CollectionField',
+                          'x-decorator': 'FormItem'
+                        },
+                        title: {
+                          'x-component': 'CollectionField',
+                          'x-decorator': 'FormItem'
+                        },
+                        type: {
+                          'x-component': 'CollectionField',
+                          'x-decorator': 'FormItem',
+                          'x-disabled': true
+                        },
+                        options: {
+                          type: 'object',
+                          'x-component': 'ProviderOptions'
+                        },
+                        default: {
+                          'x-component': 'CollectionField',
+                          'x-decorator': 'FormItem'
+                        },
+                        footer: {
+                          type: 'void',
+                          'x-component': 'Action.Drawer.Footer',
+                          properties: {
+                            cancel: {
+                              title: '{{t("Cancel")}}',
+                              'x-component': 'Action',
+                              'x-component-props': {
+                                useAction: '{{ cm.useCancelAction }}'
+                              }
+                            },
+                            submit: {
+                              title: '{{t("Submit")}}',
+                              'x-component': 'Action',
+                              'x-component-props': {
+                                type: 'primary',
+                                useAction: '{{ cm.useUpdateAction }}'
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                delete: {
+                  type: 'void',
+                  title: '{{ t("Delete") }}',
+                  'x-component': 'Action.Link',
+                  'x-component-props': {
+                    confirm: {
+                      title: "{{t('Delete record')}}",
+                      content: "{{t('Are you sure you want to delete it?')}}"
+                    },
+                    useAction: '{{cm.useDestroyAction}}'
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+};
+exports.default = _default;

package/lib/index.d.ts

@@ -1,4 +1 @@
-export * from './constants';
-export { Provider } from './providers';
-export { Interceptor, default } from './Plugin';
-export declare const namespace: any;
+export { default } from './server';

package/lib/index.js

@@ -3,44 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {
-  namespace: true,
-  Provider: true
-};
-Object.defineProperty(exports, "Provider", {
-  enumerable: true,
-  get: function get() {
-    return _providers.Provider;
-  }
-});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
-    return _Plugin.default;
+    return _server.default;
   }
 });
-exports.namespace = void 0;
-
-var _constants = require("./constants");
-
-Object.keys(_constants).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _constants[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _constants[key];
-    }
-  });
-});
-
-var _providers = require("./providers");
-
-var _Plugin = _interopRequireDefault(require("./Plugin"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const namespace = require('../package.json').name;
+var _server = _interopRequireDefault(require("./server"));
 
-exports.namespace = namespace;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/{Plugin.d.ts → server/Plugin.d.ts}

@@ -5,7 +5,6 @@ import { Registry } from '@nocobase/utils';
 import { Provider } from './providers';
 export interface Interceptor {
     manual?: boolean;
-    provider: string;
     expiresIn?: number;
     getReceiver(ctx: any): string;
     getCode?(ctx: any): string;
@@ -17,4 +16,5 @@ export default class VerificationPlugin extends Plugin {
     intercept: HandlerType;
     install(): Promise<void>;
     load(): Promise<void>;
+    getDefault(): Promise<any>;
 }

package/lib/{Plugin.js → server/Plugin.js}

@@ -109,8 +109,10 @@ class VerificationPlugin extends _server().Plugin {
 
         if (!item) {
           return context.throw(400, {
-            code: 'InvalidSMSCode',
-            message: 'verify by sms code failed'
+            code: 'InvalidVerificationCode',
+            message: context.t('Verification code is invalid', {
+              ns: _.namespace
+            })
           });
         } // TODO: code should be removed if exists in values
         // context.action.mergeParams({
@@ -145,7 +147,7 @@ class VerificationPlugin extends _server().Plugin {
             INIT_ALI_SMS_VERIFY_CODE_TEMPLATE = _process$env.INIT_ALI_SMS_VERIFY_CODE_TEMPLATE,
             INIT_ALI_SMS_VERIFY_CODE_SIGN = _process$env.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) {
+      if (DEFAULT_SMS_VERIFY_CODE_PROVIDER && 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 = _this2.db.getRepository('verifications_providers');
 
         yield ProviderRepo.create({
@@ -159,7 +161,8 @@ class VerificationPlugin extends _server().Plugin {
               endpoint: INIT_ALI_SMS_ENDPOINT,
               sign: INIT_ALI_SMS_VERIFY_CODE_SIGN,
               template: INIT_ALI_SMS_VERIFY_CODE_TEMPLATE
-            }
+            },
+            default: true
           }
         });
       }
@@ -202,6 +205,21 @@ class VerificationPlugin extends _server().Plugin {
         };
       }());
       app.acl.allow('verifications', 'create');
+      app.acl.allow('verifications_providers', '*', 'allowConfigure');
+    })();
+  }
+
+  getDefault() {
+    var _this4 = this;
+
+    return _asyncToGenerator(function* () {
+      const providerRepo = _this4.db.getRepository('verifications_providers');
+
+      return providerRepo.findOne({
+        filter: {
+          default: true
+        }
+      });
     })();
   }
 

package/lib/{actions → server/actions}/verifications.js

@@ -85,7 +85,9 @@ function _create() {
 
     const ProviderRepo = context.db.getRepository('verifications_providers');
     const providerItem = yield ProviderRepo.findOne({
-      filterByTk: interceptor.provider
+      filter: {
+        default: true
+      }
     });
 
     if (!providerItem) {
@@ -98,7 +100,9 @@ function _create() {
     if (!receiver) {
       return context.throw(400, {
         code: 'InvalidReceiver',
-        message: 'Invalid receiver'
+        message: context.t('Not a valid cellphone number, please re-enter', {
+          ns: _.namespace
+        })
       });
     }
 
@@ -151,9 +155,12 @@ function _create() {
       switch (error.name) {
         case 'InvalidReceiver':
           // TODO: message should consider email and other providers, maybe use "receiver"
-          return context.throw(400, context.t('Not a valid cellphone number, please re-enter', {
-            ns: _.namespace
-          }));
+          return context.throw(400, {
+            code: 'InvalidReceiver',
+            message: context.t('Not a valid cellphone number, please re-enter', {
+              ns: _.namespace
+            })
+          });
 
         case 'RateLimit':
           return context.throw(429, context.t('You are trying so frequently, please slow down', {

package/lib/{collections → server/collections}/verifications_providers.js

@@ -19,6 +19,9 @@ var _default = {
   }, {
     type: 'jsonb',
     name: 'options'
+  }, {
+    type: 'radio',
+    name: 'default'
   }]
 };
 exports.default = _default;

package/lib/server/index.d.ts

@@ -0,0 +1,4 @@
+export * from './constants';
+export { Provider } from './providers';
+export { Interceptor, default } from './Plugin';
+export declare const namespace: any;

package/lib/server/index.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  namespace: true,
+  Provider: true
+};
+Object.defineProperty(exports, "Provider", {
+  enumerable: true,
+  get: function get() {
+    return _providers.Provider;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _Plugin.default;
+  }
+});
+exports.namespace = void 0;
+
+var _constants = require("./constants");
+
+Object.keys(_constants).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _constants[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _constants[key];
+    }
+  });
+});
+
+var _providers = require("./providers");
+
+var _Plugin = _interopRequireDefault(require("./Plugin"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const namespace = require('../../package.json').name;
+
+exports.namespace = namespace;

package/lib/{locale → server/locale}/zh-CN.d.ts

@@ -3,5 +3,6 @@ declare const _default: {
     'Not a valid cellphone number, please re-enter': string;
     "Please don't retry in {{time}} seconds": string;
     'You are trying so frequently, please slow down': string;
+    'Verification code is invalid': string;
 };
 export default _default;

package/lib/{locale → server/locale}/zh-CN.js

@@ -8,6 +8,7 @@ var _default = {
   'Verification send failed, please try later or contact to administrator': '验证码发送失败，请稍后重试或联系管理员',
   'Not a valid cellphone number, please re-enter': '不是有效的手机号，请重新输入',
   "Please don't retry in {{time}} seconds": '请 {{time}} 秒后再试',
-  'You are trying so frequently, please slow down': '您的操作太频繁，请稍后再试'
+  'You are trying so frequently, please slow down': '您的操作太频繁，请稍后再试',
+  'Verification code is invalid': '无效的验证码'
 };
 exports.default = _default;

package/lib/{providers → server/providers}/sms-aliyun.js

@@ -93,6 +93,7 @@ class _default extends _.Provider {
             err.name = 'RateLimit';
             console.error(body);
             return Promise.reject(err);
+          // case 'isp.RAM_PERMISSION_DENY':
 
           default:
             // should not let user to know

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-verification",
-  "version": "0.8.0-alpha.8",
+  "version": "0.8.1-alpha.3",
   "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.8.0-alpha.8",
-    "@nocobase/resourcer": "0.8.0-alpha.8",
-    "@nocobase/server": "0.8.0-alpha.8",
-    "@nocobase/utils": "0.8.0-alpha.8"
+    "@nocobase/actions": "0.8.1-alpha.3",
+    "@nocobase/resourcer": "0.8.1-alpha.3",
+    "@nocobase/server": "0.8.1-alpha.3",
+    "@nocobase/utils": "0.8.1-alpha.3"
   },
   "devDependencies": {
-    "@nocobase/test": "0.8.0-alpha.8"
+    "@nocobase/test": "0.8.1-alpha.3"
   },
-  "gitHead": "d53b20e08591651692c37b8bfdf1bfe59332bbdb"
+  "gitHead": "e03df3df5962b99d9fbf5b6e33fbe2b23f14f3d3"
 }

package/server.d.ts

@@ -0,0 +1,4 @@
+// @ts-nocheck
+export * from './lib/server';
+export { default } from './lib/server';
+