@nocobase/database 2.1.0-beta.42 → 2.1.0-beta.44

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

@@ -19,11 +19,13 @@ export interface PasswordFieldOptions extends BaseColumnFieldOptions {
      */
     randomBytesSize?: number;
 }
+type PasswordValue = string | number;
 export declare class PasswordField extends Field {
     get dataType(): DataTypes.StringDataTypeConstructor;
-    verify(password: string, hash: string): Promise<unknown>;
-    hash(password: string): Promise<unknown>;
+    verify(password: PasswordValue, hash: string): Promise<unknown>;
+    hash(password: PasswordValue): Promise<unknown>;
     init(): void;
     bind(): void;
     unbind(): void;
 }
+export {};

package/lib/fields/password-field.js

@@ -48,23 +48,24 @@ const _PasswordField = class _PasswordField extends import_field.Field {
     return import_sequelize.DataTypes.STRING;
   }
   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"));
       });
@@ -72,18 +73,20 @@ const _PasswordField = class _PasswordField extends import_field.Field {
   }
   init() {
     const { name } = this.options;
+    const fieldName = name;
     this.listener = async (instances) => {
       instances = Array.isArray(instances) ? instances : [instances];
       for (const instance of instances) {
-        if (!instance.changed(name)) {
+        if (!instance.changed(fieldName)) {
           continue;
         }
-        const value = instance.get(name);
-        if (value) {
-          const hash = await this.hash(value);
-          instance.set(name, hash);
+        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(name, instance.previous(name));
+          instance.set(fieldName, instance.previous(fieldName));
         }
       }
     };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "2.1.0-beta.42",
+  "version": "2.1.0-beta.44",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "2.1.0-beta.42",
-    "@nocobase/utils": "2.1.0-beta.42",
+    "@nocobase/logger": "2.1.0-beta.44",
+    "@nocobase/utils": "2.1.0-beta.44",
     "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": "619b4d06c934bf3266ba7f388438db018217c87d"
+  "gitHead": "540d4897b1696cc24c0754521b0b766978b4933c"
 }