@adtrackify/at-service-common 1.1.13 → 1.1.16

package/src/__tests__/helpers/subscription-helper.spec.ts

@@ -1,41 +1,41 @@
-
-/**
- * @group unit
- */
-
-/* eslint-disable */
-
-jest.mock('lambda-log');
-import * as Logger from 'lambda-log';
-import { getPlanDetails } from '../../helpers';
-
-describe('postmark service email test', () => {
-  jest.spyOn(Logger, 'warn').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'info').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'debug').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'error').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-
-  beforeEach(async () => {
-
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-
-  it('should call send email message', async () => {
-    const plan = getPlanDetails(2, 'dev');
-    console.log(plan);
-    expect(plan).not.toEqual(null);
-  });
-
+
+/**
+ * @group unit
+ */
+
+/* eslint-disable */
+
+jest.mock('lambda-log');
+import * as Logger from 'lambda-log';
+import { getPlanDetails } from '../../helpers';
+
+describe('postmark service email test', () => {
+  jest.spyOn(Logger, 'warn').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'info').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'debug').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'error').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+
+  beforeEach(async () => {
+
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+
+  it('should call send email message', async () => {
+    const plan = getPlanDetails(2, 'dev');
+    console.log(plan);
+    expect(plan).not.toEqual(null);
+  });
+
 });

package/src/clients/generic/axios.d.ts

@@ -1,8 +1,8 @@
-declare module 'axios/lib/adapters/http' {
-  import { AxiosAdapter } from 'axios';
-
-  const httpAdapter: AxiosAdapter;
-  namespace httpAdapter { }
-
-  export = httpAdapter;
+declare module 'axios/lib/adapters/http' {
+  import { AxiosAdapter } from 'axios';
+
+  const httpAdapter: AxiosAdapter;
+  namespace httpAdapter { }
+
+  export = httpAdapter;
 }

package/src/clients/generic/dynamodb-client.ts

@@ -1,11 +1,11 @@
 import { DynamoDBClient, QueryOutput } from '@aws-sdk/client-dynamodb';
-import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb'; 
+import { DynamoDBDocument } from '@aws-sdk/lib-dynamodb';
 import * as log from 'lambda-log';
 
 const marshallOptions = {
   convertEmptyValues: false,
   removeUndefinedValues: false,
-  convertClassInstanceToMap: false
+  convertClassInstanceToMap: true
 };
 
 const unmarshallOptions = {

package/src/clients/generic/s3-client.ts

@@ -1,21 +1,17 @@
-import { S3 } from '@aws-sdk/client-s3';
+import { ObjectCannedACL, S3 } from '@aws-sdk/client-s3';
 import * as log from 'lambda-log';
 
 export class S3Client {
   s3: S3;
 
-  constructor(accessKeyId: string, secretAccessKey: string){
-    this.s3 = new S3({
-        credentials: {
-            accessKeyId,
-            secretAccessKey
-        }
-    })
+  constructor (region = 'us-west-2') {
+    this.s3 = new S3({ region });
   }
 
-  async uploadJson(path: string, bucket: string, jsonData: any){
+  async uploadJson(path: string, bucket: string, jsonData: any, ACL: ObjectCannedACL | string = ObjectCannedACL.private) {
     try {
       const res = await this.s3.putObject({
+        ACL,
         Bucket: bucket,
         ContentType: 'application/json; charset=utf-8',
         Body: JSON.stringify(jsonData),

package/src/clients/internal-api/destinations-client.ts

@@ -1,58 +1,58 @@
-import * as log from 'lambda-log';
-//const log = require('lambda-log');
-import { ApiResponse } from '../../types/api-response';
-import { axiosHttpService } from '../generic/http-client';
-import { Destination } from '@adtrackify/at-tracking-event-types';
-//const BASE_API_URL = process.env.BASE_API_URL;
-//const DESTINATIONS_API_KEY = process.env.DESTINATIONS_API_KEY;
-
-export interface GetDestinationsResponseData {
-  destinations: Destination[];
-  [ key: string ]: any;
-}
-export interface CreateDestinationResponseData {
-  destination: Destination;
-  [ key: string ]: any;
-}
-
-
-export class DestinationsClient {
-
-  public BASE_API_URL: string;
-  public DESTINATIONS_API_KEY: string;
-
-  constructor (baseApiUrl: string, destinationsApiKey: string) {
-    this.BASE_API_URL = baseApiUrl;
-    this.DESTINATIONS_API_KEY = destinationsApiKey;
-  }
-
-  getConfig = () => {
-    const SERVICE_API_ROOT_URL = `${this.BASE_API_URL}/destinations`;
-    return {
-      baseURL: SERVICE_API_ROOT_URL,
-      headers: {
-        common: {
-          'x-api-key': this.DESTINATIONS_API_KEY
-        }
-      }
-    };
-  };
-
-  getClient = async () => {
-    return axiosHttpService(this.getConfig());
-  };
-
-  createDestination = async (createDestinationRequest: any): Promise<ApiResponse<CreateDestinationResponseData>> => {
-    const client = await this.getClient();
-    const response = await client.post('/', createDestinationRequest);
-    log.info('createDestinationResponse', { response });
-    return response as ApiResponse<CreateDestinationResponseData>;
-  };
-
-  getPixelDestinations = async (pixelId: string): Promise<ApiResponse<GetDestinationsResponseData>> => {
-    const client = await this.getClient();
-    const response = await client.get(`/?pixelId=${pixelId}`);
-    log.info('getPixelResponse', { response });
-    return response as ApiResponse<GetDestinationsResponseData>;
-  };
-}
+import * as log from 'lambda-log';
+//const log = require('lambda-log');
+import { ApiResponse } from '../../types/api-response';
+import { axiosHttpService } from '../generic/http-client';
+import { Destination } from '@adtrackify/at-tracking-event-types';
+//const BASE_API_URL = process.env.BASE_API_URL;
+//const DESTINATIONS_API_KEY = process.env.DESTINATIONS_API_KEY;
+
+export interface GetDestinationsResponseData {
+  destinations: Destination[];
+  [ key: string ]: any;
+}
+export interface CreateDestinationResponseData {
+  destination: Destination;
+  [ key: string ]: any;
+}
+
+
+export class DestinationsClient {
+
+  public BASE_API_URL: string;
+  public DESTINATIONS_API_KEY: string;
+
+  constructor (baseApiUrl: string, destinationsApiKey: string) {
+    this.BASE_API_URL = baseApiUrl;
+    this.DESTINATIONS_API_KEY = destinationsApiKey;
+  }
+
+  getConfig = () => {
+    const SERVICE_API_ROOT_URL = `${this.BASE_API_URL}/destinations`;
+    return {
+      baseURL: SERVICE_API_ROOT_URL,
+      headers: {
+        common: {
+          'x-api-key': this.DESTINATIONS_API_KEY
+        }
+      }
+    };
+  };
+
+  getClient = async () => {
+    return axiosHttpService(this.getConfig());
+  };
+
+  createDestination = async (createDestinationRequest: any): Promise<ApiResponse<CreateDestinationResponseData>> => {
+    const client = await this.getClient();
+    const response = await client.post('/', createDestinationRequest);
+    log.info('createDestinationResponse', { response });
+    return response as ApiResponse<CreateDestinationResponseData>;
+  };
+
+  getPixelDestinations = async (pixelId: string): Promise<ApiResponse<GetDestinationsResponseData>> => {
+    const client = await this.getClient();
+    const response = await client.get(`/?pixelId=${pixelId}`);
+    log.info('getPixelResponse', { response });
+    return response as ApiResponse<GetDestinationsResponseData>;
+  };
+}

package/src/clients/internal-api/index.ts

@@ -1,4 +1,4 @@
-export * from './destinations-client';
-export * from './accounts-client';
-export * from './users-auth-client';
-export * from './shopify-app-install-client';
+export * from './destinations-client';
+export * from './accounts-client';
+export * from './users-auth-client';
+export * from './shopify-app-install-client';

package/src/clients/internal-api/shopify-app-install-client.ts

@@ -1,66 +1,66 @@
-import log from 'lambda-log';
-import { ApiResponse } from '../../types/api-response';
-import { axiosHttpService } from '../generic/http-client';
-import { ShopifyAppInstall, ShopifyAppSubscriptionStatus } from '@adtrackify/at-tracking-event-types';
-//const BASE_API_URL = process.env.BASE_API_URL;
-//const DESTINATIONS_API_KEY = process.env.DESTINATIONS_API_KEY;
-
-export interface ShopifyAppInstallResponseData {
-  shopifyAppInstall: ShopifyAppInstall;
-  [ key: string ]: any;
-}
-
-export interface UpdateShopifyAppInstallRequest {
-  appSubscriptionStatus?: ShopifyAppSubscriptionStatus,
-  pixelId?: string,
-  shopifyAppInstallId: string;
-  isAppEnabled?: boolean;
-}
-
-export class ShopifyAppInstallClient {
-
-  public BASE_API_URL: string;
-  public SHOPIFY_APP_INSTALL_API_KEY: string;
-
-  constructor (baseApiUrl: string, shopifyAppInstallApiKey: string) {
-    this.BASE_API_URL = baseApiUrl;
-    this.SHOPIFY_APP_INSTALL_API_KEY = shopifyAppInstallApiKey;
-  }
-
-  getConfig = () => {
-    const SERVICE_API_ROOT_URL = `${this.BASE_API_URL}/shopify-app-installs`;
-    return {
-      baseURL: SERVICE_API_ROOT_URL,
-      headers: {
-        common: {
-          'x-api-key': this.SHOPIFY_APP_INSTALL_API_KEY
-        }
-      }
-    };
-  };
-
-  getClient = async () => {
-    return axiosHttpService(this.getConfig());
-  };
-
-  updateShopifyAppInstall = async (shopifyAppInstallId: string, updateShopifyAppInstallRequest: UpdateShopifyAppInstallRequest): Promise<ApiResponse<ShopifyAppInstallResponseData>> => {
-    const client = await this.getClient();
-    const response = await client.put(`/${shopifyAppInstallId}`, updateShopifyAppInstallRequest);
-    log.info('updateShopifyAppInstall', { response });
-    return response as ApiResponse<ShopifyAppInstallResponseData>;
-  };
-
-  getShopifyAppInstall = async (shopifyAppInstallId: string): Promise<ApiResponse<ShopifyAppInstallResponseData>> => {
-    const client = await this.getClient();
-    const response = await client.get(`/${shopifyAppInstallId}`);
-    log.info('getShopifyAppInstall', { response });
-    return response as ApiResponse<ShopifyAppInstallResponseData>;
-  };
-
-  getShopifyAppInstallByShop = async (shop: string): Promise<ApiResponse<ShopifyAppInstallResponseData>> => {
-    const client = await this.getClient();
-    const response = await client.get(`/?shop=${shop}`);
-    log.info('getShopifyAppInstallByShop', { response });
-    return response as ApiResponse<ShopifyAppInstallResponseData>; 
-  }
-}
+import log from 'lambda-log';
+import { ApiResponse } from '../../types/api-response';
+import { axiosHttpService } from '../generic/http-client';
+import { ShopifyAppInstall, ShopifyAppSubscriptionStatus } from '@adtrackify/at-tracking-event-types';
+//const BASE_API_URL = process.env.BASE_API_URL;
+//const DESTINATIONS_API_KEY = process.env.DESTINATIONS_API_KEY;
+
+export interface ShopifyAppInstallResponseData {
+  shopifyAppInstall: ShopifyAppInstall;
+  [ key: string ]: any;
+}
+
+export interface UpdateShopifyAppInstallRequest {
+  appSubscriptionStatus?: ShopifyAppSubscriptionStatus,
+  pixelId?: string,
+  shopifyAppInstallId: string;
+  isAppEnabled?: boolean;
+}
+
+export class ShopifyAppInstallClient {
+
+  public BASE_API_URL: string;
+  public SHOPIFY_APP_INSTALL_API_KEY: string;
+
+  constructor (baseApiUrl: string, shopifyAppInstallApiKey: string) {
+    this.BASE_API_URL = baseApiUrl;
+    this.SHOPIFY_APP_INSTALL_API_KEY = shopifyAppInstallApiKey;
+  }
+
+  getConfig = () => {
+    const SERVICE_API_ROOT_URL = `${this.BASE_API_URL}/shopify-app-installs`;
+    return {
+      baseURL: SERVICE_API_ROOT_URL,
+      headers: {
+        common: {
+          'x-api-key': this.SHOPIFY_APP_INSTALL_API_KEY
+        }
+      }
+    };
+  };
+
+  getClient = async () => {
+    return axiosHttpService(this.getConfig());
+  };
+
+  updateShopifyAppInstall = async (shopifyAppInstallId: string, updateShopifyAppInstallRequest: UpdateShopifyAppInstallRequest): Promise<ApiResponse<ShopifyAppInstallResponseData>> => {
+    const client = await this.getClient();
+    const response = await client.put(`/${shopifyAppInstallId}`, updateShopifyAppInstallRequest);
+    log.info('updateShopifyAppInstall', { response });
+    return response as ApiResponse<ShopifyAppInstallResponseData>;
+  };
+
+  getShopifyAppInstall = async (shopifyAppInstallId: string): Promise<ApiResponse<ShopifyAppInstallResponseData>> => {
+    const client = await this.getClient();
+    const response = await client.get(`/${shopifyAppInstallId}`);
+    log.info('getShopifyAppInstall', { response });
+    return response as ApiResponse<ShopifyAppInstallResponseData>;
+  };
+
+  getShopifyAppInstallByShop = async (shop: string): Promise<ApiResponse<ShopifyAppInstallResponseData>> => {
+    const client = await this.getClient();
+    const response = await client.get(`/?shop=${shop}`);
+    log.info('getShopifyAppInstallByShop', { response });
+    return response as ApiResponse<ShopifyAppInstallResponseData>; 
+  }
+}