ztechno_core 0.0.38 → 0.0.42

package/lib/crypto_service.d.ts

@@ -1,7 +1,4 @@
-type HashStruct = {
-  iv: string;
-  encryptedData: string;
-};
+import { HashStruct } from './typings/crypto_service';
 export declare class ZCryptoService {
   static encrypt(text: string): HashStruct;
   static decrypt(data: HashStruct): string;
@@ -22,4 +19,3 @@ export declare class ZCryptoService {
     ),
   ): string;
 }
-export {};

package/lib/index.d.ts

@@ -4,4 +4,14 @@ import { ZMailService } from './mail_service';
 import { ZSqlService } from './sql_service';
 import { ZTranslateService } from './translate_service';
 import { ZUserService } from './user_service';
+export { HashStruct } from './typings/crypto_service';
+export {
+  MailOptions,
+  MailOptionsBase,
+  MailOptionsHtml,
+  MailOptionsText,
+  MailServiceOptions,
+} from './typings/mail_service';
+export { TranslateData, ZDom, ZNode, ZNodeText, dbTranslationRow } from './typings/translate_service';
+export { ZRequiredUserColumns, ZUser, ZUserCredentials, ZUserSession } from './typings/user_service';
 export { ZCryptoService, ZMailService, ZSqlService, ZTranslateService, ZUserService, ZEngineBase };

package/lib/index.js

@@ -49,5 +49,3 @@ Object.defineProperty(exports, 'ZUserService', {
     return user_service_1.ZUserService;
   },
 });
-// declare module 'ztechno_core' {
-// }

package/lib/mail_service.d.ts

@@ -1,25 +1,6 @@
-type MailServiceOptions = {
-  auth: {
-    user: string;
-    pass: string;
-  };
-  mailSender: string;
-};
-type MailOptionsText = {
-  recipient: string;
-  subject: string;
-  from?: string;
-  body: string;
-};
-type MailOptionsHtml = {
-  recipient: string;
-  subject: string;
-  from?: string;
-  html: string;
-};
+import { MailOptionsHtml, MailOptionsText, MailServiceOptions } from './typings/mail_service';
 export declare class ZMailService {
   private opt;
   constructor(opt: MailServiceOptions);
   send(mailOpts: MailOptionsText | MailOptionsHtml): Promise<any>;
 }
-export {};

package/lib/translate_service.d.ts

@@ -1,16 +1,5 @@
 import { ZSqlService } from './sql_service';
-type TranslateData = {
-  value: string;
-  meta?: {
-    prefix: string;
-    suffix: string;
-  };
-};
-type dbTranslationRow = {
-  lang: string;
-  key: string;
-  value: string;
-};
+import { TranslateData, dbTranslationRow } from '.';
 export declare class ZTranslateService {
   private opt;
   private localCache;
@@ -56,4 +45,3 @@ export declare class ZTranslateService {
   }>;
   private fetchAll;
 }
-export {};

package/lib/user_service.d.ts

@@ -1,26 +1,5 @@
 import { ZSqlService } from './sql_service';
-type ZUser = {
-  id: number;
-  name: string;
-  session: string;
-  role: string | null;
-  admin: 0 | 1;
-  updated_at: any;
-  created_at: any;
-};
-type ZRequiredUserColumns = {
-  name: string;
-  role: string | null;
-  pass: string;
-  admin: 0 | 1;
-};
-type ZUserCredentials = {
-  name: string;
-  pass: string;
-};
-type ZUserSession = {
-  session: string;
-};
+import { ZRequiredUserColumns, ZUser, ZUserSession, ZUserCredentials } from './typings/user_service';
 export declare class ZUserService {
   private tableName;
   private sqlService;
@@ -30,7 +9,7 @@ export declare class ZUserService {
   checkTableHasAdmin(): Promise<boolean>;
   private createTable;
   ensureTableExists(): Promise<void>;
-  register({ name, pass, role, admin }: ZRequiredUserColumns): Promise<{
+  register({ email, pass, role, admin }: ZRequiredUserColumns): Promise<{
     session: string;
   }>;
   find(opt: { email: string }): Promise<ZUser | undefined>;
@@ -42,4 +21,3 @@ export declare class ZUserService {
   private genSession;
   private hashPass;
 }
-export {};

package/lib/user_service.js

@@ -26,7 +26,7 @@ class ZUserService {
     await this.sqlService.query(`
       CREATE TABLE \`${this.tableName}\` (
         \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
-        \`name\` varchar(64) NOT NULL,
+        \`email\` varchar(64) NOT NULL,
         \`role\` varchar(64) DEFAULT NULL,
         \`pass\` varchar(512) NOT NULL,
         \`session\` varchar(512) NOT NULL,
@@ -34,8 +34,8 @@ class ZUserService {
         \`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\`),
+        UNIQUE KEY \`email_UNIQUE\` (\`email\`),
+        KEY \`email\` (\`email\`),
         KEY \`createdat\` (\`created_at\`),
         KEY \`updatedat\` (\`updated_at\`),
         KEY \`session\` (\`session\`)
@@ -48,14 +48,14 @@ class ZUserService {
       await this.createTable();
     }
   }
-  async register({ name, pass, role, admin }) {
-    const session = this.genSession({ name, pass });
+  async register({ email, pass, role, admin }) {
+    const session = this.genSession({ email, pass });
     await this.sqlService.query(
       `
-      INSERT INTO \`${this.tableName}\` (name, pass, session, role, admin)
+      INSERT INTO \`${this.tableName}\` (email, pass, session, role, admin)
       VALUES (?, ?, ?, ?, ?)
     `,
-      [name, this.hashPass({ name, pass }), session, role, admin],
+      [email, this.hashPass({ email, pass }), session, role, admin],
     );
     return { session };
   }
@@ -69,7 +69,7 @@ class ZUserService {
     return rows[0];
   }
   async auth(opt) {
-    if (!opt.session && !opt.name && !opt.pass) {
+    if (!opt.session && !opt.email && !opt.pass) {
       return { authenticated: false };
     }
     const res = await (opt.session
@@ -83,16 +83,16 @@ class ZUserService {
           `
       SELECT id, name, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
       WHERE name=? AND pass=?`,
-          [opt.name, this.hashPass(opt)],
+          [opt.email, this.hashPass(opt)],
         ));
     return res.length === 0 ? { authenticated: false } : { user: res[0], session: res[0].session, authenticated: true };
   }
-  genSession({ name }) {
+  genSession({ email: 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 }) {
+  hashPass({ email, pass }) {
     const salt = name + 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.38",
+  "version": "0.0.42",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",