@adtrackify/at-service-common 1.0.59 → 1.0.61

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

@@ -1,108 +1,108 @@
-import * as log from 'lambda-log';
-import { ApiResponse } from '../../types/api-response';
-import { ACCOUNT_STATUS, Destination } from '@adtrackify/at-tracking-event-types';
-import { axiosHttpService } from '../generic/http-client';
-
-//const BASE_API_URL = process.env.BASE_API_URL;
-
-//const SERVICE_API_ROOT_URL = `${BASE_API_URL}/accounts`;
-//const ACCOUNTS_API_KEY = process.env.ACCOUNTS_API_KEY;
-
-export interface AccountResponseData {
-  account: boolean;
-  [ key: string ]: any;
-}
-
-export interface IsAuthorizedUserResponseData {
-  isAccountUser: boolean;
-  [ key: string ]: any;
-}
-export interface PixelConfigResponseData {
-  id: string;
-  destinations: Destination[];
-  [ key: string ]: any;
-}
-
-export interface UpdateAccountRequest {
-  accountName?: string,
-  companyName?: string,
-  primaryEmail?: string,
-  ownerId?: string,
-  subscriptionId?: string,
-  accountStatus?: ACCOUNT_STATUS;
-}
-
-export class AccountsClient {
-  public BASE_API_URL: string;
-  public ACCOUNTS_API_KEY?: string;
-
-  constructor (baseApiUrl: string, accountsApiKey?: string) {
-    this.BASE_API_URL = baseApiUrl;
-    this.ACCOUNTS_API_KEY = accountsApiKey;
-  }
-
-  getConfig = () => {
-    const SERVICE_API_ROOT_URL = `${this.BASE_API_URL}/accounts`;
-    const params: any = {
-      baseURL: SERVICE_API_ROOT_URL
-    };
-    if (this.ACCOUNTS_API_KEY) {
-      params.headers = {
-        common: {
-          'x-api-key': this.ACCOUNTS_API_KEY
-        }
-      };
-    }
-    return params;
-  };
-
-  getClient = async () => {
-    return axiosHttpService(this.getConfig());
-  };
-
-  createAccount = async (createAccountRequest: any) => {
-    const client = await this.getClient();
-    const createAccountResponse = await client.post('', createAccountRequest);
-    log.info('createAccountResponse', { createAccountResponse });
-    return createAccountResponse;
-  };
-  updateAccount = async (accountId: string, body: any): Promise<ApiResponse<AccountResponseData>> => {
-    const client = await this.getClient();
-    const response = await client.patch(`/${accountId}/`, body);
-    log.info('update Account response', { response });
-    return response as ApiResponse<AccountResponseData>;
-  };
-  addOwner = async (accountId: string, userId: string) => {
-    const client = await this.getClient();
-    const addOwnerResponse = await client.post('/addOwner', { accountId, userId });
-    log.info('addOwnerResponse', { addOwnerResponse });
-    return addOwnerResponse;
-  };
-  isAuthorizedUser = async (userId: string, accountId: string, pixelId?: string): Promise<ApiResponse<IsAuthorizedUserResponseData>> => {
-    const client = await this.getClient();
-    const body = {
-      userId, accountId, pixelId
-    };
-    const response = await client.post('/checkUserAuthorization', body);
-    log.info('checkUserAuthorization', { response });
-    return response as ApiResponse<IsAuthorizedUserResponseData>;
-  };
-  adminDeleteAccount = async (accountId: string) => {
-    const client = await this.getClient();
-    const success = await client.delete(`/${accountId}`);
-    log.info('adminDeleteAccount');
-    return success;
-  };
-  getPixelConfigById = async (pixelId: string): Promise<ApiResponse<PixelConfigResponseData>> => {
-    const client = await this.getClient();
-    const pixelResponse = await client.get(`/px/${pixelId}/config`);
-    log.debug('pixelResponse', { pixelResponse });
-    return pixelResponse;
-  };
-  // setAccountSubscriptionId = async (accountId: string, subscriptionId: string): Promise<ApiResponse<any>> => {
-  //   const client = await this.getClient();
-  //   const pixelResponse = await client.get(`/px/${pixelId}/config`);
-  //   log.debug('pixelResponse', { pixelResponse });
-  //   return pixelResponse;
-  // };
+import * as log from 'lambda-log';
+import { ApiResponse } from '../../types/api-response';
+import { ACCOUNT_STATUS, Destination } from '@adtrackify/at-tracking-event-types';
+import { axiosHttpService } from '../generic/http-client';
+
+//const BASE_API_URL = process.env.BASE_API_URL;
+
+//const SERVICE_API_ROOT_URL = `${BASE_API_URL}/accounts`;
+//const ACCOUNTS_API_KEY = process.env.ACCOUNTS_API_KEY;
+
+export interface AccountResponseData {
+  account: boolean;
+  [ key: string ]: any;
+}
+
+export interface IsAuthorizedUserResponseData {
+  isAccountUser: boolean;
+  [ key: string ]: any;
+}
+export interface PixelConfigResponseData {
+  id: string;
+  destinations: Destination[];
+  [ key: string ]: any;
+}
+
+export interface UpdateAccountRequest {
+  accountName?: string,
+  companyName?: string,
+  primaryEmail?: string,
+  ownerId?: string,
+  subscriptionId?: string,
+  accountStatus?: ACCOUNT_STATUS;
+}
+
+export class AccountsClient {
+  public BASE_API_URL: string;
+  public ACCOUNTS_API_KEY?: string;
+
+  constructor (baseApiUrl: string, accountsApiKey?: string) {
+    this.BASE_API_URL = baseApiUrl;
+    this.ACCOUNTS_API_KEY = accountsApiKey;
+  }
+
+  getConfig = () => {
+    const SERVICE_API_ROOT_URL = `${this.BASE_API_URL}/accounts`;
+    const params: any = {
+      baseURL: SERVICE_API_ROOT_URL
+    };
+    if (this.ACCOUNTS_API_KEY) {
+      params.headers = {
+        common: {
+          'x-api-key': this.ACCOUNTS_API_KEY
+        }
+      };
+    }
+    return params;
+  };
+
+  getClient = async () => {
+    return axiosHttpService(this.getConfig());
+  };
+
+  createAccount = async (createAccountRequest: any) => {
+    const client = await this.getClient();
+    const createAccountResponse = await client.post('', createAccountRequest);
+    log.info('createAccountResponse', { createAccountResponse });
+    return createAccountResponse;
+  };
+  updateAccount = async (accountId: string, body: any): Promise<ApiResponse<AccountResponseData>> => {
+    const client = await this.getClient();
+    const response = await client.patch(`/${accountId}/`, body);
+    log.info('update Account response', { response });
+    return response as ApiResponse<AccountResponseData>;
+  };
+  addOwner = async (accountId: string, userId: string) => {
+    const client = await this.getClient();
+    const addOwnerResponse = await client.post('/addOwner', { accountId, userId });
+    log.info('addOwnerResponse', { addOwnerResponse });
+    return addOwnerResponse;
+  };
+  isAuthorizedUser = async (userId: string, accountId: string, pixelId?: string): Promise<ApiResponse<IsAuthorizedUserResponseData>> => {
+    const client = await this.getClient();
+    const body = {
+      userId, accountId, pixelId
+    };
+    const response = await client.post('/checkUserAuthorization', body);
+    log.info('checkUserAuthorization', { response });
+    return response as ApiResponse<IsAuthorizedUserResponseData>;
+  };
+  adminDeleteAccount = async (accountId: string) => {
+    const client = await this.getClient();
+    const success = await client.delete(`/${accountId}`);
+    log.info('adminDeleteAccount');
+    return success;
+  };
+  getPixelConfigById = async (pixelId: string): Promise<ApiResponse<PixelConfigResponseData>> => {
+    const client = await this.getClient();
+    const pixelResponse = await client.get(`/px/${pixelId}/config`);
+    log.debug('pixelResponse', { pixelResponse });
+    return pixelResponse;
+  };
+  // setAccountSubscriptionId = async (accountId: string, subscriptionId: string): Promise<ApiResponse<any>> => {
+  //   const client = await this.getClient();
+  //   const pixelResponse = await client.get(`/px/${pixelId}/config`);
+  //   log.debug('pixelResponse', { pixelResponse });
+  //   return pixelResponse;
+  // };
 }

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/users-auth-client.ts

@@ -66,20 +66,21 @@ export class UsersAuthClient {
   };
 
   //userName is same as user id
-  adminConfirmUser = async (userName: string) => {
+  adminConfirmUser = async (email: string) => {
     //confirm user
     //@TODO update user auth service with admin confirm user endpoint
-    log.info('Attempting to admin confirm user', { userName });
+    log.info('Attempting to admin confirm user', { email });
 
     const client = await this.getClient();
-    const response = await client.post('/admin/confirm', {
+    const response = await client.post('/admin/confirm',
+      {
+        email
+      }, {
       headers: {
         'x-api-key': this.USERS_AUTH_API_KEY
-      },
-      params: {
-        userName
       }
-    });
+    }
+    );
 
     // Check if Successful or throw error
     if (response.status !== 200) {

package/src/clients/third-party/shopify-client.ts

@@ -1,128 +1,128 @@
-import { axiosHttpService } from '../generic/http-client';
-import * as log from 'lambda-log';
-
-export class ShopifyClient {
-  static _shopify_api_version = process.env.SHOPIFY_API_VERSION as string;
-  static getConfig = (shopifyDomain: string, accessToken: string) => {
-    const config = {
-      baseURL: `https://${shopifyDomain}/admin/api/${this._shopify_api_version}`,
-      headers: {
-        common: {
-          'X-Shopify-Access-Token': accessToken,
-        },
-      },
-    };
-    return config;
-  };
-
-  static getClient = (shopifyDomain: string, accessToken: string) => {
-    return axiosHttpService(
-      this.getConfig(shopifyDomain, accessToken)
-    );
-  };
-
-  static registerApp = async (shop: string, code: string, appKey: string, appSecret: string) => {
-    const client = axiosHttpService();
-    const url = 'https://' + shop + '/admin/oauth/access_token';
-    const payload = {
-      client_id: appKey,
-      client_secret: appSecret,
-      code
-    };
-    const res = await client.post(url, payload);
-    return res;
-  };
-
-  static registerWebhookTopic = async (shop: string, accessToken: string, eventBridgeArn: string, topic: string) => {
-    const client = axiosHttpService();
-    const url = `https://${shop}/admin/api/${this._shopify_api_version}/webhooks.json`;
-    const payload = {
-      webhook: {
-        topic,
-        address: eventBridgeArn,
-        format: 'json'
-      }
-    };
-    const res = await client.post(url, payload, { headers: { 'X-Shopify-Access-Token': accessToken } });
-    if (res.status >= 400) {
-      log.error('Failed to register Webhook Topic', { shop, accessToken, eventBridgeArn, topic, url, payload });
-    }
-    log.debug('Shopify Client Webhook Registration Response', { registrationResponse: res });
-    return res;
-  };
-
-  static updateShopifyAppMetafield = async (shop: string, accessToken: string, pixelId: string) => {
-    const url = `https://${shop}/admin/api/${this._shopify_api_version}/metafields.json`;
-    const payload = {
-      metafield: {
-        namespace: 'adtr',
-        key: 'adtr.config',
-        value: pixelId,
-        type: 'single_line_text_field'
-      }
-    };
-    const res = await this.genericShopifyPost(url, accessToken, payload);
-
-    if (res.status >= 400) {
-      log.error('Failed to register Webhook Topic', { shop, accessToken, url, payload });
-    }
-    return res;
-  };
-
-  static getShopifyStoreProperties = async (shop: string, accessToken: string) => {
-    const url = `https://${shop}/admin/api/${this._shopify_api_version}/shop.json`;
-    const res = await this.genericShopifyGet(url, accessToken);
-
-    if (res.status >= 400) {
-      log.error('Failed to get Shopify Store Properties', { shop, accessToken, url });
-    }
-    return res;
-  };
-
-  static createAppSubscription = async (shop: string, accessToken: string,
-    planName: string, price: number, returnUrl: string, trialDays: number, test?: boolean) => {
-    const url = `https://${shop}/admin/api/${this._shopify_api_version}/recurring_application_charges.json`;
-    const recurring_application_charge = {
-      name: planName,
-      price,
-      return_url: returnUrl,
-      trial_days: trialDays,
-      test
-    };
-    const res = await this.genericShopifyPost(url, accessToken, { recurring_application_charge });
-    if (res.status >= 400) {
-      log.error('Failed to create App Subscription', { shop, accessToken, url });
-    }
-    return res;
-  };
-
-  static listAppSubscriptions = async (shop: string, accessToken: string) => {
-    const url = `https://${shop}/admin/api/${this._shopify_api_version}/recurring_application_charges.json`;
-    const res = await this.genericShopifyGet(url, accessToken);
-    if (res.status >= 400) {
-      log.error('Failed to get App Subscriptions', { shop, accessToken, url });
-    }
-    return res;
-  };
-
-  static genericShopifyPost = async (url: string, accessToken: string, payload: any) => {
-    const client = axiosHttpService();
-    const res = await client.post(url, payload, { headers: { 'X-Shopify-Access-Token': accessToken } });
-    log.debug('Shopify Client Response', { res });
-    return res;
-  };
-
-  static genericShopifyGet = async (url: string, accessToken: string) => {
-    const client = axiosHttpService();
-    const res = await client.get(url, { headers: { 'X-Shopify-Access-Token': accessToken } });
-    log.debug('Shopify Client Response', { res });
-    return res;
-  };
-
-  static genericShopifyPut = async (url: string, accessToken: string, payload: any) => {
-    const client = axiosHttpService();
-    const res = await client.put(url, payload, { headers: { 'X-Shopify-Access-Token': accessToken } });
-    log.debug('Shopify Client Response', { res });
-    return res;
-  };
-}
+import { axiosHttpService } from '../generic/http-client';
+import * as log from 'lambda-log';
+
+export class ShopifyClient {
+  static _shopify_api_version = process.env.SHOPIFY_API_VERSION as string;
+  static getConfig = (shopifyDomain: string, accessToken: string) => {
+    const config = {
+      baseURL: `https://${shopifyDomain}/admin/api/${this._shopify_api_version}`,
+      headers: {
+        common: {
+          'X-Shopify-Access-Token': accessToken,
+        },
+      },
+    };
+    return config;
+  };
+
+  static getClient = (shopifyDomain: string, accessToken: string) => {
+    return axiosHttpService(
+      this.getConfig(shopifyDomain, accessToken)
+    );
+  };
+
+  static registerApp = async (shop: string, code: string, appKey: string, appSecret: string) => {
+    const client = axiosHttpService();
+    const url = 'https://' + shop + '/admin/oauth/access_token';
+    const payload = {
+      client_id: appKey,
+      client_secret: appSecret,
+      code
+    };
+    const res = await client.post(url, payload);
+    return res;
+  };
+
+  static registerWebhookTopic = async (shop: string, accessToken: string, eventBridgeArn: string, topic: string) => {
+    const client = axiosHttpService();
+    const url = `https://${shop}/admin/api/${this._shopify_api_version}/webhooks.json`;
+    const payload = {
+      webhook: {
+        topic,
+        address: eventBridgeArn,
+        format: 'json'
+      }
+    };
+    const res = await client.post(url, payload, { headers: { 'X-Shopify-Access-Token': accessToken } });
+    if (res.status >= 400) {
+      log.error('Failed to register Webhook Topic', { shop, accessToken, eventBridgeArn, topic, url, payload });
+    }
+    log.debug('Shopify Client Webhook Registration Response', { registrationResponse: res });
+    return res;
+  };
+
+  static updateShopifyAppMetafield = async (shop: string, accessToken: string, pixelId: string) => {
+    const url = `https://${shop}/admin/api/${this._shopify_api_version}/metafields.json`;
+    const payload = {
+      metafield: {
+        namespace: 'adtr',
+        key: 'adtr.config',
+        value: pixelId,
+        type: 'single_line_text_field'
+      }
+    };
+    const res = await this.genericShopifyPost(url, accessToken, payload);
+
+    if (res.status >= 400) {
+      log.error('Failed to register Webhook Topic', { shop, accessToken, url, payload });
+    }
+    return res;
+  };
+
+  static getShopifyStoreProperties = async (shop: string, accessToken: string) => {
+    const url = `https://${shop}/admin/api/${this._shopify_api_version}/shop.json`;
+    const res = await this.genericShopifyGet(url, accessToken);
+
+    if (res.status >= 400) {
+      log.error('Failed to get Shopify Store Properties', { shop, accessToken, url });
+    }
+    return res;
+  };
+
+  static createAppSubscription = async (shop: string, accessToken: string,
+    planName: string, price: number, returnUrl: string, trialDays: number, test?: boolean) => {
+    const url = `https://${shop}/admin/api/${this._shopify_api_version}/recurring_application_charges.json`;
+    const recurring_application_charge = {
+      name: planName,
+      price,
+      return_url: returnUrl,
+      trial_days: trialDays,
+      test
+    };
+    const res = await this.genericShopifyPost(url, accessToken, { recurring_application_charge });
+    if (res.status >= 400) {
+      log.error('Failed to create App Subscription', { shop, accessToken, url });
+    }
+    return res;
+  };
+
+  static listAppSubscriptions = async (shop: string, accessToken: string) => {
+    const url = `https://${shop}/admin/api/${this._shopify_api_version}/recurring_application_charges.json`;
+    const res = await this.genericShopifyGet(url, accessToken);
+    if (res.status >= 400) {
+      log.error('Failed to get App Subscriptions', { shop, accessToken, url });
+    }
+    return res;
+  };
+
+  static genericShopifyPost = async (url: string, accessToken: string, payload: any) => {
+    const client = axiosHttpService();
+    const res = await client.post(url, payload, { headers: { 'X-Shopify-Access-Token': accessToken } });
+    log.debug('Shopify Client Response', { res });
+    return res;
+  };
+
+  static genericShopifyGet = async (url: string, accessToken: string) => {
+    const client = axiosHttpService();
+    const res = await client.get(url, { headers: { 'X-Shopify-Access-Token': accessToken } });
+    log.debug('Shopify Client Response', { res });
+    return res;
+  };
+
+  static genericShopifyPut = async (url: string, accessToken: string, payload: any) => {
+    const client = axiosHttpService();
+    const res = await client.put(url, payload, { headers: { 'X-Shopify-Access-Token': accessToken } });
+    log.debug('Shopify Client Response', { res });
+    return res;
+  };
+}

package/src/helpers/input-validation-helper.ts

@@ -1,22 +1,22 @@
-import Joi from 'joi';
-import * as log from 'lambda-log';
-import { HttpError } from '../libs/http-error';
-
-export const validateInput = (schema: Joi.ObjectSchema<any>, input: any) => {
-  const { error, value } = schema.validate(input);
-  if (error) {
-    log.info('', { error });
-
-    const httperr = HttpError.badRequest('Bad Request', {
-      errors: error.details.map(detail => ({
-        message: detail?.message,
-        key: detail?.context?.key,
-        path: detail?.path,
-      }))
-    });
-
-    log.info('', { httperr });
-    throw httperr;
-  }
-  return value;
+import Joi from 'joi';
+import * as log from 'lambda-log';
+import { HttpError } from '../libs/http-error';
+
+export const validateInput = (schema: Joi.ObjectSchema<any>, input: any) => {
+  const { error, value } = schema.validate(input);
+  if (error) {
+    log.info('', { error });
+
+    const httperr = HttpError.badRequest('Bad Request', {
+      errors: error.details.map(detail => ({
+        message: detail?.message,
+        key: detail?.context?.key,
+        path: detail?.path,
+      }))
+    });
+
+    log.info('', { httperr });
+    throw httperr;
+  }
+  return value;
 };