ts-glitter 21.1.7 → 21.1.9

package/src/api-public/services/schedule.ts

@@ -27,7 +27,7 @@ type ScheduleItem = {
 export class Schedule {
   static app: string[] = [];
 
-  async perload(app: string) {
+  async preload(app: string) {
     const brand_type = await App.checkBrandAndMemberType(app);
     if (brand_type.brand === 'shopnex' && brand_type.domain) {
       if (!(await this.isDatabasePass(app))) return false;
@@ -59,7 +59,7 @@ export class Schedule {
   async example(sec: number) {
     try {
       for (const app of Schedule.app) {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           // 排程範例
           // await
         }
@@ -75,7 +75,7 @@ export class Schedule {
     console.log(`autoCancelOrder`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           const config = await new User(app).getConfigV2({ key: 'login_config', user_id: 'manager' });
           if (config?.auto_cancel_order_timer && config.auto_cancel_order_timer > 0) {
             const orders = await db.query(
@@ -117,7 +117,7 @@ export class Schedule {
     try {
       for (const app of Schedule.app) {
         try {
-          if (await this.perload(app)) {
+          if (await this.preload(app)) {
             const users = await db.query(
               `select *
                from \`${app}\`.t_user  `,
@@ -153,7 +153,7 @@ export class Schedule {
     console.log(`resetVoucherHistory`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           const rebateClass = new Rebate(app);
           const userClass = new User(app);
 
@@ -224,7 +224,7 @@ export class Schedule {
     console.log(`resetVoucherHistory`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           const mailType = 'auto-email-birthday';
           const customerMail = await AutoSendEmail.getDefCompare(app, mailType, 'zh-TW');
           if (customerMail.toggle) {
@@ -289,7 +289,7 @@ export class Schedule {
     console.log(`resetVoucherHistory`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           await new Shopping(app).resetVoucherHistory();
         }
       } catch (e) {
@@ -305,7 +305,7 @@ export class Schedule {
     console.log(`autoTriggerInvoice`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           const orders = await db.query(
             `SELECT *
              FROM \`${app}\`.t_triggers
@@ -333,7 +333,7 @@ export class Schedule {
     console.log(`autoSendLine`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           const emails = await db.query(
             `SELECT *
              FROM \`${app}\`.t_triggers
@@ -362,7 +362,7 @@ export class Schedule {
     console.log(`autoSendLine`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           const emails = await db.query(
             `SELECT *
              FROM \`${app}\`.t_triggers
@@ -390,7 +390,7 @@ export class Schedule {
     console.log(`autoSendLine`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           const emails = await db.query(
             `SELECT *
              FROM \`${app}\`.t_triggers
@@ -478,7 +478,7 @@ export class Schedule {
     console.log(`visitLogs`);
     for (const app of Schedule.app) {
       try {
-        if (await this.perload(app)) {
+        if (await this.preload(app)) {
           const count = await db.query(
             `  SELECT COUNT(DISTINCT mac_address) as count , CONVERT_TZ(NOW(), '+00:00', '+08:00') as now
                FROM ${process.env.GLITTER_DB}.t_monitor
@@ -489,7 +489,11 @@ export class Schedule {
                  AND ${convertTimeZone('NOW()')}`,
             []
           );
-          await db.query(`replace into \`${app}\`.visit_logs (date, count,tag_name) values (?, ? , ?)`,[count[0]['now'], count[0]['count'],(`${count[0]['now'].toISOString()}`).substring(0,10)]);
+          await db.query(`replace into \`${app}\`.visit_logs (date, count,tag_name) values (?, ? , ?)`, [
+            count[0]['now'],
+            count[0]['count'],
+            `${count[0]['now'].toISOString()}`.substring(0, 10),
+          ]);
         }
       } catch (e) {
         console.error('BAD_REQUEST', 'visitLogs Error: ' + e, null);
@@ -502,7 +506,7 @@ export class Schedule {
   main() {
     const scheduleList: ScheduleItem[] = ConfigSetting.is_local
       ? //線下測試環境
-        [ { second: 60 * 5, status: true, func: 'visitLogs', desc: '更新每天造訪人數' },]
+        [{ second: 60 * 5, status: true, func: 'visitLogs', desc: '更新每天造訪人數' }]
       : //線上環境
         [
           // { second: 10, status: false, func: 'example', desc: '排程啟用範例' },

package/src/api-public/services/user.d.ts

@@ -1,4 +1,5 @@
 import { IToken } from '../models/Auth.js';
+import express from 'express';
 interface UserQuery {
     page?: number;
     limit?: number;
@@ -78,14 +79,14 @@ export declare class User {
         out_limit?: undefined;
     }>;
     createUser(account: string, pwd: string, userData: any, req: any, pass_verify?: boolean): Promise<any>;
-    createUserHook(userID: string): Promise<void>;
+    createUserHook(userID: string, req: express.Request): Promise<void>;
     updateAccount(account: string, userID: string): Promise<any>;
     login(account: string, pwd: string): Promise<any>;
-    loginWithFb(token: string): Promise<any>;
-    loginWithLine(code: string, redirect: string): Promise<any>;
-    loginWithGoogle(code: string, redirect: string): Promise<any>;
+    loginWithFb(token: string, req: express.Request): Promise<any>;
+    loginWithLine(code: string, redirect: string, req: express.Request): Promise<any>;
+    loginWithGoogle(code: string, redirect: string, req: express.Request): Promise<any>;
     loginWithPin(user_id: string, pin: string): Promise<any>;
-    loginWithApple(token: string): Promise<any>;
+    loginWithApple(token: string, req: express.Request): Promise<any>;
     getUserData(query: string, type?: 'userID' | 'account' | 'email_or_phone'): Promise<any>;
     checkMember(userData: any, trigger: boolean): Promise<{
         id: string;

package/src/api-public/services/user.js

@@ -60,6 +60,7 @@ const ut_timer_1 = require("../utils/ut-timer");
 const auto_fcm_js_1 = require("../../public-config-initial/auto-fcm.js");
 const phone_verify_js_1 = require("./phone-verify.js");
 const update_progress_track_js_1 = require("../../update-progress-track.js");
+const fb_api_js_1 = require("./fb-api.js");
 class User {
     constructor(app, token) {
         this.normalMember = {
@@ -215,7 +216,7 @@ class User {
                 Object.assign(Object.assign({}, (userData !== null && userData !== void 0 ? userData : {})), { status: undefined }),
                 userData.status === 0 ? 0 : 1,
             ]);
-            await this.createUserHook(userID);
+            await this.createUserHook(userID, req);
             const usData = await this.getUserData(userID, 'userID');
             usData.pwd = undefined;
             usData.token = await UserUtil_1.default.generateToken({
@@ -234,7 +235,7 @@ class User {
             throw exception_1.default.BadRequestError('BAD_REQUEST', 'Register Error:' + e, e.data);
         }
     }
-    async createUserHook(userID) {
+    async createUserHook(userID, req) {
         const usData = await this.getUserData(userID, 'userID');
         usData.userData.repeatPwd = undefined;
         await database_1.default.query(`update \`${this.app}\`.t_user
@@ -261,6 +262,7 @@ class User {
         }
         new notify_js_1.ManagerNotify(this.app).userRegister({ user_id: userID });
         await user_update_js_1.UserUpdate.update(this.app, userID);
+        await new fb_api_js_1.FbApi(this.app).register(usData, req);
     }
     async updateAccount(account, userID) {
         try {
@@ -313,7 +315,7 @@ class User {
             throw exception_1.default.BadRequestError('BAD_REQUEST', 'Login Error:' + e, null);
         }
     }
-    async loginWithFb(token) {
+    async loginWithFb(token, req) {
         let config = {
             method: 'get',
             maxBodyLength: Infinity,
@@ -349,7 +351,7 @@ class User {
                 },
                 1,
             ]);
-            await this.createUserHook(userID);
+            await this.createUserHook(userID, req);
         }
         const data = (await database_1.default.execute(`select *
          from \`${this.app}\`.t_user
@@ -369,7 +371,7 @@ class User {
         });
         return usData;
     }
-    async loginWithLine(code, redirect) {
+    async loginWithLine(code, redirect, req) {
         try {
             const lineData = await this.getConfigV2({
                 key: 'login_line_setting',
@@ -463,7 +465,7 @@ class User {
                     },
                     1,
                 ]);
-                await this.createUserHook(userID);
+                await this.createUserHook(userID, req);
                 findList = await getUsData();
             }
             const data = findList[0];
@@ -486,7 +488,7 @@ class User {
             throw exception_1.default.BadRequestError('BAD_REQUEST', e, null);
         }
     }
-    async loginWithGoogle(code, redirect) {
+    async loginWithGoogle(code, redirect, req) {
         try {
             const config = await this.getConfigV2({
                 key: 'login_google_setting',
@@ -542,7 +544,7 @@ class User {
                     },
                     1,
                 ]);
-                await this.createUserHook(userID);
+                await this.createUserHook(userID, req);
             }
             const data = (await database_1.default.execute(`select *
            from \`${this.app}\`.t_user
@@ -601,7 +603,7 @@ class User {
             throw exception_1.default.BadRequestError('BAD_REQUEST', e, null);
         }
     }
-    async loginWithApple(token) {
+    async loginWithApple(token, req) {
         try {
             const config = await this.getConfigV2({
                 key: 'login_apple_setting',
@@ -650,7 +652,7 @@ class User {
                     },
                     1,
                 ]);
-                await this.createUserHook(userID);
+                await this.createUserHook(userID, req);
             }
             const data = (await database_1.default.execute(`select *
            from \`${this.app}\`.t_user