@nocobase/plugin-users 0.7.7-alpha.1 → 0.8.0-alpha.11

package/lib/actions/users.js

@@ -79,7 +79,7 @@ function signin(_x3, _x4) {
 
 function _signin() {
   _signin = _asyncToGenerator(function* (ctx, next) {
-    const _ctx$app$getPlugin = ctx.app.getPlugin('@nocobase/plugin-users'),
+    const _ctx$app$getPlugin = ctx.app.getPlugin('users'),
           authenticators = _ctx$app$getPlugin.authenticators,
           jwtService = _ctx$app$getPlugin.jwtService;
 

package/lib/middlewares/parseToken.js

@@ -52,7 +52,7 @@ function _findUserByToken() {
       return null;
     }
 
-    const _ctx$app$getPlugin = ctx.app.getPlugin('@nocobase/plugin-users'),
+    const _ctx$app$getPlugin = ctx.app.getPlugin('users'),
           jwtService = _ctx$app$getPlugin.jwtService;
 
     try {

package/lib/server.d.ts

@@ -1,8 +1,9 @@
+import { HandlerType, Middleware } from '@nocobase/resourcer';
 import { Plugin } from '@nocobase/server';
 import { Registry } from '@nocobase/utils';
-import { HandlerType, Middleware } from '@nocobase/resourcer';
 import { JwtOptions, JwtService } from './jwt-service';
 export interface UserPluginConfig {
+    name?: string;
     jwt: JwtOptions;
 }
 export default class UsersPlugin extends Plugin<UserPluginConfig> {
@@ -18,5 +19,4 @@ export default class UsersPlugin extends Plugin<UserPluginConfig> {
         rootNickname: any;
     };
     install(options: any): Promise<void>;
-    getName(): string;
 }

package/lib/server.js

@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-function _path() {
-  const data = require("path");
+function _jsonTemplates() {
+  const data = _interopRequireDefault(require("json-templates"));
 
-  _path = function _path() {
+  _jsonTemplates = function _jsonTemplates() {
     return data;
   };
 
   return data;
 }
 
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
+function _path() {
+  const data = require("path");
 
-  _jsonTemplates = function _jsonTemplates() {
+  _path = function _path() {
     return data;
   };
 
@@ -35,30 +35,30 @@ function _database() {
   return data;
 }
 
-function _server() {
-  const data = require("@nocobase/server");
+function _resourcer() {
+  const data = require("@nocobase/resourcer");
 
-  _server = function _server() {
+  _resourcer = function _resourcer() {
     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 _resourcer() {
-  const data = require("@nocobase/resourcer");
+function _utils() {
+  const data = require("@nocobase/utils");
 
-  _resourcer = function _resourcer() {
+  _utils = function _utils() {
     return data;
   };
 
@@ -69,14 +69,14 @@ var _2 = require("./");
 
 var actions = _interopRequireWildcard(require("./actions/users"));
 
+var _authenticators = _interopRequireDefault(require("./authenticators"));
+
 var _jwtService = require("./jwt-service");
 
 var _locale = require("./locale");
 
 var _middlewares = require("./middlewares");
 
-var _authenticators = _interopRequireDefault(require("./authenticators"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -194,7 +194,9 @@ class UsersPlugin extends _server().Plugin {
         _this.app.resourcer.registerActionHandler(`users:${key}`, action);
       }
 
-      _this.app.resourcer.use(_this.tokenMiddleware.getHandler());
+      _this.app.resourcer.use(_middlewares.parseToken, {
+        tag: 'parseToken'
+      });
 
       const publicActions = ['check', 'signin', 'signup', 'lostpassword', 'resetpassword', 'getUserByResetToken'];
       const loggedInActions = ['signout', 'updateProfile', 'changePassword'];
@@ -221,7 +223,7 @@ class UsersPlugin extends _server().Plugin {
 
       (0, _authenticators.default)(_this2); // TODO(module): should move to preset
 
-      const verificationPlugin = _this2.app.getPlugin('@nocobase/plugin-verification');
+      const verificationPlugin = _this2.app.getPlugin('verification');
 
       if (verificationPlugin && process.env.DEFAULT_SMS_VERIFY_CODE_PROVIDER) {
         verificationPlugin.interceptors.register('users:signin', {
@@ -376,10 +378,6 @@ class UsersPlugin extends _server().Plugin {
     })();
   }
 
-  getName() {
-    return this.getPackageName(__dirname);
-  }
-
 }
 
 exports.default = UsersPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-users",
-  "version": "0.7.7-alpha.1",
+  "version": "0.8.0-alpha.11",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,17 +10,17 @@
     }
   ],
   "dependencies": {
-    "@nocobase/actions": "0.7.7-alpha.1",
-    "@nocobase/database": "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.11",
+    "@nocobase/database": "0.8.0-alpha.11",
+    "@nocobase/resourcer": "0.8.0-alpha.11",
+    "@nocobase/server": "0.8.0-alpha.11",
+    "@nocobase/utils": "0.8.0-alpha.11",
     "json-templates": "^4.2.0",
     "jsonwebtoken": "^8.5.1"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.7-alpha.1",
+    "@nocobase/test": "0.8.0-alpha.11",
     "@types/jsonwebtoken": "^8.5.8"
   },
-  "gitHead": "f82374e6f9daaf71ba63eaf156468ea7ddc042da"
+  "gitHead": "5c5379e33b9d6f30ca1c45a95504a46b2b878d8c"
 }