abbot-http-client 0.0.11 → 0.0.13

package/dist/index.cjs

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

package/dist/index.d.cts

@@ -6,32 +6,34 @@ declare class CoreHttp {
     private config;
     constructor(config: AbbotConfig);
     private createAxiosInstance;
-    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>>;
+    post<T>(url: string, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
+    get<T>(url: string): Promise<AxiosResponse<T>>;
+    uploadFile<T>(url: string, file: File, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
+    uploadFile<T>(url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
     getConfig(): AbbotConfig;
 }
 
 interface AbbotConfig {
-    axios?: {
-        baseUrl?: string;
-        headers?: {
-            accept?: string;
-            lang?: string;
-            post?: {
-                contentType?: string;
+    axios: {
+        baseUrl: string;
+        headers: {
+            accept: string;
+            lang: string;
+            post: {
+                contentType: string;
             };
         };
-        timeout?: number;
+        timeout: number;
     };
-    app?: {
-        redirectUrl?: string;
-        apiKey?: string;
-        timezone?: string;
-        trackingId?: string;
+    app: {
+        redirectUrl: string;
+        apiKey: string;
+        timezone: string;
+        trackingId: string;
+        ecnKey: string | undefined;
+        userJwt: string | undefined;
     };
 }
-declare function create(config: AbbotConfig): CoreHttp;
+declare function create(config: Partial<AbbotConfig>): CoreHttp;
 
 export { type AbbotConfig, catchError, create };

package/dist/index.d.ts

@@ -6,32 +6,34 @@ declare class CoreHttp {
     private config;
     constructor(config: AbbotConfig);
     private createAxiosInstance;
-    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>>;
+    post<T>(url: string, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
+    get<T>(url: string): Promise<AxiosResponse<T>>;
+    uploadFile<T>(url: string, file: File, param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
+    uploadFile<T>(url: string, file: File[], fileKeys: string[], param?: Record<string, any> | null): Promise<AxiosResponse<T>>;
     getConfig(): AbbotConfig;
 }
 
 interface AbbotConfig {
-    axios?: {
-        baseUrl?: string;
-        headers?: {
-            accept?: string;
-            lang?: string;
-            post?: {
-                contentType?: string;
+    axios: {
+        baseUrl: string;
+        headers: {
+            accept: string;
+            lang: string;
+            post: {
+                contentType: string;
             };
         };
-        timeout?: number;
+        timeout: number;
     };
-    app?: {
-        redirectUrl?: string;
-        apiKey?: string;
-        timezone?: string;
-        trackingId?: string;
+    app: {
+        redirectUrl: string;
+        apiKey: string;
+        timezone: string;
+        trackingId: string;
+        ecnKey: string | undefined;
+        userJwt: string | undefined;
     };
 }
-declare function create(config: AbbotConfig): CoreHttp;
+declare function create(config: Partial<AbbotConfig>): CoreHttp;
 
 export { type AbbotConfig, catchError, create };

package/dist/index.js

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

package/package.json

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