@nocobase/database 2.0.60 → 2.0.62

package/lib/fields/password-field.d.ts

@@ -7,6 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { DataTypes } from 'sequelize';
+import type { UpdateOptions } from 'sequelize';
+import { Model } from '../model';
 import { BaseColumnFieldOptions, Field } from './field';
 export interface PasswordFieldOptions extends BaseColumnFieldOptions {
     type: 'password';
@@ -19,11 +21,17 @@ export interface PasswordFieldOptions extends BaseColumnFieldOptions {
      */
     randomBytesSize?: number;
 }
+type PasswordValue = string | number;
+type BulkUpdateOptions = UpdateOptions<Record<string, unknown>> & {
+    attributes?: Record<string, unknown>;
+};
 export declare class PasswordField extends Field {
     get dataType(): DataTypes.StringDataTypeConstructor;
-    verify(password: string, hash: string): Promise<unknown>;
-    hash(password: string): Promise<unknown>;
-    init(): void;
+    listener: (instances: Model | Model[]) => Promise<void>;
+    bulkUpdateListener: (options: BulkUpdateOptions) => Promise<void>;
+    verify(password: PasswordValue, hash: string): Promise<boolean>;
+    hash(password: PasswordValue): Promise<string>;
     bind(): void;
     unbind(): void;
 }
+export {};

package/lib/fields/password-field.js

@@ -47,58 +47,78 @@ const _PasswordField = class _PasswordField extends import_field.Field {
   get dataType() {
     return import_sequelize.DataTypes.STRING;
   }
+  listener = /* @__PURE__ */ __name(async (instances) => {
+    const { name } = this.options;
+    const fieldName = name;
+    instances = Array.isArray(instances) ? instances : [instances];
+    for (const instance of instances) {
+      if (!instance.changed(fieldName)) {
+        continue;
+      }
+      const value = instance.get(fieldName);
+      if (value !== null && value !== void 0 && value !== "") {
+        const password = typeof value === "number" ? value : String(value);
+        const hash = await this.hash(password);
+        instance.set(fieldName, hash);
+      } else {
+        instance.set(fieldName, instance.previous(fieldName));
+      }
+    }
+  }, "listener");
+  bulkUpdateListener = /* @__PURE__ */ __name(async (options) => {
+    var _a;
+    const { name } = this.options;
+    const fieldName = name;
+    const { attributes } = options;
+    if (!attributes || !Object.prototype.hasOwnProperty.call(attributes, fieldName)) {
+      return;
+    }
+    const value = attributes[fieldName];
+    if (value !== null && value !== void 0 && value !== "") {
+      const password = typeof value === "number" ? value : String(value);
+      attributes[fieldName] = await this.hash(password);
+    } else {
+      delete attributes[fieldName];
+      options.fields = (_a = options.fields) == null ? void 0 : _a.filter((field) => field !== fieldName);
+    }
+  }, "bulkUpdateListener");
   async verify(password, hash) {
-    password = password || "";
+    const passwordString = password === null || password === void 0 ? "" : String(password);
     hash = hash || "";
     const { length = 64, randomBytesSize = 8 } = this.options;
     return new Promise((resolve, reject) => {
       const salt = hash.substring(0, randomBytesSize * 2);
       const key = hash.substring(randomBytesSize * 2);
-      import_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
+      import_crypto.default.scrypt(passwordString, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
         if (err) reject(err);
         resolve(key == derivedKey.toString("hex"));
       });
     });
   }
   async hash(password) {
+    const passwordString = String(password);
     const { length = 64, randomBytesSize = 8 } = this.options;
     return new Promise((resolve, reject) => {
       const salt = import_crypto.default.randomBytes(randomBytesSize).toString("hex");
-      import_crypto.default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
+      import_crypto.default.scrypt(passwordString, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
         if (err) reject(err);
         resolve(salt + derivedKey.toString("hex"));
       });
     });
   }
-  init() {
-    const { name } = this.options;
-    this.listener = async (instances) => {
-      instances = Array.isArray(instances) ? instances : [instances];
-      for (const instance of instances) {
-        if (!instance.changed(name)) {
-          continue;
-        }
-        const value = instance.get(name);
-        if (value) {
-          const hash = await this.hash(value);
-          instance.set(name, hash);
-        } else {
-          instance.set(name, instance.previous(name));
-        }
-      }
-    };
-  }
   bind() {
     super.bind();
     this.on("beforeCreate", this.listener);
     this.on("beforeBulkCreate", this.listener);
     this.on("beforeUpdate", this.listener);
+    this.on("beforeBulkUpdate", this.bulkUpdateListener);
   }
   unbind() {
     super.unbind();
     this.off("beforeCreate", this.listener);
     this.off("beforeBulkCreate", this.listener);
     this.off("beforeUpdate", this.listener);
+    this.off("beforeBulkUpdate", this.bulkUpdateListener);
   }
 };
 __name(_PasswordField, "PasswordField");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.0.60",
+  "version": "2.0.62",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.0.60",
-    "@nocobase/utils": "2.0.60",
+    "@nocobase/logger": "2.0.62",
+    "@nocobase/utils": "2.0.62",
     "async-mutex": "^0.3.2",
     "chalk": "^4.1.1",
     "cron-parser": "4.4.0",
@@ -38,5 +38,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "c9bdc985d79d20e88c93cb2eee9bbf24a382ee08"
+  "gitHead": "b21b0a5111d188ba495eb579fdae674c5680fff2"
 }