ztechno_core 0.0.22 → 0.0.24

package/lib/user_service.d.ts

@@ -9,16 +9,26 @@ type ZUserCredentials = {
   name: string;
   pass: string;
 };
+type ZUserSession = {
+  session: string;
+};
 export declare class ZUserService {
   private tableName;
   private sqlService;
   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>;
+  register({ name, pass, role, admin }: ZRequiredUserColumns): Promise<{
+    session: string;
+  }>;
+  auth(opt: ZUserSession | ZUserCredentials): Promise<{
+    session?: string;
+    authenticated: boolean;
+  }>;
+  private genSession;
   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}\` (
@@ -23,15 +29,17 @@ class ZUserService {
         \`name\` varchar(64) NOT NULL,
         \`role\` varchar(64) DEFAULT NULL,
         \`pass\` varchar(512) NOT NULL,
-        \`admin\` tinyint(1) NOT NULL DEFAULT 0,
+        \`session\` varchar(512) NOT NULL,
+        \`admin\` tinyint(1) NOT NULL,
         \`updated_at\` datetime NOT NULL DEFAULT current_timestamp(),
         \`created_at\` datetime NOT NULL DEFAULT current_timestamp(),
         PRIMARY KEY (\`id\`),
         UNIQUE KEY \`name_UNIQUE\` (\`name\`),
         KEY \`name\` (\`name\`),
         KEY \`createdat\` (\`created_at\`),
-        KEY \`updatedat\` (\`updated_at\`)
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
+        KEY \`updatedat\` (\`updated_at\`),
+        KEY \`session\` (\`session\`)
+      ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
     `);
   }
   async ensureTableExists() {
@@ -41,24 +49,36 @@ class ZUserService {
     }
   }
   async register({ name, pass, role, admin }) {
+    const session = this.genSession({ name, pass });
     await this.sqlService.query(
       `
-      INSERT INTO \`${this.tableName}\` (name, pass, role, admin)
+      INSERT INTO \`${this.tableName}\` (name, pass, session, role, admin)
       VALUES (?, ?, ?, ?)
     `,
-      [name, this.hashPass({ name, pass }), role, admin],
+      [name, this.hashPass({ name, pass }), session, role, admin],
     );
+    return { session };
   }
-  async auth({ name, pass }) {
-    const res = await this.sqlService.query(
-      `
-      SELECT id, name, role, admin, updated_at, created_at
-      FROM ${this.tableName}
-      WHERE name=? AND pass=?
-    `,
-      [name, this.hashPass({ name, pass })],
-    );
-    return res.length === 1;
+  async auth(opt) {
+    const res = await (opt.session
+      ? this.sqlService.query(
+          `
+      SELECT id, name, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
+      WHERE session=?`,
+          [opt.session],
+        )
+      : this.sqlService.query(
+          `
+      SELECT id, name, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
+      WHERE name=? AND pass=?`,
+          [opt.name, this.hashPass(opt)],
+        ));
+    return res.length === 0 ? { authenticated: false } : { session: res[0].session, authenticated: true };
+  }
+  genSession({ name }) {
+    const salt = this.salt;
+    const data = name + Date.now() * Math.random();
+    return crypto_service_1.ZCryptoService.hash('sha256', data, { saltMode: 'simple', salt });
   }
   hashPass({ name, pass }) {
     const salt = name + this.salt;

package/package.json

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