ztechno_core 0.0.42 → 0.0.44

package/lib/crypto_service.d.ts

@@ -1,4 +1,4 @@
-import { HashStruct } from './typings/crypto_service';
+import { HashStruct } from './typings/crypto_types';
 export declare class ZCryptoService {
   static encrypt(text: string): HashStruct;
   static decrypt(data: HashStruct): string;

package/lib/index.d.ts

@@ -4,14 +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 { HashStruct } from './typings/crypto_types';
 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';
+} from './typings/mail_types';
+export { TranslateData, ZDom, ZNode, ZNodeText, dbTranslationRow } from './typings/translate_types';
+export { ZRequiredUserColumns, ZUser, ZUserCredentials, ZUserSession } from './typings/user_types';
 export { ZCryptoService, ZMailService, ZSqlService, ZTranslateService, ZUserService, ZEngineBase };

package/lib/mail_service.d.ts

@@ -1,4 +1,4 @@
-import { MailOptionsHtml, MailOptionsText, MailServiceOptions } from './typings/mail_service';
+import { MailOptionsHtml, MailOptionsText, MailServiceOptions } from './typings/mail_types';
 export declare class ZMailService {
   private opt;
   constructor(opt: MailServiceOptions);

package/lib/typings/crypto_types.d.ts

@@ -0,0 +1,4 @@
+export type HashStruct = {
+  iv: string;
+  encryptedData: string;
+};

package/lib/typings/crypto_types.js

@@ -0,0 +1,2 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });

package/lib/typings/mail_types.d.ts

@@ -0,0 +1,22 @@
+export type MailServiceOptions = {
+  auth: {
+    user: string;
+    pass: string;
+  };
+  mailSender: string;
+};
+export type MailOptionsBase = {
+  recipient: string;
+  subject: string;
+  from?: string;
+};
+export type MailOptionsText = MailOptionsBase & {
+  body: string;
+};
+export type MailOptionsHtml = MailOptionsBase & {
+  html: string;
+};
+export type MailOptions = MailOptionsBase & {
+  body?: string;
+  html?: string;
+};

package/lib/typings/mail_types.js

@@ -0,0 +1,2 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });

package/lib/typings/translate_types.d.ts

@@ -0,0 +1,34 @@
+export type ZDom = {} & ZNode;
+export type ZNode = {
+  getAttribute: (attr: string) => string;
+  getElementsByTagName: (tag: string) => ZNode[];
+  getElementsByClassName: (cls: string) => ZNode[];
+  getElementById: (id: string) => ZNode;
+  getElementsByName: (name: string) => ZNode[];
+  nodeType: string;
+  nodeName: string;
+  childNodes: ZNode[];
+  firstChild: ZNode;
+  lastChild: ZNode;
+  parentNode: ZNode;
+  attributes: any[];
+  innerHTML: string;
+  outerHTML: string;
+  textContent: string;
+  text: string;
+};
+export type ZNodeText = {
+  text: string;
+} & ZNode;
+export type TranslateData = {
+  value: string;
+  meta?: {
+    prefix: string;
+    suffix: string;
+  };
+};
+export type dbTranslationRow = {
+  lang: string;
+  key: string;
+  value: string;
+};

package/lib/typings/translate_types.js

@@ -0,0 +1,2 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });

package/lib/typings/user_types.d.ts

@@ -0,0 +1,22 @@
+export type ZUser = {
+  user_id: number;
+  email: string;
+  session: string;
+  role: string | null;
+  admin: 0 | 1;
+  updated_at: any;
+  created_at: any;
+};
+export type ZRequiredUserColumns = {
+  email: string;
+  role: string | null;
+  pass: string;
+  admin: 0 | 1;
+};
+export type ZUserCredentials = {
+  email: string;
+  pass: string;
+};
+export type ZUserSession = {
+  session: string;
+};

package/lib/typings/user_types.js

@@ -0,0 +1,2 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });

package/lib/user_service.d.ts

@@ -1,5 +1,5 @@
 import { ZSqlService } from './sql_service';
-import { ZRequiredUserColumns, ZUser, ZUserSession, ZUserCredentials } from './typings/user_service';
+import { ZRequiredUserColumns, ZUser, ZUserSession, ZUserCredentials } from './typings/user_types';
 export declare class ZUserService {
   private tableName;
   private sqlService;

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\`),
@@ -62,8 +62,8 @@ class ZUserService {
   async find(opt) {
     const rows = await this.sqlService.query(
       `
-      SELECT id, name, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
-      WHERE name=?`,
+      SELECT user_id, email, session, role, admin, updated_at, created_at FROM \`${this.tableName}\`
+      WHERE email=?`,
       [opt.email],
     );
     return rows[0];
@@ -75,25 +75,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.42",
+  "version": "0.0.44",
   "description": "Core files for ztechno framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",