abbot-http-client 0.0.9 → 0.0.11

package/dist/index.cjs

@@ -164,12 +164,11 @@ var CoreHttp = class {
   constructor(config) {
     this.config = config;
   }
-  createAxiosInstance(user) {
+  createAxiosInstance(userJWT) {
     const axios2 = axiosConf(this.config);
     const iv = Secure.createId();
     const cryp = new Cryp({
-      iv,
-      keyValue: user.key
+      iv
     });
     axios2.interceptors.request.use(
       (config) => {
@@ -193,11 +192,11 @@ var CoreHttp = class {
           }
         }
         req.headers.set("data-code", iv);
-        if (user.trackingId) {
-          req.headers.set("X-Trace-Id", user.trackingId);
+        if (this.config.app?.trackingId) {
+          req.headers.set("X-Trace-Id", this.config.app.trackingId);
         }
-        if (user.token) {
-          req.headers.setAuthorization(`Bearer ${user.token}`);
+        if (userJWT) {
+          req.headers.setAuthorization(`Bearer ${userJWT}`);
         }
         return req;
       },
@@ -283,78 +282,40 @@ var CoreHttp = class {
     );
     return axios2;
   }
-  async post(param1, url, param) {
-    let axios2;
-    if (typeof param1 === "function") {
-      const user = param1();
-      axios2 = this.createAxiosInstance({
-        key: user?.key,
-        token: user?.token,
-        trackingId: user?.trackingId
-      });
-    } else {
-      axios2 = this.createAxiosInstance({
-        key: param1?.key,
-        token: param1?.token,
-        trackingId: param1?.trackingId
-      });
-    }
+  async post(url, param, jwt) {
+    const axios2 = this.createAxiosInstance(jwt);
     const response = await axios2.post(url, param);
     return response;
   }
-  async get(param1, url) {
-    let axios2;
-    if (typeof param1 === "function") {
-      const user = param1();
-      axios2 = this.createAxiosInstance({
-        key: user?.key,
-        token: user?.token,
-        trackingId: user?.trackingId
-      });
-    } else {
-      axios2 = this.createAxiosInstance({
-        key: param1?.key,
-        token: param1?.token,
-        trackingId: param1?.trackingId
-      });
-    }
+  async get(url, jwt) {
+    const axios2 = this.createAxiosInstance(jwt);
     const response = await axios2.get(url);
     return response;
   }
-  async uploadFile(param1, url, file, param2, param3) {
-    let axios2;
-    if (typeof param1 === "function") {
-      const user = param1();
-      axios2 = this.createAxiosInstance({
-        key: user?.key,
-        token: user?.token,
-        trackingId: user?.trackingId
-      });
-    } else {
-      axios2 = this.createAxiosInstance({
-        key: param1?.key,
-        token: param1?.token,
-        trackingId: param1?.trackingId
-      });
-    }
+  async uploadFile(url, file, param1, param2, param3) {
+    let response;
     const formData = new FormData();
-    if (param2 instanceof Array) {
-      if (file instanceof Array) {
-        param2.forEach((k, i) => {
-          formData.append(k, file[i]);
-        });
-      } else {
-        formData.append("file", file);
+    if (file instanceof Array) {
+      const fileKeys = param1;
+      const param = param2;
+      const jwt = param3;
+      const axios2 = this.createAxiosInstance(jwt);
+      fileKeys.forEach((k, i) => {
+        formData.append(k, file[i]);
+      });
+      if (param) {
+        formData.append("param", JSON.stringify(param));
       }
+      response = await axios2.post(url, formData);
     } else {
-      if (param2) {
-        formData.append("param", JSON.stringify(param2));
+      const param = param1;
+      const jwt = param2;
+      const axios2 = this.createAxiosInstance(jwt);
+      if (param) {
+        formData.append("param", JSON.stringify(param));
       }
+      response = await axios2.post(url, formData);
     }
-    if (param3) {
-      formData.append("param", JSON.stringify(param3));
-    }
-    const response = await axios2.post(url, formData);
     return response;
   }
   getConfig() {
@@ -378,7 +339,8 @@ var cfg = {
   app: {
     redirectUrl: "/login",
     apiKey: "",
-    timezone: "Asia/Bangkok"
+    timezone: "Asia/Bangkok",
+    trackingId: ""
   }
 };
 function getConfig() {

package/dist/index.d.cts

@@ -2,23 +2,14 @@ import { AxiosResponse } from 'axios';
 
 declare function catchError<T, E extends new (err?: any) => Error>(promise: Promise<T>, errorToCatch?: E[]): Promise<[undefined, T] | [InstanceType<E>]>;
 
-interface credential {
-    key: string | undefined;
-    token: string | undefined;
-    trackingId?: string;
-}
 declare class CoreHttp {
     private config;
     constructor(config: AbbotConfig);
     private createAxiosInstance;
-    post<T, U extends credential = credential>(middleware: () => U | null, url: string, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    post<T, U extends credential = credential>(user: U | null, url: string, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    get<T, U extends credential = credential>(middleware: () => U | null, url: string): Promise<AxiosResponse<T>>;
-    get<T, U extends credential = credential>(user: U | null, url: string): Promise<AxiosResponse<T>>;
-    uploadFile<T, U extends credential = credential>(middleware: () => U | null, url: string, file: File, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    uploadFile<T, U extends credential = credential>(middleware: () => U | null, url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    uploadFile<T, U extends credential = credential>(user: U | null, url: string, file: File, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    uploadFile<T, U extends credential = credential>(user: U | null, url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
+    post<T>(url: string, param?: Record<string, any> | null, jwt?: string): Promise<AxiosResponse<T>>;
+    get<T>(url: string, jwt?: string): Promise<AxiosResponse<T>>;
+    uploadFile<T>(url: string, file: File, param?: Record<string, any> | null, jwt?: string): Promise<AxiosResponse<T>>;
+    uploadFile<T>(url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null, jwt?: string): Promise<AxiosResponse<T>>;
     getConfig(): AbbotConfig;
 }
 
@@ -38,6 +29,7 @@ interface AbbotConfig {
         redirectUrl?: string;
         apiKey?: string;
         timezone?: string;
+        trackingId?: string;
     };
 }
 declare function create(config: AbbotConfig): CoreHttp;

package/dist/index.d.ts

@@ -2,23 +2,14 @@ import { AxiosResponse } from 'axios';
 
 declare function catchError<T, E extends new (err?: any) => Error>(promise: Promise<T>, errorToCatch?: E[]): Promise<[undefined, T] | [InstanceType<E>]>;
 
-interface credential {
-    key: string | undefined;
-    token: string | undefined;
-    trackingId?: string;
-}
 declare class CoreHttp {
     private config;
     constructor(config: AbbotConfig);
     private createAxiosInstance;
-    post<T, U extends credential = credential>(middleware: () => U | null, url: string, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    post<T, U extends credential = credential>(user: U | null, url: string, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    get<T, U extends credential = credential>(middleware: () => U | null, url: string): Promise<AxiosResponse<T>>;
-    get<T, U extends credential = credential>(user: U | null, url: string): Promise<AxiosResponse<T>>;
-    uploadFile<T, U extends credential = credential>(middleware: () => U | null, url: string, file: File, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    uploadFile<T, U extends credential = credential>(middleware: () => U | null, url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    uploadFile<T, U extends credential = credential>(user: U | null, url: string, file: File, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
-    uploadFile<T, U extends credential = credential>(user: U | null, url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
+    post<T>(url: string, param?: Record<string, any> | null, jwt?: string): Promise<AxiosResponse<T>>;
+    get<T>(url: string, jwt?: string): Promise<AxiosResponse<T>>;
+    uploadFile<T>(url: string, file: File, param?: Record<string, any> | null, jwt?: string): Promise<AxiosResponse<T>>;
+    uploadFile<T>(url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null, jwt?: string): Promise<AxiosResponse<T>>;
     getConfig(): AbbotConfig;
 }
 
@@ -38,6 +29,7 @@ interface AbbotConfig {
         redirectUrl?: string;
         apiKey?: string;
         timezone?: string;
+        trackingId?: string;
     };
 }
 declare function create(config: AbbotConfig): CoreHttp;

package/dist/index.js

@@ -127,12 +127,11 @@ var CoreHttp = class {
   constructor(config) {
     this.config = config;
   }
-  createAxiosInstance(user) {
+  createAxiosInstance(userJWT) {
     const axios2 = axiosConf(this.config);
     const iv = Secure.createId();
     const cryp = new Cryp({
-      iv,
-      keyValue: user.key
+      iv
     });
     axios2.interceptors.request.use(
       (config) => {
@@ -156,11 +155,11 @@ var CoreHttp = class {
           }
         }
         req.headers.set("data-code", iv);
-        if (user.trackingId) {
-          req.headers.set("X-Trace-Id", user.trackingId);
+        if (this.config.app?.trackingId) {
+          req.headers.set("X-Trace-Id", this.config.app.trackingId);
         }
-        if (user.token) {
-          req.headers.setAuthorization(`Bearer ${user.token}`);
+        if (userJWT) {
+          req.headers.setAuthorization(`Bearer ${userJWT}`);
         }
         return req;
       },
@@ -246,78 +245,40 @@ var CoreHttp = class {
     );
     return axios2;
   }
-  async post(param1, url, param) {
-    let axios2;
-    if (typeof param1 === "function") {
-      const user = param1();
-      axios2 = this.createAxiosInstance({
-        key: user?.key,
-        token: user?.token,
-        trackingId: user?.trackingId
-      });
-    } else {
-      axios2 = this.createAxiosInstance({
-        key: param1?.key,
-        token: param1?.token,
-        trackingId: param1?.trackingId
-      });
-    }
+  async post(url, param, jwt) {
+    const axios2 = this.createAxiosInstance(jwt);
     const response = await axios2.post(url, param);
     return response;
   }
-  async get(param1, url) {
-    let axios2;
-    if (typeof param1 === "function") {
-      const user = param1();
-      axios2 = this.createAxiosInstance({
-        key: user?.key,
-        token: user?.token,
-        trackingId: user?.trackingId
-      });
-    } else {
-      axios2 = this.createAxiosInstance({
-        key: param1?.key,
-        token: param1?.token,
-        trackingId: param1?.trackingId
-      });
-    }
+  async get(url, jwt) {
+    const axios2 = this.createAxiosInstance(jwt);
     const response = await axios2.get(url);
     return response;
   }
-  async uploadFile(param1, url, file, param2, param3) {
-    let axios2;
-    if (typeof param1 === "function") {
-      const user = param1();
-      axios2 = this.createAxiosInstance({
-        key: user?.key,
-        token: user?.token,
-        trackingId: user?.trackingId
-      });
-    } else {
-      axios2 = this.createAxiosInstance({
-        key: param1?.key,
-        token: param1?.token,
-        trackingId: param1?.trackingId
-      });
-    }
+  async uploadFile(url, file, param1, param2, param3) {
+    let response;
     const formData = new FormData();
-    if (param2 instanceof Array) {
-      if (file instanceof Array) {
-        param2.forEach((k, i) => {
-          formData.append(k, file[i]);
-        });
-      } else {
-        formData.append("file", file);
+    if (file instanceof Array) {
+      const fileKeys = param1;
+      const param = param2;
+      const jwt = param3;
+      const axios2 = this.createAxiosInstance(jwt);
+      fileKeys.forEach((k, i) => {
+        formData.append(k, file[i]);
+      });
+      if (param) {
+        formData.append("param", JSON.stringify(param));
       }
+      response = await axios2.post(url, formData);
     } else {
-      if (param2) {
-        formData.append("param", JSON.stringify(param2));
+      const param = param1;
+      const jwt = param2;
+      const axios2 = this.createAxiosInstance(jwt);
+      if (param) {
+        formData.append("param", JSON.stringify(param));
       }
+      response = await axios2.post(url, formData);
     }
-    if (param3) {
-      formData.append("param", JSON.stringify(param3));
-    }
-    const response = await axios2.post(url, formData);
     return response;
   }
   getConfig() {
@@ -341,7 +302,8 @@ var cfg = {
   app: {
     redirectUrl: "/login",
     apiKey: "",
-    timezone: "Asia/Bangkok"
+    timezone: "Asia/Bangkok",
+    trackingId: ""
   }
 };
 function getConfig() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abbot-http-client",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "This package helps Abbot team to handle all the axios requests.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",