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

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/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.2",
+  "@nocobase/database": "0.19.0-alpha.2",
+  "@nocobase/server": "0.19.0-alpha.2",
+  "@nocobase/utils": "0.19.0-alpha.2",
+  "@nocobase/actions": "0.19.0-alpha.2"
 };

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,52 @@
+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",
+          unique: true
+        }
+      ]
+    });
+    const tableNameWithSchema = collection.getTableNameWithSchema();
+    const field = collection.getField("username");
+    await this.db.sequelize.getQueryInterface().addColumn(tableNameWithSchema, field.columnName(), {
+      type: import_database.DataTypes.STRING
+    });
+    await this.db.sequelize.getQueryInterface().addConstraint(tableNameWithSchema, {
+      type: "unique",
+      fields: [field.columnName()]
+    });
+    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,50 @@
+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",
+          unique: true
+        }
+      ]
+    });
+    const tableNameWithSchema = collection.getTableNameWithSchema();
+    const field = collection.getField("username");
+    await this.db.sequelize.getQueryInterface().addColumn(tableNameWithSchema, field.columnName(), {
+      type: import_database.DataTypes.STRING
+    });
+    await this.db.sequelize.getQueryInterface().addConstraint(tableNameWithSchema, {
+      type: "unique",
+      fields: [field.columnName()]
+    });
+    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.js

@@ -127,9 +127,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"),

package/package.json

@@ -4,7 +4,7 @@
   "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",
+  "version": "0.19.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -22,5 +22,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "34ca0df4eede2e83fc86297b0fe19eba970e2b1b"
+  "gitHead": "cff5b77ecf12ccdb450d50d505b3aa44a68478c8"
 }

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');