@veritree/services 2.18.1-7 → 2.19.0

package/package.json

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

package/src/endpoints/orgs.js

@@ -33,6 +33,29 @@ class OrgsApi extends Api {
     return await this.get(url);
   }
 
+  siteManagers(orgId) {
+    const locations = () => {
+      const all = async(userId) => {
+        const url = `${this.getUrl()}/${orgId}/site-managers/${userId}/locations${this.getUrlParams()}`;
+        return await this.get(url);
+      }
+
+      const update = async (data) => {
+        const url = `${this.getUrl()}/${orgId}/site-managers/locations${this.getUrlParams()}`;
+        return await this.post(url, data, 'put');
+      };
+
+      return {
+        all,
+        update
+      }
+    }
+
+    return {
+      locations
+    }
+  }
+
   _geStatstUrl(isPublic) {
     const endpoint = isPublic ? "pstats" : "stats";
     return `${this.getUrl()}/${endpoint}${this.getUrlParams()}`;

package/src/helpers/api.js

@@ -1,6 +1,6 @@
-import { getCookie } from "./cookies";
-import { createParamsStringFromArgs } from "../utils/args";
-import { getSession } from "./session";
+import { getCookie } from './cookies';
+import { createParamsStringFromArgs } from '../utils/args';
+import { getSession } from './session';
 
 /**
  * Adds the envelope argument to the url
@@ -9,10 +9,10 @@ import { getSession } from "./session";
  * @returns {string} url
  */
 function addVersionArg(url) {
-  if (!url || url.includes("_result=1")) return url;
+  if (!url || url.includes('_result=1')) return url;
 
-  const version = "5.0.0";
-  const urlHasArgs = url.includes("?");
+  const version  = process.env ? process.env.API_VERITREE_VERSION ? process.env.API_VERITREE_VERSION : '5.0.0' : '5.0.0' || '5.0.0';
+  const urlHasArgs = url.includes('?');
   const urlVersionArg = urlHasArgs ? `&_v=${version}` : `?_v=${version}`;
 
   return `${url}${urlVersionArg}`;
@@ -26,10 +26,10 @@ function addVersionArg(url) {
  * @returns {object} data
  */
 function getConfig(method, data, as) {
-  const isGet = method === "get";
+  const isGet = method === 'get';
   const isSpoofing = as;
   const isFormData = data instanceof FormData;
-  const accessToken = `Bearer ${getCookie("access_token")}`;
+  const accessToken = `Bearer ${getCookie('access_token')}`;
 
   const config = {
     method,
@@ -39,7 +39,7 @@ function getConfig(method, data, as) {
   };
 
   if (!isFormData) {
-    config.headers["Content-Type"] = "application/json";
+    config.headers['Content-Type'] = 'application/json';
   }
 
   // TODO: improve this ifs and elses
@@ -47,7 +47,7 @@ function getConfig(method, data, as) {
     if (!data) data = {};
 
     if (isFormData) {
-      if (isSpoofing) data.set("_method", as.toUpperCase());
+      if (isSpoofing) data.set('_method', as.toUpperCase());
       config.body = data;
     } else {
       if (isSpoofing) data._method = as.toUpperCase();
@@ -60,8 +60,8 @@ function getConfig(method, data, as) {
 
 export default class Api {
   constructor(resource) {
-    this.baseUrl = null;
-    this.resource = resource ? resource : "";
+    this.baseUrl = process.env ? `${process.env.API_VERITREE_URL}/api` : null;
+    this.resource = resource ? resource : '';
     this.orgId = null;
     this.orgType = null;
   }
@@ -106,7 +106,7 @@ export default class Api {
    * @param {string} as - 'put' // necessary for updates because of how Laravel handles PUT requests
    * @returns {promise}
    */
-  async update(id, data, as = "put", args) {
+  async update(id, data, as = 'put', args) {
     const url = `${this.getUrl(id)}${this.getUrlParams(args)}`;
     return await this.post(url, data, as);
   }
@@ -120,7 +120,7 @@ export default class Api {
    */
   async delete(id, args) {
     const url = `${this.getUrl(id)}${this.getUrlParams(args)}`;
-    return await this.post(url, null, "delete");
+    return await this.post(url, null, 'delete');
   }
 
   /**
@@ -140,7 +140,7 @@ export default class Api {
    */
   async post(url, data, as, args) {
     if (!url) url = `${this.getUrl()}${this.getUrlParams(args)}`;
-    return await this.unWrap(url, "post", data, as);
+    return await this.unWrap(url, 'post', data, as);
   }
 
   // ----------
@@ -151,7 +151,7 @@ export default class Api {
    * @returns
    */
   getUrl(id) {
-    id = id ? `/${id}` : "";
+    id = id ? `/${id}` : '';
     return `${this.baseUrl}/${this.resource}${id}`;
   }
 
@@ -164,14 +164,14 @@ export default class Api {
     this.setOrg();
     let isOrgLess = false;
     let isOrgAs = false;
-    let orgIdParam = "";
-    let orgTypeParam = "";
+    let orgIdParam = '';
+    let orgTypeParam = '';
 
     // while most of endpoints require an org id and type, some endpoints do not
     if (args) {
-      isOrgLess = Object.hasOwn(args, "orgless");
+      isOrgLess = Object.hasOwn(args, 'orgless');
       isOrgAs =
-        Object.hasOwn(args, "org_id_as") && Object.hasOwn(args, "org_type_as");
+        Object.hasOwn(args, 'org_id_as') && Object.hasOwn(args, 'org_type_as');
     }
 
     // a super admin user can create/edit data from other orgs
@@ -201,34 +201,20 @@ export default class Api {
    * @param {object} data
    * @returns {object} envelope
    */
-  async unWrap(url, method = "get", data, as) {
+  async unWrap(url, method = 'get', data, as) {
     url = addVersionArg(url);
     const config = getConfig(method, data, as);
     const response = await fetch(url, config);
 
-    // console.log(response);
-
-    return new Promise(async (resolve, reject) => {
+    return new Promise((resolve, reject) => {
       if (response.ok && response.status === 204) {
         resolve();
         return;
       }
 
-      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();
-        }
-      }
+      response.json().then((json) => {
+        response.ok ? resolve(json) : reject(json);
+      });
     });
   }
 
@@ -239,4 +225,4 @@ export default class Api {
     this.orgId = orgId;
     this.orgType = orgType;
   }
-}
+}