@8ms/helpers 1.1.105 → 1.1.108

package/api/ApiResponse.d.ts

@@ -30,7 +30,8 @@ declare class ApiResponse {
     isSuccess(): boolean;
     setToIdle(): this;
     setToPending(): this;
-    setToError({ error }: {
+    setToError({ body, error }: {
+        body?: any;
         error: any;
     }): this;
     setToSuccess({ body }: {

package/api/ApiResponse.js

@@ -67,7 +67,8 @@ class ApiResponse {
         this.state = states_1.default.PENDING;
         return this;
     }
-    setToError({ error }) {
+    setToError({ body, error }) {
+        this.body = body;
         this.error = error;
         this.state = states_1.default.ERROR;
         return this;

package/aws/s3/writeUrlContents.js

@@ -3,18 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const get_1 = __importDefault(require("../../axios/get"));
+const axios_1 = __importDefault(require("axios"));
 const writeFile_1 = __importDefault(require("./writeFile"));
 /**
  * Download a file and write to S3.
  */
 const writeUrlContents = async ({ bucket, key, url }) => {
-    return (0, get_1.default)({
-        config: {
-            responseType: "arraybuffer",
-            responseEncoding: "binary",
-        },
-        url,
+    return (0, axios_1.default)(url, {
+        responseType: "arraybuffer",
+        responseEncoding: "binary",
     })
         .then(async (response) => {
         await (0, writeFile_1.default)({

package/axios/get.d.ts

@@ -1,10 +1,10 @@
 import ApiResponse from '../api/ApiResponse';
 export declare type Get = {
     config?: object;
-    onError?: Function;
-    onSuccess?: Function;
-    returnApiResponse?: boolean;
     url: string;
 };
-declare const get: ({ config, onError, onSuccess, returnApiResponse, url }: Get) => Promise<any | ApiResponse>;
+/**
+ * Make a GET request.
+ */
+declare const get: ({ config, url }: Get) => Promise<ApiResponse>;
 export default get;

package/axios/get.js

@@ -5,45 +5,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const ApiResponse_1 = __importDefault(require("../api/ApiResponse"));
-const states_1 = __importDefault(require("../api/states"));
-const get = async ({ config = {}, onError, onSuccess, returnApiResponse, url }) => {
-    let response = await axios_1.default.get(url, config)
+/**
+ * Make a GET request.
+ */
+const get = async ({ config = {}, url }) => {
+    const response = await axios_1.default.get(url, config)
         .then(async (response) => {
-        if (200 === response.status) {
-            // Is an API request
-            if (undefined !== response.data.body && undefined !== response.data.error && undefined !== response.data.state) {
-                // Success return the body
-                if (states_1.default.SUCCESS === response.data.state) {
-                    return onSuccess ? await onSuccess(response.data.body) : response.data.body;
-                }
-                // Error
-                else {
-                    if (onError) {
-                        return await onError(response.data.error);
-                    }
-                    else {
-                        throw new Error(response.data.error);
-                    }
-                }
-            }
-            else {
-                return onSuccess ? await onSuccess(response) : response;
-            }
+        // Is API response
+        if (undefined !== response.data.body && undefined !== response.data.error && undefined !== response.data.state) {
+            return new ApiResponse_1.default(response.data);
         }
-        return onError ? await onError(response) : response;
-    })
-        .catch(async (error) => {
-        if (onError) {
-            return await onError(error);
-        }
-        else {
-            throw Error;
+        // General success
+        else if (200 === response.status) {
+            return (new ApiResponse_1.default()).setToSuccess({
+                body: response.data,
+            });
         }
+        // Error
+        return (new ApiResponse_1.default()).setToError({
+            body: response.data,
+            error: response.statusText,
+        });
+    })
+        .catch(error => {
+        // Error
+        return (new ApiResponse_1.default()).setToError({
+            error: error.message,
+        });
     });
-    // Convert the response into an ApiResponse instance
-    if (returnApiResponse) {
-        response = new ApiResponse_1.default(response);
-    }
     return response;
 };
 exports.default = get;

package/axios/post.d.ts

@@ -2,13 +2,10 @@ import ApiResponse from '../api/ApiResponse';
 export declare type Post = {
     config?: object;
     data?: object;
-    onError?: Function;
-    onSuccess?: Function;
-    returnApiResponse?: boolean;
     url: string;
 };
 /**
  * Make a POST request.
  */
-declare const post: ({ config, data, onError, onSuccess, returnApiResponse, url }: Post) => Promise<any | ApiResponse>;
+declare const post: ({ config, data, url }: Post) => Promise<ApiResponse>;
 export default post;

package/axios/post.js

@@ -5,48 +5,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
 const ApiResponse_1 = __importDefault(require("../api/ApiResponse"));
-const states_1 = __importDefault(require("../api/states"));
 /**
  * Make a POST request.
  */
-const post = async ({ config = {}, data = {}, onError, onSuccess, returnApiResponse, url }) => {
-    let response = await axios_1.default.post(url, data, config)
+const post = async ({ config = {}, data = {}, url }) => {
+    const response = await axios_1.default.post(url, data, config)
         .then(async (response) => {
-        if (200 === response.status) {
-            // Is an API request
-            if (undefined !== response.data.body && undefined !== response.data.error && undefined !== response.data.state) {
-                // Success return the body
-                if (states_1.default.SUCCESS === response.data.state) {
-                    return onSuccess ? await onSuccess(response.data.body) : response.data.body;
-                }
-                // Error
-                else {
-                    if (onError) {
-                        return await onError(response.data.error);
-                    }
-                    else {
-                        throw new Error(response.data.error);
-                    }
-                }
-            }
-            else {
-                return onSuccess ? await onSuccess(response) : response;
-            }
+        // Is API response
+        if (undefined !== response.data.body && undefined !== response.data.error && undefined !== response.data.state) {
+            return new ApiResponse_1.default(response.data);
         }
-        return onError ? await onError(response) : response;
-    })
-        .catch(async (error) => {
-        if (onError) {
-            return await onError(error);
-        }
-        else {
-            throw Error;
+        // General success
+        else if (200 === response.status) {
+            return (new ApiResponse_1.default()).setToSuccess({
+                body: response.data,
+            });
         }
+        // Error
+        return (new ApiResponse_1.default()).setToError({
+            body: response.data,
+            error: response.statusText,
+        });
+    })
+        .catch(error => {
+        // Error
+        return (new ApiResponse_1.default()).setToError({
+            error: error.message,
+        });
     });
-    // Convert the response into an ApiResponse instance
-    if (returnApiResponse) {
-        response = new ApiResponse_1.default(response);
-    }
     return response;
 };
 exports.default = post;

package/deepcrawl/api/getData.d.ts

@@ -1,6 +1,6 @@
-import { Response } from '../../api/response';
+import ApiResponse from '../../api/ApiResponse';
 declare type GetData = {
     url: string;
 };
-declare const getData: ({ url }: GetData) => Promise<Response>;
+declare const getData: ({ url }: GetData) => Promise<ApiResponse>;
 export default getData;

package/deepcrawl/api/getData.js

@@ -3,27 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const response_1 = __importDefault(require("../../api/response"));
-const states_1 = __importDefault(require("../../api/states"));
 const get_1 = __importDefault(require("../../axios/get"));
 const getData = async ({ url }) => {
-    let response = { ...response_1.default };
-    await (0, get_1.default)({
+    const apiResponse = await (0, get_1.default)({
         config: {
             headers: {
                 'X-AUTH-TOKEN': global.deepcrawlApi.token,
             },
         },
-        onError: error => {
-            response.state = states_1.default.ERROR;
-            response.error = error.message;
-        },
-        onSuccess: success => {
-            response.state = states_1.default.SUCCESS;
-            response.body = success.data;
-        },
         url,
     });
-    return response;
+    return apiResponse;
 };
 exports.default = getData;

package/deepcrawl/api/initClient.js

@@ -26,8 +26,9 @@ const initClient = async ({ auth }) => {
             url: `https://api.deepcrawl.com/sessions`,
         });
         // Ensure the value exists
-        if (undefined !== apiResponse.data && undefined !== apiResponse.data.token) {
-            global.deepcrawlApi.token = apiResponse.data.token;
+        const token = apiResponse.getBodyDefaultTo({ defaultValue: null, keys: ['data', 'token'] });
+        if (token) {
+            global.deepcrawlApi.token = token;
         }
     }
 };

package/deepcrawl/graphql/getData.js

@@ -3,15 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ApiResponse_1 = __importDefault(require("../../api/ApiResponse"));
 const post_1 = __importDefault(require("../../axios/post"));
 const getData = async ({ query, variables }) => {
-    const response = new ApiResponse_1.default();
     let queryClean = query.trim();
     queryClean = queryClean.replace(/\n/g, ' ');
     queryClean = queryClean.replace(/\t/g, ' ');
     queryClean = queryClean.replace(/  /g, ' ');
-    await (0, post_1.default)({
+    const apiResponse = await (0, post_1.default)({
         config: {
             headers: {
                 'x-auth-token': global.deepcrawlGraphql.token,
@@ -21,14 +19,8 @@ const getData = async ({ query, variables }) => {
             query: queryClean,
             variables,
         },
-        onError: error => {
-            response.setToError({ error: error.message });
-        },
-        onSuccess: success => {
-            response.setToSuccess({ body: success.data });
-        },
         url: 'https://graph.deepcrawl.com/',
     });
-    return response;
+    return apiResponse;
 };
 exports.default = getData;

package/eskimi/{request.d.ts → getData.d.ts}

@@ -1,8 +1,8 @@
 /**
  * Make the request to Eskimi API using the access token.
  */
-declare const request: ({ data, url }: {
+declare const getData: ({ data, url }: {
     data: object;
     url: string;
 }) => Promise<any>;
-export default request;
+export default getData;

package/eskimi/{request.js → getData.js}

@@ -7,7 +7,7 @@ const post_1 = __importDefault(require("../axios/post"));
 /**
  * Make the request to Eskimi API using the access token.
  */
-const request = async ({ data, url }) => {
+const getData = async ({ data, url }) => {
     const response = await (0, post_1.default)({
         config: {
             headers: {
@@ -16,9 +16,8 @@ const request = async ({ data, url }) => {
             },
         },
         data: data,
-        onSuccess: response => response.data,
         url: url,
     });
-    return response;
+    return response.getBodyDefaultTo({ defaultValue: null, keys: ['data'] });
 };
-exports.default = request;
+exports.default = getData;

package/littleWarden/getUrlStatus.js

@@ -16,6 +16,6 @@ const getUrlStatus = async ({ apiKey, urlId }) => {
         },
         url: `https://littlewarden.com/api/sites/${urlId}`,
     });
-    return response.data.site || {};
+    return response.getBodyDefaultTo({ defaultValue: {}, keys: ['data', 'site'] });
 };
 exports.default = getUrlStatus;

package/myTarget/request.d.ts

@@ -1,8 +1,9 @@
+import ApiResponse from '../api/ApiResponse';
 /**
  * Make the request to MyTarget API using the access token.
  */
 declare const request: ({ data, url }: {
     data: object;
     url: string;
-}) => Promise<any>;
+}) => Promise<ApiResponse>;
 export default request;

package/myTarget/request.js

@@ -16,7 +16,6 @@ const request = async ({ data, url }) => {
             },
         },
         data: data,
-        onSuccess: response => response.data,
         url: url,
     });
     return response;

package/package.json

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

package/snapchat/getAccessToken.js

@@ -23,14 +23,12 @@ const getAccessToken = async ({ force, parameterName }) => {
         url += `&client_secret=${parameter.clientSecret}`;
         url += `&grant_type=refresh_token`;
         url += `&refresh_token=${parameter.refreshToken}`;
-        await (0, post_1.default)({
-            onSuccess: apiResponse => {
-                if (undefined !== apiResponse['data']['access_token']) {
-                    global.snapchatAccessToken = apiResponse['data']['access_token'];
-                }
-            },
-            url: url,
+        const apiResponse = await (0, post_1.default)({
+            url,
         });
+        if (apiResponse.isSuccess()) {
+            global.snapchatAccessToken = apiResponse.getBodyDefaultTo({ defaultValue: null, keys: ['data', 'access_token'] });
+        }
     }
     return global.snapchatAccessToken;
 };