@veritree/services 2.31.1-2 → 2.32.0-0

package/package.json

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

package/src/endpoints/orgs.js

@@ -24,12 +24,12 @@ class OrgsApi extends Api {
   }
 
   async stats() {
-    const url = `${this._geStatstUrl()}`;
+    const url = `${this._getStatstUrl()}`;
     return await this.get(url);
   }
 
-  async publicStats() {
-    const url = `${this._geStatstUrl(true)}`;
+  async publicStats(args) {
+    const url = `${this._getStatstUrl(true, args)}`;
     return await this.get(url);
   }
 
@@ -56,9 +56,9 @@ class OrgsApi extends Api {
     };
   }
 
-  _geStatstUrl(isPublic) {
+  _getStatstUrl(isPublic, args) {
     const endpoint = isPublic ? 'pstats' : 'stats';
-    return `${this.getUrl()}/${endpoint}${this.getUrlParams()}`;
+    return `${this.getUrl()}/${endpoint}${this.getUrlParams(args)}`;
   }
 }
 

package/src/endpoints/sponsors.js

@@ -17,14 +17,14 @@ class SponsorsApi extends Api {
     return await this.get(url);
   }
 
-  async profile() {
-    this.setOrg();
+  async profile(args) {
+    const params = this.getUrlParams(args);
 
     if (!this.orgId) {
       throw new Error('No org id provided');
     }
 
-    const url = `${this.getUrl()}/${this.orgId}/profile`;
+    const url = `${this.getUrl()}/${this.orgId}/profile${params}`;
     return await this.get(url);
   }
 
@@ -49,7 +49,9 @@ class SponsorsApi extends Api {
     };
 
     const imageUploadUrl = async () => {
-      const url = `${this.getUrl()}/${this.orgId}/cms/image-upload-url${urlParams}`;
+      const url = `${this.getUrl()}/${
+        this.orgId
+      }/cms/image-upload-url${urlParams}`;
       return await this.get(url);
     };
 
@@ -67,19 +69,21 @@ class SponsorsApi extends Api {
 
   tools(args) {
     const get = async (sponsorId) => {
-      const url = `${this.getUrl()}/${sponsorId}/tools${this.getUrlParams(args)}`;
+      const url = `${this.getUrl()}/${sponsorId}/tools${this.getUrlParams(
+        args
+      )}`;
       return await this.get(url);
-    }
+    };
 
     const create = async (sponsorId, data) => {
       const url = `${this.getUrl()}/${sponsorId}/tools`;
       return await this.post(url, data);
-    }
+    };
 
     return {
       get,
-      create
-    }
+      create,
+    };
   }
 }
 

package/src/endpoints/stats.js

@@ -5,13 +5,12 @@ class StatsApi extends Api {
     super(resource);
   }
 
-  async crumb(id) {
+  async crumb(id, args) {
     this.resource = 'pstats';
-    const url = `${this.getUrl()}/${id}${this.getUrlParams()}`;
+    const url = `${this.getUrl()}/${id}${this.getUrlParams(args)}`;
 
     return await this.get(url);
   }
 }
 
 export const Stats = new StatsApi();
-

package/src/helpers/api.js

@@ -1,34 +1,33 @@
-import { getCookie } from "./cookies";
-import { getSession } from "./session";
-import { createParamsStringFromArgs } from "../utils/args";
+import { getCookie } from './cookies';
+import { getSession } from './session';
+import { createParamsStringFromArgs } from '../utils/args';
 
 function addVersionParam(url) {
   // If URL is invalid or already has the result parameter, return it as is
-  if (!url || url.includes("_result=1")) {
+  if (!url || url.includes('_result=1')) {
     return url;
   }
 
   // Check if URL already has the version parameter
-  if (url.includes("_v=")) {
+  if (url.includes('_v=')) {
     return url;
   }
 
   const version = '10.0.0';
 
   // Append version parameter to URL
-  const urlVersionParam = url.includes("?")
+  const urlVersionParam = url.includes('?')
     ? `&_v=${version}`
     : `?_v=${version}`;
 
   return `${url}${urlVersionParam}`;
 }
 
-
 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,
@@ -38,7 +37,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
@@ -46,7 +45,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,7 +59,7 @@ function getConfig(method, data, as) {
 export default class Api {
   constructor(resource) {
     this.baseUrl = null;
-    this.resource = resource ? resource : "";
+    this.resource = resource ? resource : '';
     this.orgId = null;
     this.orgType = null;
   }
@@ -75,7 +74,8 @@ export default class Api {
   }
 
   async single(id, args) {
-    const url = `${this.getUrl(id)}${this.getUrlParams(args)}`;
+    const params = this.args ? this.getUrlParams(args) : '';
+    const url = `${this.getUrl(id)}${params}`;
     return await this.get(url);
   }
 
@@ -83,45 +83,43 @@ export default class Api {
     return await this.post(null, data, null, args);
   }
 
-  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);
   }
 
   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');
   }
 
   async get(url) {
-    console.log(url);
     return await this.unWrap(url);
   }
 
   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);
   }
 
   getUrl(id) {
-    id = id ? `/${id}` : "";
+    id = id ? `/${id}` : '';
     return `${this.baseUrl}/${this.resource}${id}`;
   }
 
   getUrlParams(args) {
-    this.setOrg();
     let isOrgLess = false;
     let isOrgIdAs = false;
     let isOrgTypeAs = false;
-    let orgIdParam = "";
-    let orgTypeParam = "";
-    let argsClone = structuredClone(args); // avoids mutating object
+    let orgIdParam = '';
+    let orgTypeParam = '';
+    let argsClone = { ...args }; // avoids mutating object
 
     // while most of endpoints require an org id and type, some endpoints do not
     if (argsClone) {
-      isOrgLess = Object.hasOwn(argsClone, "orgless");
-      isOrgIdAs = Object.hasOwn(argsClone, "org_id_as");
-      isOrgTypeAs = Object.hasOwn(argsClone, "org_type_as");
+      isOrgLess = Object.hasOwn(argsClone, 'orgless');
+      isOrgIdAs = Object.hasOwn(argsClone, 'org_id_as');
+      isOrgTypeAs = Object.hasOwn(argsClone, 'org_type_as');
     }
 
     // a super admin user can create/edit data from other orgs
@@ -147,12 +145,18 @@ export default class Api {
       }
     }
 
+    if (!this.orgId && !this.orgType) {
+      const session = getSession();
+      this.orgId = session.orgId;
+      this.orgType = session.orgType;
+    }
+
     return `?${orgIdParam}${orgTypeParam}${createParamsStringFromArgs(
       argsClone
     )}`;
   }
 
-  async unWrap(url, method = "get", data, as) {
+  async unWrap(url, method = 'get', data, as) {
     url = addVersionParam(url);
     const config = getConfig(method, data, as);
     const response = await fetch(url, config);
@@ -168,12 +172,4 @@ export default class Api {
       });
     });
   }
-
-  setOrg() {
-    const session = getSession();
-    if (!session) return;
-    const { orgId, orgType } = session;
-    this.orgId = orgId;
-    this.orgType = orgType;
-  }
 }