ztechno_core 0.0.21 → 0.0.23

package/lib/crypto_service.d.ts

@@ -20,10 +20,6 @@ export declare class ZCryptoService {
           salt: string;
         }
     ),
-  ): {
-    salt: string;
-    data: string;
-    hash: string;
-  };
+  ): string;
 }
 export {};

package/lib/crypto_service.js

@@ -82,14 +82,12 @@ class ZCryptoService {
         .join('');
     }
     let hash = data;
-    for (let i = 0; i < itt; i++) hash = crypto.createHash(hashAlgorithm).update(hash).digest('hex');
+    for (let i = 0; i < itt; i++) {
+      hash = crypto.createHash(hashAlgorithm).update(hash).digest('hex');
+    }
     const cut = itt.toString().length + 1;
-    hash = `${cut}$${hash.substring(cut)}`;
-    return {
-      salt,
-      data,
-      hash,
-    };
+    hash = `${itt}$${hash.substring(cut)}`;
+    return hash;
   }
 }
 exports.ZCryptoService = ZCryptoService;

package/lib/user_service.d.ts

@@ -15,10 +15,11 @@ export declare class ZUserService {
   private salt;
   constructor({ sqlService, tableName }: { sqlService: ZSqlService; tableName?: string });
   private checkTableExists;
+  checkTableHasAdmin(): Promise<boolean>;
   private createTable;
   ensureTableExists(): Promise<void>;
   register({ name, pass, role, admin }: ZRequiredUserColumns): Promise<void>;
   auth({ name, pass }: ZUserCredentials): Promise<boolean>;
-  private saltPass;
+  private hashPass;
 }
 export {};

package/lib/user_service.js

@@ -16,6 +16,12 @@ class ZUserService {
     `);
     return res.length > 0;
   }
+  async checkTableHasAdmin() {
+    const res = await this.sqlService.query(`
+      SELECT id FROM \`${this.tableName}\` WHERE admin=1
+    `);
+    return res.length > 0;
+  }
   async createTable() {
     await this.sqlService.query(`
       CREATE TABLE \`${this.tableName}\` (
@@ -46,24 +52,23 @@ class ZUserService {
       INSERT INTO \`${this.tableName}\` (name, pass, role, admin)
       VALUES (?, ?, ?, ?)
     `,
-      [name, this.saltPass({ name, pass }), role, admin],
+      [name, this.hashPass({ name, pass }), role, admin],
     );
   }
   async auth({ name, pass }) {
     const res = await this.sqlService.query(
       `
       SELECT id, name, role, admin, updated_at, created_at
-      FROM ${this.tableName}
+      FROM \`${this.tableName}\`
       WHERE name=? AND pass=?
     `,
-      [name, this.saltPass({ name, pass })],
+      [name, this.hashPass({ name, pass })],
     );
     return res.length === 1;
   }
-  saltPass({ name, pass }) {
+  hashPass({ name, pass }) {
     const salt = name + this.salt;
-    const { hash } = crypto_service_1.ZCryptoService.hash('sha256', pass, { saltMode: 'simple', salt });
-    return hash;
+    return crypto_service_1.ZCryptoService.hash('sha256', pass, { saltMode: 'simple', salt });
   }
 }
 exports.ZUserService = ZUserService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztechno_core",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",