@veritree/services 2.81.0 → 2.82.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veritree/services",
-  "version": "2.81.0",
+  "version": "2.82.1",
   "description": "A collection of javascript functions/services to talk to veritree API",
   "type": "module",
   "main": "index.js",
@@ -11,7 +11,9 @@
     "registry": "https://registry.npmjs.org"
   },
   "scripts": {
-    "release": "np --no-tests --no-2fa"
+    "release": "np --no-tests --no-2fa",
+    "release-v2": "yarn publish && yarn push-tag",
+    "push-tag": "git push origin v$(node -p \"require('./package.json').version\")"
   },
   "devDependencies": {
     "np": "^8.0.4",

package/src/helpers/api.js

@@ -1,6 +1,12 @@
-import { getCookie } from './cookies';
-import { createParamsStringFromArgs } from '../utils/args';
-import { getSession } from './session';
+import { getCookie } from "./cookies";
+import { createParamsStringFromArgs } from "../utils/args";
+import {
+  extractOrgPublicIdFromPath,
+  getMe,
+  getOrgType,
+  getSession,
+  resolveUserOrg,
+} from "./session";
 
 /**
  * Returns the runtime configuration object for Nuxt 3.
@@ -43,20 +49,20 @@ import { getSession } from './session';
  */
 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;
   }
 
   // Use environment variable if available, otherwise use default version
-  const version = '25.0.0';
+  const version = "25.0.0";
 
   // Append version parameter to URL
-  const urlVersionParam = url.includes('?')
+  const urlVersionParam = url.includes("?")
     ? `&_v=${version}`
     : `?_v=${version}`;
 
@@ -71,10 +77,10 @@ function addVersionParam(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,
@@ -84,7 +90,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
@@ -92,7 +98,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();
@@ -115,7 +121,7 @@ export default class Api {
     // this.baseUrl = url + "/api";
 
     this.baseUrl = process.env ? `${process.env.API_VERITREE_URL}/api` : null;
-    this.resource = resource ? resource : '';
+    this.resource = resource ? resource : "";
     this.orgId = null;
     this.orgType = null;
   }
@@ -153,7 +159,6 @@ export default class Api {
     return await this.post(null, data, null, args);
   }
 
-  
   /**
    * Updates a resource with the specified ID.
    *
@@ -163,7 +168,7 @@ export default class Api {
    * @param {object} args - Additional arguments for the update request.
    * @returns {Promise<any>} - A promise that resolves to the response from the update request.
    */
-  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);
   }
@@ -177,7 +182,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");
   }
 
   /**
@@ -197,7 +202,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);
   }
 
   // ----------
@@ -208,7 +213,7 @@ export default class Api {
    * @returns
    */
   getUrl(id) {
-    id = id ? `/${id}` : '';
+    id = id ? `/${id}` : "";
     return `${this.baseUrl}/${this.resource}${id}`;
   }
 
@@ -222,15 +227,15 @@ export default class Api {
     let isOrgLess = false;
     let isOrgIdAs = false;
     let isOrgTypeAs = false;
-    let orgIdParam = '';
-    let orgTypeParam = '';
+    let orgIdParam = "";
+    let orgTypeParam = "";
     let argsClone = structuredClone(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
@@ -257,7 +262,7 @@ export default class Api {
     }
 
     return `?${orgIdParam}${orgTypeParam}${createParamsStringFromArgs(
-      argsClone
+      argsClone,
     )}`;
   }
 
@@ -269,7 +274,7 @@ 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 = addVersionParam(url);
     const config = getConfig(method, data, as);
     const response = await fetch(url, config);
@@ -280,27 +285,44 @@ export default class Api {
         return;
       }
 
-      const headerContentType = response.headers.get('content-type');
+      const headerContentType = response.headers.get("content-type");
 
-      if (headerContentType.includes('json')) {
+      if (headerContentType.includes("json")) {
         response.json().then((json) => {
           response.ok ? resolve(json) : reject(json);
         });
-      } else if (headerContentType.includes('csv')) {
+      } else if (headerContentType.includes("csv")) {
         response.text().then((res) => {
           response.ok ? resolve(res) : reject(res);
         });
       } else {
-        throw new Error('This response header content-type is not handled.');
+        throw new Error("This response header content-type is not handled.");
       }
     });
   }
 
   setOrg() {
     const session = getSession();
-    if (!session) return;
-    const { orgId, orgType } = session;
-    this.orgId = orgId;
-    this.orgType = orgType;
+
+    if (Object.keys(session).length) {
+      const { orgId, orgType } = session;
+      this.orgId = orgId;
+      this.orgType = orgType;
+      return;
+    }
+
+    const me = getMe();
+
+    // console.log("API setOrg called...", window.location.pathname);
+
+    if (Object.keys(me).length) {
+      const orgPublicId = extractOrgPublicIdFromPath(window.location.pathname);
+      const org = resolveUserOrg(me, orgPublicId);
+
+      this.orgId = org ? org.id : null;
+      this.orgType = org ? getOrgType(org.org_type) : null;
+    }
+
+    return {};
   }
 }

package/src/helpers/session.js

@@ -1,3 +1,157 @@
 export const getSession = () => {
-  return JSON.parse(localStorage.getItem('session'));
+  return JSON.parse(localStorage.getItem('session') || '{}');
 };
+
+export const getMe = () => {
+  return JSON.parse(localStorage.getItem('me') || '{}');
+}
+
+/**
+ * Returns reseller org based on:
+ * - if has veritree org, return veritree org
+ * - if no veritree org, return first reseller org
+ *
+ * @param {Array<Object>} resellers
+ * @returns {object} org
+ */
+export const getResellerOrg = (resellers) => {
+  if (hasVeritreeOrg(resellers)) {
+    return getVeritreeOrg(resellers);
+  }
+
+  return resellers[0]?.org || {};
+};
+
+/**
+ * Returns the veritree org
+ *
+ * TODO: improve the veritree org id to be related to env (dev = 3, prod = 1)
+ *
+ * @param {Array<Object>} resellers
+ * @returns {object} org
+ */
+export const getVeritreeOrg = (resellers) => {
+  return resellers.find(({ org }) => org.id === 3).org;
+};
+
+/**
+ * Checks if reseller has veritree org
+ *
+ * @param {Array<Object>} resellers
+ * @returns {boolean}
+ */
+export const hasVeritreeOrg = (resellers) => {
+  return resellers.some(({ org }) => org.id === 3);
+};
+
+export function getOrgType(orgType) {
+  let orgTypeFormatted = null;
+
+  switch (orgType) {
+    case 'owner':
+      orgTypeFormatted = 'ownerAccount';
+      break;
+    case 'organization':
+      orgTypeFormatted = 'orgAccount';
+      break;
+    case 'sponsor':
+      orgTypeFormatted = 'sponsorAccount';
+      break;
+    case 'reseller':
+      orgTypeFormatted = 'resellerAccount';
+      break;
+  }
+
+  return orgTypeFormatted;
+}
+
+/**
+ * Gets the correct org to be used based on the following priority:
+ * - If orgPublicId is provided, searches for a matching org across all user's organizations
+ * - If no match or orgPublicId not provided, follows hierarchy:
+ *   1. First owner org (user_owners)
+ *   2. First reseller org (user_resellers)
+ *   3. First corporate org (user_orgs)
+ *   4. First sponsor org (user_sponsors)
+ *
+ * @param {Object} me - User object containing organization relationships
+ * @param {Array<Object>} me.user_owners - Array of owner organization relationships
+ * @param {Array<Object>} me.user_resellers - Array of reseller organization relationships
+ * @param {Array<Object>} me.user_orgs - Array of corporate organization relationships
+ * @param {Array<Object>} me.user_sponsors - Array of sponsor organization relationships
+ * @param {String} orgPublicId - Optional public ID to find specific org
+ * @returns {Object} org - The selected organization
+ */
+export const resolveUserOrg = (me, orgPublicId) => {
+  const { user_owners, user_resellers, user_orgs, user_sponsors } = me;
+
+  if (orgPublicId) {
+    const orgs = getUserOrganizations(me);
+    const org = orgs.find(({ public_id }) => public_id === orgPublicId);
+
+    if (org) {
+      return org;
+    }
+  }
+
+  if (user_owners && user_owners.length) {
+    return user_owners[0].org;
+  }
+
+  if (user_resellers && user_resellers.length) {
+    return getResellerOrg(user_resellers);
+  }
+
+  if (user_orgs && user_orgs.length) {
+    return user_orgs[0].org;
+  }
+
+  if (user_sponsors && user_sponsors.length) {
+    return user_sponsors[0].org;
+  }
+
+  // Return empty object if no organization is found
+  return {};
+};
+
+/**
+ * Aggregates all organizations a user belongs to across all membership types.
+ * Combines organizations from owner, reseller, corporate, and sponsor relationships.
+ *
+ * @param {Object} me - User object containing organization relationships
+ * @param {Array<Object>} me.user_owners - Array of owner organization relationships
+ * @param {Array<Object>} me.user_resellers - Array of reseller organization relationships
+ * @param {Array<Object>} me.user_orgs - Array of corporate organization relationships
+ * @param {Array<Object>} me.user_sponsors - Array of sponsor organization relationships
+ * @returns {Array<Object>} Array of organization objects from all membership types
+ */
+export const getUserOrganizations = (me) => {
+  if (!me) {
+    return [];
+  }
+
+  return [
+    ...(me.user_owners ? me.user_owners.map((uo) => uo.org).filter(Boolean) : []),
+    ...(me.user_resellers ? me.user_resellers.map((ur) => ur.org).filter(Boolean) : []),
+    ...(me.user_orgs ? me.user_orgs.map((uo) => uo.org).filter(Boolean) : []),
+    ...(me.user_sponsors ? me.user_sponsors.map((us) => us.org).filter(Boolean) : []),
+  ];
+};
+
+/**
+ * Extracts the organization public ID from the first segment of a URL path.
+ * TODO: handle edge case where path is just '/' by getting an org like is done getOrg in auth.js
+ *
+ * @param {string} path - The URL path to extract from (e.g., '/veritree/dashboard')
+ * @returns {string|null} The organization public ID, or null if path is empty
+ */
+export const extractOrgPublicIdFromPath = (path) => {
+  if (!path) {
+    return null;
+  }
+
+  const url = new URL(path, location.origin);
+  const pathSegments = url.pathname.split('/').filter(Boolean);
+
+  return pathSegments.length > 0 ? pathSegments[0] : null;
+};