@nocobase/plugin-users 0.7.0-alpha.9 → 0.7.1-alpha.4

package/lib/index.js

@@ -1,9 +1,20 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = void 0;
-var server_1 = require("./server");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(server_1).default; } });
-//# sourceMappingURL=index.js.map
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _server.default;
+  }
+});
+exports.namespace = void 0;
+
+var _server = _interopRequireDefault(require("./server"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const namespace = require('../package.json').name;
+
+exports.namespace = namespace;

package/lib/jwt-service.js

@@ -1,33 +1,54 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.JwtService = void 0;
-const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+
+function _jsonwebtoken() {
+  const data = _interopRequireDefault(require("jsonwebtoken"));
+
+  _jsonwebtoken = function _jsonwebtoken() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 class JwtService {
-    constructor(options) {
-        this.options = options;
-    }
-    expiresIn() {
-        return this.options.expiresIn || '7d';
-    }
-    secret() {
-        return this.options.secret;
-    }
-    sign(payload) {
-        return jsonwebtoken_1.default.sign(payload, this.secret(), { expiresIn: this.expiresIn() });
-    }
-    decode(token) {
-        return new Promise((resolve, reject) => {
-            jsonwebtoken_1.default.verify(token, this.secret(), (err, decoded) => {
-                if (err) {
-                    return reject(err);
-                }
-                resolve(decoded);
-            });
-        });
-    }
+  constructor(options) {
+    this.options = void 0;
+    this.options = options;
+  }
+
+  expiresIn() {
+    return this.options.expiresIn || '7d';
+  }
+
+  secret() {
+    return this.options.secret || process.env.APP_KEY;
+  }
+
+  sign(payload) {
+    return _jsonwebtoken().default.sign(payload, this.secret(), {
+      expiresIn: this.expiresIn()
+    });
+  }
+
+  decode(token) {
+    return new Promise((resolve, reject) => {
+      _jsonwebtoken().default.verify(token, this.secret(), (err, decoded) => {
+        if (err) {
+          return reject(err);
+        }
+
+        resolve(decoded);
+      });
+    });
+  }
+
 }
-exports.JwtService = JwtService;
-//# sourceMappingURL=jwt-service.js.map
+
+exports.JwtService = JwtService;

package/lib/locale/en-US.d.ts

@@ -0,0 +1,5 @@
+declare const _default: {
+    'Please fill in your email address': string;
+    'The password is incorrect, please re-enter': string;
+};
+export default _default;

package/lib/locale/en-US.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  'Please fill in your email address': 'Please fill in your email address',
+  'The password is incorrect, please re-enter': 'The password is incorrect, please re-enter'
+};
+exports.default = _default;

package/lib/locale/index.d.ts

@@ -0,0 +1,2 @@
+export { default as enUS } from './en-US';
+export { default as zhCN } from './zh-CN';

package/lib/locale/index.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "enUS", {
+  enumerable: true,
+  get: function get() {
+    return _enUS.default;
+  }
+});
+Object.defineProperty(exports, "zhCN", {
+  enumerable: true,
+  get: function get() {
+    return _zhCN.default;
+  }
+});
+
+var _enUS = _interopRequireDefault(require("./en-US"));
+
+var _zhCN = _interopRequireDefault(require("./zh-CN"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/locale/zh-CN.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    'The email is incorrect, please re-enter': string;
+    'Please fill in your email address': string;
+    'The password is incorrect, please re-enter': string;
+};
+export default _default;

package/lib/locale/zh-CN.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  'The email is incorrect, please re-enter': '邮箱错误，请重新输入',
+  'Please fill in your email address': '请填写密码',
+  'The password is incorrect, please re-enter': '密码错误，请重新输入'
+};
+exports.default = _default;

package/lib/middlewares/check.js

@@ -1,26 +1,31 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.check = void 0;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.check = check;
+
+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); }); }; }
+
 // TODO(usage): 拦截用户的处理暂时作为一个中间件导出，应用需要的时候可以直接使用这个中间件
 function check(options) {
-    return function check(ctx, next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { currentUser } = ctx.state;
-            if (!currentUser) {
-                return ctx.throw(401, 'Unauthorized');
-            }
-            return next();
-        });
-    };
-}
-exports.check = check;
-//# sourceMappingURL=check.js.map
+  return /*#__PURE__*/function () {
+    var _check = _asyncToGenerator(function* (ctx, next) {
+      const currentUser = ctx.state.currentUser;
+
+      if (!currentUser) {
+        return ctx.throw(401, 'Unauthorized');
+      }
+
+      return next();
+    });
+
+    function check(_x, _x2) {
+      return _check.apply(this, arguments);
+    }
+
+    return check;
+  }();
+}

package/lib/middlewares/index.js

@@ -1,8 +1,21 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseToken = exports.check = void 0;
-var check_1 = require("./check");
-Object.defineProperty(exports, "check", { enumerable: true, get: function () { return check_1.check; } });
-var parseToken_1 = require("./parseToken");
-Object.defineProperty(exports, "parseToken", { enumerable: true, get: function () { return parseToken_1.parseToken; } });
-//# sourceMappingURL=index.js.map
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "check", {
+  enumerable: true,
+  get: function get() {
+    return _check.check;
+  }
+});
+Object.defineProperty(exports, "parseToken", {
+  enumerable: true,
+  get: function get() {
+    return _parseToken.parseToken;
+  }
+});
+
+var _check = require("./check");
+
+var _parseToken = require("./parseToken");

package/lib/middlewares/parseToken.js

@@ -1,69 +1,93 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setCurrentRole = exports.parseToken = void 0;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseToken = parseToken;
+exports.setCurrentRole = setCurrentRole;
+
+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); }); }; }
+
 function parseToken(options) {
-    return function parseToken(ctx, next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const user = yield findUserByToken(ctx, options.plugin);
-            if (user) {
-                ctx.state.currentUser = user;
-                setCurrentRole(ctx);
-            }
-            return next();
-        });
-    };
+  return /*#__PURE__*/function () {
+    var _parseToken = _asyncToGenerator(function* (ctx, next) {
+      const user = yield findUserByToken(ctx, options.plugin);
+
+      if (user) {
+        ctx.state.currentUser = user;
+        setCurrentRole(ctx);
+      }
+
+      return next();
+    });
+
+    function parseToken(_x, _x2) {
+      return _parseToken.apply(this, arguments);
+    }
+
+    return parseToken;
+  }();
 }
-exports.parseToken = parseToken;
+
 function setCurrentRole(ctx) {
-    var _a;
-    let currentRole = ctx.get('X-Role');
-    if (currentRole === 'anonymous') {
-        ctx.state.currentRole = currentRole;
-        return;
-    }
-    const userRoles = ctx.state.currentUser.roles;
-    if (userRoles.length == 1) {
-        currentRole = userRoles[0].name;
-    }
-    else if (userRoles.length > 1) {
-        const role = userRoles.find((role) => role.name === currentRole);
-        if (!role) {
-            const defaultRole = userRoles.find((role) => { var _a; return (_a = role === null || role === void 0 ? void 0 : role.rolesUsers) === null || _a === void 0 ? void 0 : _a.default; });
-            currentRole = (_a = (defaultRole || userRoles[0])) === null || _a === void 0 ? void 0 : _a.name;
-        }
-    }
-    if (currentRole) {
-        ctx.state.currentRole = currentRole;
+  let currentRole = ctx.get('X-Role');
+
+  if (currentRole === 'anonymous') {
+    ctx.state.currentRole = currentRole;
+    return;
+  }
+
+  const userRoles = ctx.state.currentUser.roles;
+
+  if (userRoles.length == 1) {
+    currentRole = userRoles[0].name;
+  } else if (userRoles.length > 1) {
+    const role = userRoles.find(role => role.name === currentRole);
+
+    if (!role) {
+      var _ref;
+
+      const defaultRole = userRoles.find(role => {
+        var _role$rolesUsers;
+
+        return role === null || role === void 0 ? void 0 : (_role$rolesUsers = role.rolesUsers) === null || _role$rolesUsers === void 0 ? void 0 : _role$rolesUsers.default;
+      });
+      currentRole = (_ref = defaultRole || userRoles[0]) === null || _ref === void 0 ? void 0 : _ref.name;
     }
+  }
+
+  if (currentRole) {
+    ctx.state.currentRole = currentRole;
+  }
 }
-exports.setCurrentRole = setCurrentRole;
-function findUserByToken(ctx, plugin) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const token = ctx.getBearerToken();
-        if (!token) {
-            return null;
-        }
-        try {
-            const { userId } = yield plugin.jwtService.decode(token);
-            return yield ctx.db.getRepository('users').findOne({
-                filter: {
-                    id: userId,
-                },
-                appends: ['roles'],
-            });
-        }
-        catch (error) {
-            console.warn(error);
-        }
-    });
+
+function findUserByToken(_x3, _x4) {
+  return _findUserByToken.apply(this, arguments);
 }
-//# sourceMappingURL=parseToken.js.map
+
+function _findUserByToken() {
+  _findUserByToken = _asyncToGenerator(function* (ctx, plugin) {
+    const token = ctx.getBearerToken();
+
+    if (!token) {
+      return null;
+    }
+
+    try {
+      const _yield$plugin$jwtServ = yield plugin.jwtService.decode(token),
+            userId = _yield$plugin$jwtServ.userId;
+
+      return yield ctx.db.getRepository('users').findOne({
+        filter: {
+          id: userId
+        },
+        appends: ['roles']
+      });
+    } catch (error) {
+      return null;
+    }
+  });
+  return _findUserByToken.apply(this, arguments);
+}

package/lib/models/UserModel.d.ts

@@ -1,4 +1,4 @@
-import { Model, TransactionAble } from '@nocobase/database';
+import { Model, Transactionable } from '@nocobase/database';
 export declare class UserModel extends Model {
-    setDefaultRole(roleName: string, options?: TransactionAble): Promise<boolean>;
+    setDefaultRole(roleName: string, options?: Transactionable): Promise<boolean>;
 }

package/lib/models/UserModel.js

@@ -1,57 +1,72 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.UserModel = void 0;
-const database_1 = require("@nocobase/database");
-class UserModel extends database_1.Model {
-    setDefaultRole(roleName, options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (roleName == 'anonymous') {
-                return false;
-            }
-            const db = this.constructor.database;
-            const repository = db.getRepository('rolesUsers');
-            if (!repository) {
-                return false;
-            }
-            const transaction = options.transaction || (yield db.sequelize.transaction());
-            try {
-                yield repository.update({
-                    filter: {
-                        userId: this.get('id'),
-                    },
-                    values: {
-                        default: false,
-                    },
-                    transaction,
-                });
-                yield repository.update({
-                    filter: {
-                        userId: this.get('id'),
-                        roleName,
-                    },
-                    values: {
-                        default: true,
-                    },
-                    transaction,
-                });
-                yield transaction.commit();
-            }
-            catch (error) {
-                yield transaction.rollback();
-                throw error;
-            }
-            return true;
+
+function _database() {
+  const data = require("@nocobase/database");
+
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
+}
+
+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 UserModel extends _database().Model {
+  setDefaultRole(roleName, options = {}) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      if (roleName == 'anonymous') {
+        return false;
+      }
+
+      const db = _this.constructor.database;
+      const repository = db.getRepository('rolesUsers');
+
+      if (!repository) {
+        return false;
+      }
+
+      const transaction = options.transaction || (yield db.sequelize.transaction());
+
+      try {
+        yield repository.update({
+          filter: {
+            userId: _this.get('id')
+          },
+          values: {
+            default: false
+          },
+          transaction
+        });
+        yield repository.update({
+          filter: {
+            userId: _this.get('id'),
+            roleName
+          },
+          values: {
+            default: true
+          },
+          transaction
         });
-    }
+        yield transaction.commit();
+      } catch (error) {
+        yield transaction.rollback();
+        throw error;
+      }
+
+      return true;
+    })();
+  }
+
 }
-exports.UserModel = UserModel;
-//# sourceMappingURL=UserModel.js.map
+
+exports.UserModel = UserModel;

package/lib/server.d.ts

@@ -2,22 +2,17 @@ import { Plugin } from '@nocobase/server';
 import { JwtOptions, JwtService } from './jwt-service';
 export interface UserPluginConfig {
     jwt: JwtOptions;
-    installing?: {
-        adminNickname: string;
-        adminEmail: string;
-        adminPassword: string;
-    };
 }
 export default class UsersPlugin extends Plugin<UserPluginConfig> {
     jwtService: JwtService;
     constructor(app: any, options: any);
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
-    getRootUserInfo(): {
-        adminNickname: string;
-        adminEmail: string;
-        adminPassword: string;
+    getInstallingData(options?: any): {
+        rootEmail: any;
+        rootPassword: any;
+        rootNickname: any;
     };
-    install(): Promise<void>;
+    install(options: any): Promise<void>;
     getName(): string;
 }