added .npmignore, fixes syntax issues

osmangoninahid · Dec 13, 2023 · 33088cd · 33088cd
1 parent d11b61d
commit 33088cd
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 30 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@osmangoninahid/nestjs-shopee",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "NestJS npm package for Shopee",
   "author": "Osman Goni Nahid <osmangoni.se@gmail.com>",
   "license": "MIT",

diff --git a/src/resources/auth.ts b/src/resources/auth.ts
@@ -7,8 +7,8 @@ import { generateQueryParams } from '../util';
 export class Auth {
   protected shopeeRequest: AxiosInstance;
   private readonly shopeeConfig: ShopeeConfig;
-  constructor(private config: ShopeeConfig) {
-    this.shopeeRequest = ShopeeRequest.getInstance();
+  constructor(config: ShopeeConfig) {
+    this.shopeeRequest = ShopeeRequest.getInstance(config);
     this.shopeeConfig = config;
   }
 

diff --git a/src/resources/shop.ts b/src/resources/shop.ts
@@ -5,18 +5,26 @@ import { ShopeeStoreUpdateDto } from '../dtos';
 import { Order } from './order';
 import { Product } from './product';
 import { Logistic } from './logistic';
+import { ShopeeConfig } from '../shopee-config.interface';
 export class Shop {
   protected shopeeRequest: AxiosInstance;
+  public shopeeConfig: ShopeeConfig;
   public shopId: number;
   public accessToken: string;
   private order: Order;
   private product: Product;
   private logistic: Logistic;
 
-  constructor(params: { shopId: number; accessToken: string; onRefreshAccessToken?: () => Promise<string> }) {
+  constructor(params: {
+    shopeeConfig: ShopeeConfig;
+    shopId: number;
+    accessToken: string;
+    onRefreshAccessToken?: () => Promise<string>;
+  }) {
     this.shopId = params.shopId;
     this.accessToken = params.accessToken;
     this.shopeeRequest = ShopeeRequest.getAuthorizedInstance({
+      shopeeConfig: params.shopeeConfig,
       shopId: params.shopId,
       token: params.accessToken,
       onRefreshAccessToken: params.onRefreshAccessToken,

diff --git a/src/shopee.request.ts b/src/shopee.request.ts
@@ -7,23 +7,14 @@ import { generateQueryParams } from './util';
 
 @Injectable()
 export class ShopeeRequest {
-  private static shopeeConfig: ShopeeConfig;
-  constructor(@Inject(SHOPEE_CONFIG) private readonly configs: ShopeeConfig) {
-    ShopeeRequest.shopeeConfig = configs;
-  }
-
-  static getInstance(): AxiosInstance {
+  static getInstance(shopeeConfig: ShopeeConfig): AxiosInstance {
     const instance = axios.create({
-      baseURL: ShopeeRequest.shopeeConfig.host,
+      baseURL: shopeeConfig.host,
     });
     instance.interceptors.request.use(function (config) {
       const parsed = queryString.parseUrl('/api/v2/' + config.url);
       config.url =
-        generateQueryParams(
-          parsed.url,
-          ShopeeRequest.shopeeConfig.partnerId.toString(),
-          ShopeeRequest.shopeeConfig.partnerKey,
-        ) +
+        generateQueryParams(parsed.url, shopeeConfig.partnerId.toString(), shopeeConfig.partnerKey) +
         '&' +
         queryString.stringify(parsed.query);
       return config;
@@ -32,28 +23,24 @@ export class ShopeeRequest {
   }
 
   static getAuthorizedInstance({
+    shopeeConfig,
     shopId,
     token,
     onRefreshAccessToken,
   }: {
+    shopeeConfig: ShopeeConfig;
     shopId: number;
     token: string;
     onRefreshAccessToken?: () => Promise<string>;
   }): AxiosInstance {
     const instance = axios.create({
-      baseURL: ShopeeRequest.shopeeConfig.host,
+      baseURL: shopeeConfig.host,
     });
 
     instance.interceptors.request.use(async function (config) {
       const parsed = queryString.parseUrl('/api/v2/' + config.url);
       config.url =
-        generateQueryParams(
-          parsed.url,
-          ShopeeRequest.shopeeConfig.partnerId.toString(),
-          ShopeeRequest.shopeeConfig.partnerKey,
-          token,
-          shopId,
-        ) +
+        generateQueryParams(parsed.url, shopeeConfig.partnerId.toString(), shopeeConfig.partnerKey, token, shopId) +
         '&' +
         queryString.stringify(parsed.query);
       return config;
@@ -79,8 +66,8 @@ export class ShopeeRequest {
           config.url =
             generateQueryParams(
               parsedUrl.url,
-              ShopeeRequest.shopeeConfig.partnerId.toString(),
-              ShopeeRequest.shopeeConfig.partnerKey,
+              shopeeConfig.partnerId.toString(),
+              shopeeConfig.partnerKey,
               newToken,
               shopId,
             ) +

diff --git a/src/shopee.service.ts b/src/shopee.service.ts
@@ -2,17 +2,19 @@ import { Inject, Injectable } from '@nestjs/common';
 import { SHOPEE_CONFIG } from './constants';
 import { ShopeeConfig } from './shopee-config.interface';
 import { Auth } from './resources/auth';
-import { ShopeeAuthResponseDto } from './dtos/shopee-auth.response.dto';
+import { ShopeeAuthResponseDto } from './dtos';
 import { Shop } from './resources/shop';
-import { ShopeeStoreUpdateDto } from './dtos/shopee-store.update.dto';
-import { ShopeeApiResponseDto } from './dtos/shopee-api.response.dto';
-import { ITEM_STATUS } from './dtos/item-status.enum';
+import { ShopeeStoreUpdateDto } from './dtos';
+import { ShopeeApiResponseDto } from './dtos';
+import { ITEM_STATUS } from './dtos';
 
 @Injectable()
 export class ShopeeService {
   private readonly auth: Auth;
   private shop: Shop;
+  private readonly configs: ShopeeConfig;
   constructor(@Inject(SHOPEE_CONFIG) private readonly shopeeConfig: ShopeeConfig) {
+    this.configs = shopeeConfig;
     this.auth = new Auth(shopeeConfig);
   }
 
@@ -58,6 +60,7 @@ export class ShopeeService {
 
   public initializeShop(shopId: number, accessToken: string, onRefreshAccessToken?: () => Promise<string>) {
     this.shop = new Shop({
+      shopeeConfig: this.configs,
       shopId,
       accessToken,
       onRefreshAccessToken,