ts-glitter 21.1.8 → 21.1.9

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

@@ -1,143 +1,199 @@
 import db from '../../modules/database.js';
-import {User} from "./user.js";
-import axios from "axios";
-import {Cart} from "./shopping.js";
-import tool from "../../services/tool.js";
-import express from "express";
-import {IToken} from "../models/Auth.js";
-import exception from "../../modules/exception.js";
+import { User } from './user.js';
+import axios from 'axios';
+import { Cart } from './shopping.js';
+import tool from '../../services/tool.js';
+import express from 'express';
+import { IToken } from '../models/Auth.js';
+import exception from '../../modules/exception.js';
 
 export class FbApi {
-    public app_name: string
-    public token?: IToken
+  public app_name: string;
+  public token?: IToken;
 
-    constructor(app_name: string,token?:IToken) {
-        this.app_name = app_name
-        this.token=token
-    }
+  constructor(app_name: string, token?: IToken) {
+    this.app_name = app_name;
+    this.token = token;
+  }
 
-    public async config() {
-        const cf = await new User(this.app_name).getConfigV2({
-            key: 'login_fb_setting',
-            user_id: 'manager'
-        })
-        return {
-            link: `https://graph.facebook.com/v22.0/${cf.pixel}/events`.trim(),
-            api_token: cf.api_token
-        }
-    }
+  public async config() {
+    const cf = await new User(this.app_name).getConfigV2({
+      key: 'login_fb_setting',
+      user_id: 'manager',
+    });
+    return {
+      link: `https://graph.facebook.com/v22.0/${cf.pixel}/events`.trim(),
+      api_token: cf.api_token,
+    };
+  }
 
-    //結帳
-    public async checkOut(data: Cart) {
-        const cf = await this.config();
-        if (cf.link && cf.api_token) {
-            return await new Promise<boolean>(async (resolve, reject) => {
-                try {
-                    axios
-                        .post(cf.link, JSON.stringify({
-                            data: [{
-                                "eventID":data.orderID,
-                                "event_name": "Purchase",
-                                "event_time": (new Date().getTime() / 1000).toFixed(0),
-                                "action_source": "website",
-                                "user_data": {
-                                    "em": [
-                                        tool.hashSHA256(data.customer_info.email)
-                                    ],
-                                    "ph": [
-                                        tool.hashSHA256(data.customer_info.phone)
-                                    ],
-                                    "client_ip_address": data.client_ip_address,
-                                    "fbc": data.fbc,
-                                    "fbp": data.fbp
-                                },
-                                "custom_data": {
-                                    "currency": "TWD",
-                                    "value": data.total
-                                }
-                            }],
-                            access_token: cf.api_token
-                        }), {
-                            headers: {
-                                'Content-Type': 'application/json',
-                            },
-                        })
-                        .then((response: any) => {
-                            console.log('FB APIC已成功發送:', response.data);
-                            resolve(response.data);
-                        })
-                        .catch((error: any) => {
-                            console.error('發送FB APIC發生錯誤:', error.response ? error.response.data : error.message);
-                            resolve(false)
-                        });
-                } catch (e) {
-                    console.error(e)
-                    resolve(false)
-                }
+  //註冊
+  public async register(data: any,req: express.Request) {
+    const cf = await this.config();
+    if (cf.link && cf.api_token) {
 
+      return await new Promise<boolean>(async (resolve, reject) => {
+        try {
+          axios
+            .post(
+              cf.link,
+              JSON.stringify({
+                data: [
+                  {
+                    fbc: req.cookies._fbc,
+                    fbp: req.cookies._fbp,
+                    external_id:`${data.userID}`,
+                    ip_address: (req.query.ip || req.headers['x-real-ip'] || req.ip) as string,
+                    "event_name": "CompleteRegistration",
+                    "event_time": new Date().getTime() / 1000,
+                    "event_id": `${data.userID}`,
+                    "user_data": {
+                      em: [tool.hashSHA256(data.email ?? '')],
+                      ph: [tool.hashSHA256(data.phone ?? '')]
+                    },
+                    "action_source": "website"
+                  }
+                ],
+                access_token: cf.api_token,
+              }),
+              {
+                headers: {
+                  'Content-Type': 'application/json',
+                },
+              }
+            )
+            .then((response: any) => {
+              console.log('FB APIC已成功發送:', response.data);
+              resolve(response.data);
             })
+            .catch((error: any) => {
+              console.error('發送FB APIC發生錯誤:', error.response ? error.response.data : error.message);
+              resolve(false);
+            });
+        } catch (e) {
+          console.error(e);
+          resolve(false);
         }
+      });
     }
+  }
 
-    //
-    public async post(data: any,req:express.Request) {
-    try {
-        const cf = await this.config();
-        console.log(`cf.link=>`,this.app_name)
-        console.log(`cf.link=>`,cf.link)
-        console.log(`cf.api_token=>`,cf.api_token)
-        if (cf.link && cf.api_token) {
-            data.user_data={
-                "client_ip_address": (req.query.ip || req.headers['x-real-ip'] || req.ip) as string,
-                "fbc": req.cookies._fbc,
-                "fbp": req.cookies._fbp
-            }
-            if(this.token){
-                const dd=(await new User(this.app_name).getUserData(this.token.userID as any, 'userID'))
-                if(dd && dd.userData){
-                    const email=dd.userData.email;
-                    const phone=dd.userData.phone;
-                    email && (data.user_data.email=[tool.hashSHA256(email)])
-                    phone && (data.user_data.ph=[tool.hashSHA256(phone)])
-                }
-            }
-            data.event_time=(new Date().getTime() / 1000).toFixed(0);
-            // data.action_source='website'
-            // data.test_event_code='TEST82445'
-            // console.log(data)
-            return await new Promise<boolean>(async (resolve, reject) => {
-                try {
-                    axios
-                        .post(cf.link, JSON.stringify({
-                            data: [data],
-                            access_token: cf.api_token,
-                        }), {
-                            headers: {
-                                'Content-Type': 'application/json',
-                            },
-                        })
-                        .then((response: any) => {
-                            console.log('FB APIC已成功發送:', response.data);
-                            resolve(response.data);
-                        })
-                        .catch((error: any) => {
-                            console.error('發送FB APIC發生錯誤:', error.response ? error.response.data : error.message);
-                            resolve(false)
-                        });
-                } catch (e) {
-                    console.error(e)
-                    resolve(false)
-                }
-
+  //結帳
+  public async checkOut(data: Cart) {
+    const cf = await this.config();
+    if (cf.link && cf.api_token) {
+      return await new Promise<boolean>(async (resolve, reject) => {
+        try {
+          axios
+            .post(
+              cf.link,
+              JSON.stringify({
+                data: [
+                  {
+                    eventID: data.orderID,
+                    event_name: 'Purchase',
+                    event_time: (new Date().getTime() / 1000).toFixed(0),
+                    action_source: 'website',
+                    user_data: {
+                      em: [tool.hashSHA256(data.customer_info.email)],
+                      ph: [tool.hashSHA256(data.customer_info.phone)],
+                      client_ip_address: data.client_ip_address,
+                      fbc: data.fbc,
+                      fbp: data.fbp,
+                    },
+                    custom_data: {
+                      currency: 'TWD',
+                      value: data.total,
+                    },
+                  },
+                ],
+                access_token: cf.api_token,
+              }),
+              {
+                headers: {
+                  'Content-Type': 'application/json',
+                },
+              }
+            )
+            .then((response: any) => {
+              console.log('FB APIC已成功發送:', response.data);
+              resolve(response.data);
             })
+            .catch((error: any) => {
+              console.error('發送FB APIC發生錯誤:', error.response ? error.response.data : error.message);
+              resolve(false);
+            });
+        } catch (e) {
+          console.error(e);
+          resolve(false);
         }
-    }catch (e:any) {
-        console.error(e)
-        throw exception.BadRequestError(e.code ?? 'BAD_REQUEST', e, null);
-    }
+      });
     }
+  }
 
-    public async OAuth(url:any){
-        // console.log("url -- " , url);
+  //
+  public async post(data: any, req: express.Request) {
+    try {
+      const cf = await this.config();
+      console.log(`cf.link=>`, this.app_name);
+      console.log(`cf.link=>`, cf.link);
+      console.log(`cf.api_token=>`, cf.api_token);
+      if (cf.link && cf.api_token) {
+        data.user_data = {
+          client_ip_address: (req.query.ip || req.headers['x-real-ip'] || req.ip) as string,
+          ip_address: (req.query.ip || req.headers['x-real-ip'] || req.ip) as string,
+          fbc: req.cookies._fbc,
+          fbp: req.cookies._fbp,
+        };
+        if (this.token) {
+          const dd = await new User(this.app_name).getUserData(this.token.userID as any, 'userID');
+          if (dd && dd.userData) {
+            const email = dd.userData.email;
+            const phone = dd.userData.phone;
+            email && (data.user_data.email = [tool.hashSHA256(email)]);
+            phone && (data.user_data.ph = [tool.hashSHA256(phone)]);
+          }
+        }
+        data.event_time = (new Date().getTime() / 1000).toFixed(0);
+        // data.action_source='website'
+        // data.test_event_code='TEST82445'
+        // console.log(data)
+        return await new Promise<boolean>(async (resolve, reject) => {
+          try {
+            axios
+              .post(
+                cf.link,
+                JSON.stringify({
+                  data: [data],
+                  access_token: cf.api_token,
+                }),
+                {
+                  headers: {
+                    'Content-Type': 'application/json',
+                  },
+                }
+              )
+              .then((response: any) => {
+                console.log('FB APIC已成功發送:', response.data);
+                resolve(response.data);
+              })
+              .catch((error: any) => {
+                console.error('發送FB APIC發生錯誤:', error.response ? error.response.data : error.message);
+                resolve(false);
+              });
+          } catch (e) {
+            console.error(e);
+            resolve(false);
+          }
+        });
+      }
+    } catch (e: any) {
+      console.error(e);
+      throw exception.BadRequestError(e.code ?? 'BAD_REQUEST', e, null);
     }
-}
+  }
+
+  public async OAuth(url: any) {
+    // console.log("url -- " , url);
+  }
+}

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

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -70,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 = {
@@ -225,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({
@@ -244,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
@@ -271,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 {
@@ -323,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,
@@ -359,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
@@ -379,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',
@@ -473,7 +465,7 @@ class User {
                     },
                     1,
                 ]);
-                await this.createUserHook(userID);
+                await this.createUserHook(userID, req);
                 findList = await getUsData();
             }
             const data = findList[0];
@@ -496,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',
@@ -552,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
@@ -611,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',
@@ -660,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