@veritree/services 1.0.0-1 → 1.0.0-2

package/package.json

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

package/src/helpers/api-v2.js

@@ -1,20 +1,12 @@
 import { getCookie } from "./cookies";
-import { getSession } from "./session";
 import { createParamsStringFromArgs } from "../utils/args";
+import { getSession } from "./session";
 
-export default function Api(resource) {
+export default function Api(resource, session) {
   const baseUrl = `${process.env.API_VERITREE_URL}/api`;
-  const session = getSession();
-  if(!session) return;
-  const { orgId, orgType } = session;
-
-
-  if (!orgId && !orgType) {
-    throw new Error("Organization id and type are required");
-  }
 
   /**
-   * 
+   *
    * @returns {promise}
    */
   this.all = async function () {
@@ -23,8 +15,8 @@ export default function Api(resource) {
   };
 
   /**
-   * 
-   * @param {string, number} id 
+   *
+   * @param {string, number} id
    * @returns {promise}
    */
   this.single = async function (id) {
@@ -33,8 +25,8 @@ export default function Api(resource) {
   };
 
   /**
-   * 
-   * @param {object} data 
+   *
+   * @param {object} data
    * @returns {promise}
    */
   this.create = async function (data) {
@@ -49,7 +41,7 @@ export default function Api(resource) {
    * @param {string} as - 'put' // necessary for updates because of how Laravel handles PUT requests
    * @returns {promise}
    */
-  this.update = async function (id, data, as = 'put') {
+  this.update = async function (id, data, as = "put") {
     const url = `${this.getUrl()}/${id}?${this.getUrlParams()}`;
     return await this.post(url, data, as);
   };
@@ -58,11 +50,15 @@ export default function Api(resource) {
   // --
   this.getUrl = () => {
     return `${baseUrl}/${resource}`;
-  }
+  };
 
   this.getUrlParams = (args) => {
-    return `org_id=${orgId}&org_type=${orgType}${createParamsStringFromArgs(args)}`;
-  }
+    const { orgId, orgType } = getSession();
+
+    return `org_id=${orgId}&org_type=${orgType}${createParamsStringFromArgs(
+      args
+    )}`;
+  };
 
   /**
    *