@8ms/helpers 1.1.109 → 1.1.111

package/deepcrawl/api/initClient.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const post_1 = __importDefault(require("../../axios/post"));
 global.deepcrawlApi = {
-    lastUpdated: null,
     token: null,
+    updatedAt: null,
 };
 /**
  * http://api-docs.deepcrawl.com/
@@ -26,7 +26,10 @@ const initClient = async ({ auth }) => {
             url: `https://api.deepcrawl.com/sessions`,
         });
         // Ensure the value exists
-        const token = apiResponse.getBodyDefaultTo({ defaultValue: null, keys: ['data', 'token'] });
+        const token = apiResponse.getBodyDefaultTo({
+            defaultValue: null,
+            keys: ['token'],
+        });
         if (token) {
             global.deepcrawlApi.token = token;
         }

package/deepcrawl/graphql/initClient.js

@@ -4,10 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const post_1 = __importDefault(require("../../axios/post"));
-const defaultTo_1 = __importDefault(require("../../util/defaultTo"));
 global.deepcrawlGraphql = {
-    lastUpdated: null,
     token: null,
+    updatedAt: null,
 };
 /**
  * https://graph-docs.deepcrawl.com/graphql/explorer/
@@ -26,10 +25,9 @@ const initClient = async ({ auth }) => {
             },
             url: `https://graph.deepcrawl.com/`,
         });
-        const token = (0, defaultTo_1.default)({
+        const token = apiResponse.getBodyDefaultTo({
             defaultValue: null,
-            instance: apiResponse,
-            keys: ['data', 'data', 'createSessionUsingUserKey', 'token'],
+            keys: ['data', 'createSessionUsingUserKey', 'token'],
         });
         // Ensure the value exists
         if (token) {

package/package.json

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

package/util/defaultTo.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const isObject_1 = __importDefault(require("lodash/isObject"));
 const getArray_1 = __importDefault(require("../array/getArray"));
 /**
  * Function to default to a value, whilst filtering through an instance
@@ -11,8 +12,8 @@ const defaultTo = ({ defaultValue, instance, keys }) => {
     const keysArray = (0, getArray_1.default)({ input: keys });
     let found = true;
     let pointer = instance;
-    // Instance is undefined
-    if (undefined === instance) {
+    // Instance is undefined or is null
+    if (undefined === instance || null === pointer) {
         found = false;
     }
     // Instance exists
@@ -20,12 +21,17 @@ const defaultTo = ({ defaultValue, instance, keys }) => {
         keysArray.forEach(key => {
             if (found) {
                 // Sub key doesn't exist
-                if (undefined === pointer[key]) {
-                    found = false;
+                if ((0, isObject_1.default)(pointer)) {
+                    if (undefined === pointer[key] || null === pointer[key]) {
+                        found = false;
+                    }
+                    // Sub key exists, update pointer
+                    else {
+                        pointer = pointer[key];
+                    }
                 }
-                // Sub key exists, update pointer
                 else {
-                    pointer = pointer[key];
+                    found = false;
                 }
             }
         });