@8ms/helpers 1.1.60 → 1.1.61

package/deepCrawl/initClient.d.ts

@@ -0,0 +1,13 @@
+declare type InitClient = {
+    auth: {
+        apiId: string;
+        apiKey: string;
+    };
+};
+/**
+ * http://api-docs.deepcrawl.com/
+ * Renew the DeepCrawl user token.
+ * Token lasts for 6 hours.
+ */
+declare const initClient: ({ auth }: InitClient) => Promise<void>;
+export default initClient;

package/deepCrawl/{renewToken.js → initClient.js}

@@ -49,7 +49,7 @@ global.deepcrawl = {
  * Renew the DeepCrawl user token.
  * Token lasts for 6 hours.
  */
-var renewToken = function (_a) {
+var initClient = function (_a) {
     var auth = _a.auth;
     return __awaiter(void 0, void 0, void 0, function () {
         var apiResponse;
@@ -78,4 +78,4 @@ var renewToken = function (_a) {
         });
     });
 };
-exports.default = renewToken;
+exports.default = initClient;

package/googleAds/initClient.d.ts

@@ -1,14 +1,15 @@
-export declare type Client = {
-    instance: any;
-    mccAccountId: string;
-    refreshToken: string;
-};
 declare type InitClient = {
-    parameterName: string;
+    auth: {
+        clientId: string;
+        clientSecret: string;
+        developerToken: string;
+        mccAccountId: string;
+        refreshToken: string;
+    };
 };
 /**
  * Shorthand function to get the Google Ads Client.
  * Library: google-ads-api
  */
-declare const initClient: ({ parameterName }: InitClient) => Promise<void>;
+declare const initClient: ({ auth }: InitClient) => Promise<void>;
 export default initClient;

package/googleAds/initClient.js

@@ -35,11 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var getParameter_1 = __importDefault(require("../aws/ssm/getParameter"));
 global.googleAdsClient = {
     instance: null,
     mccAccountId: '',
@@ -50,33 +46,23 @@ global.googleAdsClient = {
  * Library: google-ads-api
  */
 var initClient = function (_a) {
-    var parameterName = _a.parameterName;
+    var auth = _a.auth;
     return __awaiter(void 0, void 0, void 0, function () {
-        var parameter, GoogleAdsApi;
+        var GoogleAdsApi;
         return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!!global.googleAdsClient.instance) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (0, getParameter_1.default)({
-                            name: parameterName,
-                            withDecryption: true,
-                            isJson: true,
-                        })];
-                case 1:
-                    parameter = _b.sent();
-                    GoogleAdsApi = require('google-ads-api').GoogleAdsApi;
-                    // Create a new client instance
-                    global.googleAdsClient.instance =
-                        new GoogleAdsApi({
-                            client_id: parameter.clientId,
-                            client_secret: parameter.clientSecret,
-                            developer_token: parameter.developerToken,
-                        });
-                    global.googleAdsClient.mccAccountId = parameter.mccAccountId;
-                    global.googleAdsClient.refreshToken = parameter.refreshToken;
-                    _b.label = 2;
-                case 2: return [2 /*return*/];
+            if (!global.googleAdsClient.instance) {
+                GoogleAdsApi = require('google-ads-api').GoogleAdsApi;
+                // Create a new client instance
+                global.googleAdsClient.instance =
+                    new GoogleAdsApi({
+                        client_id: auth.clientId,
+                        client_secret: auth.clientSecret,
+                        developer_token: auth.developerToken,
+                    });
+                global.googleAdsClient.mccAccountId = auth.mccAccountId;
+                global.googleAdsClient.refreshToken = auth.refreshToken;
             }
+            return [2 /*return*/];
         });
     });
 };

package/initClients.d.ts

@@ -11,7 +11,9 @@ declare type InitClients = {
     awsS3?: boolean;
     awsSes?: boolean;
     awsSsm?: boolean;
-    deepCrawl?: boolean;
+    deepCrawl?: {
+        parameterName: string;
+    };
     eskimi?: boolean;
     googleAds?: {
         parameterName: string;

package/initClients.js

@@ -43,15 +43,18 @@ var initClient_1 = __importDefault(require("./aws/athenaExpress/initClient"));
 var initClient_2 = __importDefault(require("./aws/glue/initClient"));
 var initClient_3 = __importDefault(require("./aws/s3/initClient"));
 var initClient_4 = __importDefault(require("./aws/ses/initClient"));
+var getParameter_1 = __importDefault(require("./aws/ssm/getParameter"));
 var initClient_5 = __importDefault(require("./aws/ssm/initClient"));
-var initClient_6 = __importDefault(require("./googleAds/initClient"));
-var initClient_7 = __importDefault(require("./prisma/initClient"));
+var initClient_6 = __importDefault(require("./deepCrawl/initClient"));
+var initClient_7 = __importDefault(require("./googleAds/initClient"));
+var initClient_8 = __importDefault(require("./prisma/initClient"));
 /**
  * Function to simplify initialising the clients.
  */
 var initClients = function (_a) {
     var athenaExpress = _a.athenaExpress, awsConfig = _a.awsConfig, awsGlue = _a.awsGlue, awsS3 = _a.awsS3, awsSes = _a.awsSes, awsSsm = _a.awsSsm, googleAds = _a.googleAds, prisma = _a.prisma;
     return __awaiter(void 0, void 0, void 0, function () {
+        var deepcrawlParameter, googleAdsParameter;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -75,16 +78,30 @@ var initClients = function (_a) {
                     if (true === awsSsm) {
                         (0, initClient_5.default)({ config: awsConfig });
                     }
-                    if (!(undefined !== googleAds)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (0, initClient_6.default)({
-                            parameterName: googleAds.parameterName,
+                    if (!(undefined !== deepcrawl)) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, getParameter_1.default)({
+                            name: deepcrawl.parameterName,
                         })];
                 case 1:
-                    _b.sent();
-                    _b.label = 2;
+                    deepcrawlParameter = _b.sent();
+                    return [4 /*yield*/, (0, initClient_6.default)({ auth: deepcrawlParameter })];
                 case 2:
+                    _b.sent();
+                    _b.label = 3;
+                case 3:
+                    if (!(undefined !== googleAds)) return [3 /*break*/, 6];
+                    return [4 /*yield*/, (0, getParameter_1.default)({
+                            name: googleAds.parameterName,
+                        })];
+                case 4:
+                    googleAdsParameter = _b.sent();
+                    return [4 /*yield*/, (0, initClient_7.default)({ auth: googleAdsParameter })];
+                case 5:
+                    _b.sent();
+                    _b.label = 6;
+                case 6:
                     if (undefined !== prisma) {
-                        (0, initClient_7.default)({ debug: true === prisma ? false : prisma.debug || false });
+                        (0, initClient_8.default)({ debug: true === prisma ? false : prisma.debug || false });
                     }
                     return [2 /*return*/];
             }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@8ms/helpers",
 	"license": "UNLICENSED",
-	"version": "1.1.60",
+	"version": "1.1.61",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/8millionstories-organisation/8ms-helpers-ts.git"

package/deepCrawl/auth.d.ts

@@ -1,4 +0,0 @@
-export declare type Auth = {
-    apiId: string;
-    apiKey: string;
-};

package/deepCrawl/auth.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/deepCrawl/renewToken.d.ts

@@ -1,10 +0,0 @@
-import { Auth } from './auth';
-/**
- * http://api-docs.deepcrawl.com/
- * Renew the DeepCrawl user token.
- * Token lasts for 6 hours.
- */
-declare const renewToken: ({ auth }: {
-    auth: Auth;
-}) => Promise<void>;
-export default renewToken;