@nocobase/plugin-users 0.18.0-alpha.9 → 0.19.0-alpha.10

package/client.d.ts

@@ -0,0 +1,2 @@
+export * from './dist/client';
+export { default } from './dist/client';

package/client.js

@@ -0,0 +1 @@
+module.exports = require('./dist/client/index.js');

package/dist/client/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from '@nocobase/client';
-declare class UsersPlugin extends Plugin {
+export declare class PluginUsersClient extends Plugin {
     load(): Promise<void>;
 }
-export default UsersPlugin;
+export default PluginUsersClient;

package/dist/client/index.js

@@ -1 +1 @@
-(function(e,n){typeof exports=="object"&&typeof module!="undefined"?n(exports,require("@nocobase/client")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client"],n):(e=typeof globalThis!="undefined"?globalThis:e||self,n(e["@nocobase/plugin-users"]={},e["@nocobase/client"]))})(this,function(e,n){"use strict";var l=(e,n,o)=>new Promise((u,d)=>{var c=i=>{try{s(o.next(i))}catch(t){d(t)}},f=i=>{try{s(o.throw(i))}catch(t){d(t)}},s=i=>i.done?u(i.value):Promise.resolve(i.value).then(c,f);s((o=o.apply(e,n)).next())});class o extends n.Plugin{load(){return l(this,null,function*(){})}}e.default=o,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(e,n){typeof exports=="object"&&typeof module!="undefined"?n(exports,require("@nocobase/client")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client"],n):(e=typeof globalThis!="undefined"?globalThis:e||self,n(e["@nocobase/plugin-users"]={},e["@nocobase/client"]))})(this,function(e,n){"use strict";var d=(e,n,i)=>new Promise((u,l)=>{var c=s=>{try{t(i.next(s))}catch(o){l(o)}},f=s=>{try{t(i.throw(s))}catch(o){l(o)}},t=s=>s.done?u(s.value):Promise.resolve(s.value).then(c,f);t((i=i.apply(e,n)).next())});class i extends n.Plugin{load(){return d(this,null,function*(){})}}e.PluginUsersClient=i,e.default=i,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/externalVersion.js

@@ -1,7 +1,7 @@
 module.exports = {
-  "@nocobase/client": "0.18.0-alpha.9",
-  "@nocobase/database": "0.18.0-alpha.9",
-  "@nocobase/server": "0.18.0-alpha.9",
-  "@nocobase/utils": "0.18.0-alpha.9",
-  "@nocobase/actions": "0.18.0-alpha.9"
+  "@nocobase/client": "0.19.0-alpha.10",
+  "@nocobase/database": "0.19.0-alpha.10",
+  "@nocobase/server": "0.19.0-alpha.10",
+  "@nocobase/utils": "0.19.0-alpha.10",
+  "@nocobase/actions": "0.19.0-alpha.10"
 };

package/dist/server/collections/users.d.ts

@@ -1,3 +1,2 @@
-import { CollectionOptions } from '@nocobase/database';
-declare const _default: CollectionOptions;
+declare const _default: import("@nocobase/database").CollectionOptions;
 export default _default;

package/dist/server/collections/users.js

@@ -20,11 +20,11 @@ __export(users_exports, {
   default: () => users_default
 });
 module.exports = __toCommonJS(users_exports);
-var users_default = {
-  namespace: "users.users",
-  duplicator: {
-    dumpable: "optional",
-    with: "rolesUsers"
+var import_database = require("@nocobase/database");
+var users_default = (0, import_database.defineCollection)({
+  origin: "@nocobase/plugin-users",
+  dumpRules: {
+    group: "user"
   },
   name: "users",
   title: '{{t("Users")}}',
@@ -33,6 +33,7 @@ var users_default = {
   createdBy: true,
   updatedBy: true,
   logging: true,
+  shared: true,
   fields: [
     {
       name: "id",
@@ -119,4 +120,4 @@ var users_default = {
       defaultValue: {}
     }
   ]
-};
+});

package/dist/server/migrations/20220818072639-add-users-phone-constraint.d.ts

@@ -0,0 +1,7 @@
+import { Migration } from '@nocobase/server';
+export default class AddUsersPhoneMigration extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+    down(): Promise<void>;
+}

package/dist/server/migrations/20220818072639-add-users-phone-constraint.js

@@ -0,0 +1,57 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var add_users_phone_constraint_exports = {};
+__export(add_users_phone_constraint_exports, {
+  default: () => AddUsersPhoneMigration
+});
+module.exports = __toCommonJS(add_users_phone_constraint_exports);
+var import_database = require("@nocobase/database");
+var import_server = require("@nocobase/server");
+class AddUsersPhoneMigration extends import_server.Migration {
+  on = "beforeLoad";
+  appVersion = "<0.7.5-alpha.1";
+  async up() {
+    const collection = this.db.collection({
+      name: "users",
+      fields: [
+        {
+          type: "string",
+          name: "phone"
+        }
+      ]
+    });
+    const tableNameWithSchema = collection.getTableNameWithSchema();
+    const field = collection.getField("phone");
+    const exists = await field.existsInDb();
+    if (!exists) {
+      await this.db.sequelize.getQueryInterface().addColumn(tableNameWithSchema, field.columnName(), {
+        type: import_database.DataTypes.STRING
+      });
+    }
+    try {
+      await this.db.sequelize.getQueryInterface().addConstraint(tableNameWithSchema, {
+        type: "unique",
+        fields: [field.columnName()]
+      });
+    } catch (error) {
+    }
+    this.db.removeCollection("users");
+  }
+  async down() {
+  }
+}

package/dist/server/migrations/20220818072639-add-users-phone.d.ts

@@ -1,5 +1,6 @@
 import { Migration } from '@nocobase/server';
 export default class AddUsersPhoneMigration extends Migration {
+    appVersion: string;
     up(): Promise<void>;
     down(): Promise<void>;
 }

package/dist/server/migrations/20220818072639-add-users-phone.js

@@ -22,11 +22,8 @@ __export(add_users_phone_exports, {
 module.exports = __toCommonJS(add_users_phone_exports);
 var import_server = require("@nocobase/server");
 class AddUsersPhoneMigration extends import_server.Migration {
+  appVersion = "<0.7.5-alpha.1";
   async up() {
-    const match = await this.app.version.satisfies("<=0.7.4-alpha.7");
-    if (!match) {
-      return;
-    }
     const Field = this.context.db.getRepository("fields");
     const existed = await Field.count({
       filter: {
@@ -49,9 +46,7 @@ class AddUsersPhoneMigration extends import_server.Migration {
             "x-validator": "phone",
             require: true
           }
-        },
-        // NOTE: to trigger hook
-        context: {}
+        }
       });
     }
   }

package/dist/server/migrations/20230802170800-add-username-constraint.d.ts

@@ -0,0 +1,6 @@
+import { Migration } from '@nocobase/server';
+export default class AddUserNameMigration extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+}

package/dist/server/migrations/20230802170800-add-username-constraint.js

@@ -0,0 +1,55 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var add_username_constraint_exports = {};
+__export(add_username_constraint_exports, {
+  default: () => AddUserNameMigration
+});
+module.exports = __toCommonJS(add_username_constraint_exports);
+var import_database = require("@nocobase/database");
+var import_server = require("@nocobase/server");
+class AddUserNameMigration extends import_server.Migration {
+  on = "beforeLoad";
+  appVersion = "<0.13.0-alpha.1";
+  async up() {
+    const collection = this.db.collection({
+      name: "users",
+      fields: [
+        {
+          type: "string",
+          name: "username"
+        }
+      ]
+    });
+    const tableNameWithSchema = collection.getTableNameWithSchema();
+    const field = collection.getField("username");
+    const exists = await field.existsInDb();
+    if (!exists) {
+      await this.db.sequelize.getQueryInterface().addColumn(tableNameWithSchema, field.columnName(), {
+        type: import_database.DataTypes.STRING
+      });
+    }
+    try {
+      await this.db.sequelize.getQueryInterface().addConstraint(tableNameWithSchema, {
+        type: "unique",
+        fields: [field.columnName()]
+      });
+    } catch (error) {
+    }
+    this.db.removeCollection("users");
+  }
+}

package/dist/server/migrations/20230802170800-add-username.d.ts

@@ -1,5 +1,5 @@
 import { Migration } from '@nocobase/server';
 export default class AddUserNameMigration extends Migration {
+    appVersion: string;
     up(): Promise<void>;
-    down(): Promise<void>;
 }

package/dist/server/migrations/20230802170800-add-username.js

@@ -22,11 +22,8 @@ __export(add_username_exports, {
 module.exports = __toCommonJS(add_username_exports);
 var import_server = require("@nocobase/server");
 class AddUserNameMigration extends import_server.Migration {
+  appVersion = "<0.13.0-alpha.1";
   async up() {
-    const match = await this.app.version.satisfies("<=0.12.0-alpha.4");
-    if (!match) {
-      return;
-    }
     const Field = this.context.db.getRepository("fields");
     const existed = await Field.count({
       filter: {
@@ -49,12 +46,8 @@ class AddUserNameMigration extends import_server.Migration {
             "x-validator": { username: true },
             required: true
           }
-        },
-        // NOTE: to trigger hook
-        context: {}
+        }
       });
     }
   }
-  async down() {
-  }
 }

package/dist/server/migrations/20230802183100-update-username.d.ts

@@ -1,5 +1,6 @@
 import { Migration } from '@nocobase/server';
 export default class UpdateUserNameMigration extends Migration {
+    appVersion: string;
     up(): Promise<void>;
     down(): Promise<void>;
 }

package/dist/server/migrations/20230802183100-update-username.js

@@ -22,11 +22,8 @@ __export(update_username_exports, {
 module.exports = __toCommonJS(update_username_exports);
 var import_server = require("@nocobase/server");
 class UpdateUserNameMigration extends import_server.Migration {
+  appVersion = "<0.13.0-alpha.1";
   async up() {
-    const match = await this.app.version.satisfies("<=0.12.0-alpha.4");
-    if (!match) {
-      return;
-    }
     const repo = this.context.db.getRepository("users");
     const user = await repo.findOne({
       filter: {

package/dist/server/migrations/20230908164036-update-username-interface.d.ts

@@ -1,5 +1,6 @@
 import { Migration } from '@nocobase/server';
 export default class UpdateUserNameInterfaceMigration extends Migration {
+    appVersion: string;
     up(): Promise<void>;
     down(): Promise<void>;
 }

package/dist/server/migrations/20230908164036-update-username-interface.js

@@ -22,6 +22,7 @@ __export(update_username_interface_exports, {
 module.exports = __toCommonJS(update_username_interface_exports);
 var import_server = require("@nocobase/server");
 class UpdateUserNameInterfaceMigration extends import_server.Migration {
+  appVersion = "<0.13.0-alpha.10";
   async up() {
     const match = await this.app.version.satisfies("<=0.13.0-alpha.8");
     if (!match) {

package/dist/server/server.d.ts

@@ -1,9 +1,5 @@
 import { Plugin } from '@nocobase/server';
-export interface UserPluginConfig {
-    name?: string;
-}
-export default class UsersPlugin extends Plugin<UserPluginConfig> {
-    constructor(app: any, options: any);
+export default class PluginUsersServer extends Plugin {
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
     getInstallingData(options?: any): {

package/dist/server/server.js

@@ -27,30 +27,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
 __export(server_exports, {
-  default: () => UsersPlugin
+  default: () => PluginUsersServer
 });
 module.exports = __toCommonJS(server_exports);
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
 var import_utils = require("@nocobase/utils");
 var import_path = require("path");
-var import__ = require("./");
 var actions = __toESM(require("./actions/users"));
-var import_locale = require("./locale");
-class UsersPlugin extends import_server.Plugin {
-  constructor(app, options) {
-    super(app, options);
-  }
+class PluginUsersServer extends import_server.Plugin {
   async beforeLoad() {
-    this.app.i18n.addResources("zh-CN", import__.namespace, import_locale.zhCN);
-    this.app.i18n.addResources("en-US", import__.namespace, import_locale.enUS);
-    const cmd = this.app.findCommand("install");
-    if (cmd) {
-      cmd.requiredOption("-u, --root-username <rootUsername>", "", process.env.INIT_ROOT_USERNAME);
-      cmd.requiredOption("-e, --root-email <rootEmail>", "", process.env.INIT_ROOT_EMAIL);
-      cmd.requiredOption("-p, --root-password <rootPassword>", "", process.env.INIT_ROOT_PASSWORD);
-      cmd.option("-n, --root-nickname <rootNickname>");
-    }
     this.db.registerOperators({
       $isCurrentUser(_, ctx) {
         var _a, _b, _c, _d;
@@ -127,9 +113,7 @@ class UsersPlugin extends import_server.Plugin {
     loggedInActions.forEach((action) => this.app.acl.allow("users", action, "loggedIn"));
   }
   async load() {
-    await this.db.import({
-      directory: (0, import_path.resolve)(__dirname, "collections")
-    });
+    await this.importCollections((0, import_path.resolve)(__dirname, "collections"));
     this.db.addMigrations({
       namespace: "users",
       directory: (0, import_path.resolve)(__dirname, "migrations"),
@@ -142,8 +126,8 @@ class UsersPlugin extends import_server.Plugin {
     var _a;
     const { INIT_ROOT_NICKNAME, INIT_ROOT_PASSWORD, INIT_ROOT_EMAIL, INIT_ROOT_USERNAME } = process.env;
     const {
-      rootEmail = INIT_ROOT_EMAIL,
-      rootPassword = INIT_ROOT_PASSWORD,
+      rootEmail = INIT_ROOT_EMAIL || "admin@nocobase.com",
+      rootPassword = INIT_ROOT_PASSWORD || "admin123",
       rootNickname = INIT_ROOT_NICKNAME || "Super Admin",
       rootUsername = INIT_ROOT_USERNAME || "nocobase"
     } = options.users || ((_a = options == null ? void 0 : options.cliArgs) == null ? void 0 : _a[0]) || {};

package/package.json

@@ -2,11 +2,13 @@
   "name": "@nocobase/plugin-users",
   "displayName": "Users",
   "displayName.zh-CN": "用户",
-  "description": "Provides a basic user model and a password-based user authentication type, and extended the createdBy and updatedBy field types",
-  "description.zh-CN": "提供了基础的用户模型和基于密码的用户认证方式，并拓展了创建人和最后更新人字段类型",
-  "version": "0.18.0-alpha.9",
+  "description": "Provides a basic user model, as well as createdBy and updatedBy fields..",
+  "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
+  "version": "0.19.0-alpha.10",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
+  "homepage": "https://docs.nocobase.com/plugins/users",
+  "homepage.zh-CN": "https://docs-cn.nocobase.com/plugins/users",
   "devDependencies": {
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
@@ -22,5 +24,8 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "34ca0df4eede2e83fc86297b0fe19eba970e2b1b"
+  "gitHead": "d09d81eba67339da36bcec27939a85b35d180770",
+  "keywords": [
+    "Users & permissions"
+  ]
 }

package/server.d.ts

@@ -0,0 +1,2 @@
+export * from './dist/server';
+export { default } from './dist/server';

package/server.js

@@ -0,0 +1 @@
+module.exports = require('./dist/server/index.js');