ztechno_core 0.0.43 → 0.0.45

package/lib/typings/user_types.d.ts

@@ -1,5 +1,5 @@
 export type ZUser = {
-  id: number;
+  user_id: number;
   email: string;
   session: string;
   role: string | null;

package/lib/user_service.d.ts

@@ -12,7 +12,15 @@ export declare class ZUserService {
   register({ email, pass, role, admin }: ZRequiredUserColumns): Promise<{
     session: string;
   }>;
-  find(opt: { email: string }): Promise<ZUser | undefined>;
+  find(
+    opt:
+      | {
+          email: string;
+        }
+      | {
+          user_id: number;
+        },
+  ): Promise<ZUser | undefined>;
   auth(opt: ZUserSession | ZUserCredentials): Promise<{
     user?: ZUser;
     session?: string;

package/lib/user_service.js

@@ -18,14 +18,14 @@ class ZUserService {
   }
   async checkTableHasAdmin() {
     const res = await this.sqlService.query(`
-      SELECT id FROM \`${this.tableName}\` WHERE admin=1
+      SELECT user_id FROM \`${this.tableName}\` WHERE admin=1
     `);
     return res.length > 0;
   }
   async createTable() {
     await this.sqlService.query(`
       CREATE TABLE \`${this.tableName}\` (
-        \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
+        \`user_id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
         \`email\` varchar(64) NOT NULL,
         \`role\` varchar(64) DEFAULT NULL,
         \`pass\` varchar(512) NOT NULL,
@@ -33,7 +33,7 @@ class ZUserService {
         \`admin\` tinyint(1) NOT NULL,
         \`updated_at\` datetime NOT NULL DEFAULT current_timestamp(),
         \`created_at\` datetime NOT NULL DEFAULT current_timestamp(),
-        PRIMARY KEY (\`id\`),
+        PRIMARY KEY (\`user_id\`),
         UNIQUE KEY \`email_UNIQUE\` (\`email\`),
         KEY \`email\` (\`email\`),
         KEY \`createdat\` (\`created_at\`),
@@ -60,13 +60,25 @@ class ZUserService {
     return { session };
   }
   async find(opt) {
-    const rows = await this.sqlService.query(
-      `
-      SELECT id, name, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
-      WHERE name=?`,
-      [opt.email],
-    );
-    return rows[0];
+    if (opt.email !== undefined) {
+      const rows = await this.sqlService.query(
+        `
+        SELECT user_id, email, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
+        WHERE email=?`,
+        [opt.email],
+      );
+      return rows[0];
+    } else if (opt.user_id !== undefined) {
+      const rows = await this.sqlService.query(
+        `
+        SELECT user_id, email, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
+        WHERE user_id=?`,
+        [opt.user_id],
+      );
+      return rows[0];
+    } else {
+      throw new Error(`Unexpected Input for ZUserService.find(${JSON.stringify(opt)})`);
+    }
   }
   async auth(opt) {
     if (!opt.session && !opt.email && !opt.pass) {
@@ -75,25 +87,25 @@ class ZUserService {
     const res = await (opt.session
       ? this.sqlService.query(
           `
-      SELECT id, name, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
+      SELECT user_id, email, 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=?`,
+      SELECT user_id, email, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
+      WHERE email=? AND pass=?`,
           [opt.email, this.hashPass(opt)],
         ));
     return res.length === 0 ? { authenticated: false } : { user: res[0], session: res[0].session, authenticated: true };
   }
-  genSession({ email: name }) {
+  genSession({ email }) {
     const salt = this.salt;
-    const data = name + Date.now() * Math.random();
+    const data = email + Date.now() * Math.random();
     return crypto_service_1.ZCryptoService.hash('sha256', data, { saltMode: 'simple', salt });
   }
   hashPass({ email, pass }) {
-    const salt = name + this.salt;
+    const salt = email + this.salt;
     return crypto_service_1.ZCryptoService.hash('sha256', pass, { saltMode: 'simple', salt });
   }
 }

package/package.json

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