@veritree/services 2.18.1-5 → 2.18.1-7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veritree/services",
-  "version": "2.18.1-5",
+  "version": "2.18.1-7",
   "description": "A collection of javascript functions/services to talk to veritree API",
   "type": "module",
   "main": "index.js",

package/src/helpers/api.js

@@ -11,12 +11,7 @@ import { getSession } from "./session";
 function addVersionArg(url) {
   if (!url || url.includes("_result=1")) return url;
 
-  const version =
-    process && process.env
-      ? process.env.API_VERITREE_VERSION
-        ? process.env.API_VERITREE_VERSION
-        : "5.0.0"
-      : "5.0.0" || "5.0.0";
+  const version = "5.0.0";
   const urlHasArgs = url.includes("?");
   const urlVersionArg = urlHasArgs ? `&_v=${version}` : `?_v=${version}`;
 
@@ -65,12 +60,7 @@ function getConfig(method, data, as) {
 
 export default class Api {
   constructor(resource) {
-    this.baseUrl =
-      process && process.env
-        ? process.env.API_VERITREE_URL
-          ? `${process.env.API_VERITREE_URL}/api`
-          : null
-        : null;
+    this.baseUrl = null;
     this.resource = resource ? resource : "";
     this.orgId = null;
     this.orgType = null;
@@ -216,15 +206,29 @@ export default class Api {
     const config = getConfig(method, data, as);
     const response = await fetch(url, config);
 
-    return new Promise((resolve, reject) => {
+    // console.log(response);
+
+    return new Promise(async (resolve, reject) => {
       if (response.ok && response.status === 204) {
         resolve();
         return;
       }
 
-      response.json().then((json) => {
-        response.ok ? resolve(json) : reject(json);
-      });
+      const isJSON = response.headers.get('content-type').includes('json');
+
+      if(isJSON) {
+        response.json().then((json) => {
+          response.ok ? resolve(json) : reject(json);
+        });
+      } else {
+        const buff = await response.arrayBuffer().then(Buffer.from)
+
+        try {
+          resolve(buff.toString());
+        } catch (err) {
+          reject();
+        }
+      }
     });
   }