@veritree/services 1.0.0-5 → 1.0.0-6

package/index.js

@@ -1,20 +1,20 @@
-import { Countries } from './src/services/countries';
-import { FieldUpdates } from './src/services/field-updates';
-import { FieldUpdateVerifications } from './src/services/field-udpate-verifications';
-import { FormSubmissions } from './src/services/form-submissions';
-import { ForestTypeSpecies } from './src/services/forest-type-species';
-import { ForestTypes } from './src/services/forest-types';
-import { ForestTypeProfiles } from './src/services/forest-types-profiles';
-import { Images } from './src/services/images';
-import { User } from './src/services/user';
-import { Orgs } from './src/services/orgs';
-import { Regions } from './src/services/regions';
-import { Sponsors } from './src/services/sponsors';
-import { Stats } from './src/services/stats';
-import { Subdomains } from './src/services/subdomains';
-import { Subsites } from './src/services/subsites';
-import { SubsiteTypes } from './src/services/subsite-types';
-import { TreeOrders } from './src/services/trees-orders';
+import { Countries } from './src/endpoints/countries';
+import { FieldUpdates } from './src/endpoints/field-updates';
+import { FieldUpdateVerifications } from './src/endpoints/field-udpate-verifications';
+import { FormSubmissions } from './src/endpoints/form-submissions';
+import { ForestTypeSpecies } from './src/endpoints/forest-type-species';
+import { ForestTypes } from './src/endpoints/forest-types';
+import { ForestTypeProfiles } from './src/endpoints/forest-types-profiles';
+import { Images } from './src/endpoints/images';
+import { User } from './src/endpoints/user';
+import { Orgs } from './src/endpoints/orgs';
+import { Regions } from './src/endpoints/regions';
+import { Sponsors } from './src/endpoints/sponsors';
+import { Stats } from './src/endpoints/stats';
+import { Subdomains } from './src/endpoints/subdomains';
+import { Subsites } from './src/endpoints/subsites';
+import { SubsiteTypes } from './src/endpoints/subsite-types';
+import { TreeOrders } from './src/endpoints/trees-orders';
 
 export {
   Countries,

package/package.json

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

package/src/{services → endpoints}/trees-orders.js

@@ -1,5 +1,6 @@
 import Api from '../helpers/api';
 
 const resource = 'tree-orders';
+
 export const TreeOrders = new Api(resource);
 

package/src/helpers/api.js

@@ -2,6 +2,21 @@ import { getCookie } from "./cookies";
 import { createParamsStringFromArgs } from "../utils/args";
 import { getSession } from "./session";
 
+/**
+ * Adds the envelope argument to the url
+ *
+ * @param {string} url
+ * @returns {string} url
+ */
+function handleEnvelopParam(url) {
+  if (!url || url.includes("_result=1")) return url;
+
+  const urlHasArgs = url.includes("?");
+  const urlEvenlopeArg = urlHasArgs ? "&_result=1" : "?_result=1";
+
+  return `${url}${urlEvenlopeArg}`;
+}
+
 export default class Api {
   constructor(resource) {
     this.baseUrl = `${process.env.API_VERITREE_URL}/api`;
@@ -78,9 +93,19 @@ export default class Api {
 
   getUrlParams(args) {
     this.setOrg();
+    let isOrgLess = false;
+    let orgIdParam = "";
+    let orgTypeParam = "";
+
+    // while most of endpoints require an org id and type, some endpoints do not
+    if (args && args.length) {
+      isOrgLess = Object.hasOwnProperty.call(...args, "orgless");
+    }
 
-    const orgIdParam = this.orgId ? `org_id=${this.orgId}` : "";
-    const orgTypeParam = this.orgType ? `org_type=${this.orgType}` : "";
+    if (!isOrgLess) {
+      if (this.orgId) orgIdParam = `&org_id=${this.orgId}`;
+      if (this.orgType) orgTypeParam = `&org_type=${this.orgType}`;
+    }
 
     return `?${orgIdParam}&${orgTypeParam}${createParamsStringFromArgs(args)}`;
   }
@@ -94,7 +119,7 @@ export default class Api {
    * @returns {object} envelope
    */
   async unWrap(url, method = "get", data, as) {
-    url = this.handleEnvelopParam(url, data); // TODO: remove when API is fully migrated to envelopes
+    url = handleEnvelopParam(url, data); // TODO: remove when API is fully migrated to envelopes
     const config = this.getConfig(method, data, as);
 
     try {
@@ -117,7 +142,7 @@ export default class Api {
   getConfig(method, data, as) {
     const isGet = method === "get";
     const isPut = as === "put";
-    const isFormData = this.isFormData(data);
+    const isFormData = data instanceof FormData;
     const accessToken = `Bearer ${getCookie("access_token")}`;
 
     const config = {
@@ -152,23 +177,4 @@ export default class Api {
     this.orgId = orgId;
     this.orgType = orgType;
   }
-
-  /**
-   * Adds the envelope argument to the url
-   *
-   * @param {string} url
-   * @returns {string} url
-   */
-  handleEnvelopParam(url) {
-    if (!url || url.includes("_result=1")) return url;
-
-    const urlHasArgs = url.includes("?");
-    const urlEvenlopeArg = urlHasArgs ? "&_result=1" : "?_result=1";
-
-    return `${url}${urlEvenlopeArg}`;
-  }
-
-  isFormData(data) {
-    data instanceof FormData;
-  }
 }

package/src/helpers/session.js

@@ -1,7 +1,3 @@
-export const getSessionOrgId = () => {
-  return getSession().orgId;
-};
-
 export const getSession = () => {
   return JSON.parse(localStorage.getItem('session'));
 };