@veritree/services 2.25.1 → 2.26.1

package/package.json

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

package/src/endpoints/subsites.js

@@ -43,9 +43,9 @@ class SubsitesApi extends Api {
     };
   }
 
-  stats(subsite, args) {
+  stats(subsiteId, args) {
     const all = async () => {
-      const url = `${this.getUrl()}/${subsite}/stats${this.getUrlParams(args)}`;
+      const url = `${this.getUrl()}/${subsiteId}/stats${this.getUrlParams(args)}`;
       return await this.get(url);
     };
 

package/src/helpers/api.js

@@ -2,6 +2,31 @@ import { getCookie } from "./cookies";
 import { createParamsStringFromArgs } from "../utils/args";
 import { getSession } from "./session";
 
+/**
+ * Returns the runtime configuration object for Nuxt 3.
+ *
+ * Note:
+ * This function should only be used with Nuxt 3.
+ * For Nuxt 2, the environment variables will work as expected.
+ *
+ * @returns {Object|null} - The runtime configuration object, or null if it's not available.
+ */
+function getNuxtRuntimeConfig() {
+  if (typeof useRuntimeConfig === "function") {
+    return useRuntimeConfig();
+  } else {
+    return null;
+  }
+}
+
+function getVersion() {
+  const config = getNuxtRuntimeConfig();
+
+  return config?.public?.API_VERITREE_VERSION ||
+    process?.env?.API_VERITREE_VERSION ||
+    "5.0.0";
+}
+
 /**
  * Adds a version parameter to a URL if it does not already have one.
  * If an environment variable called API_VERITREE_VERSION is defined, its value is used as the version,
@@ -22,7 +47,7 @@ function addVersionParam(url) {
   }
 
   // Use environment variable if available, otherwise use default version
-  const version = process.env.API_VERITREE_VERSION || "5.0.0";
+  const version = getVersion();
 
   // Append version parameter to URL
   const urlVersionParam = url.includes("?")
@@ -74,7 +99,13 @@ function getConfig(method, data, as) {
 
 export default class Api {
   constructor(resource) {
-    this.baseUrl = process.env ? `${process.env.API_VERITREE_URL}/api` : null;
+    const nuxtConfig = getNuxtRuntimeConfig();
+    const url =
+      nuxtConfig?.public?.API_VERITREE_URL ||
+      process?.env?.API_VERITREE_URL ||
+      null;
+
+    this.baseUrl = url + "/api";
     this.resource = resource ? resource : "";
     this.orgId = null;
     this.orgType = null;
@@ -200,9 +231,17 @@ export default class Api {
     }
 
     if (!isOrgLess && !isOrgAs) {
-      if (this.orgId) orgIdParam = `org_id=${this.orgId}`;
-      if (this.orgType) orgTypeParam = `&org_type=${this.orgType}`;
-      if (args && args.orgType) orgTypeParam = `&org_type=${args.orgType}`;
+      if (this.orgId) {
+        orgIdParam = `org_id=${this.orgId}`;
+      }
+
+      if (this.orgType) {
+        orgTypeParam = `&org_type=${this.orgType}`;
+      }
+
+      if (args && args.orgType) {
+        orgTypeParam = `&org_type=${args.orgType}`;
+      }
     }
 
     return `?${orgIdParam}${orgTypeParam}${createParamsStringFromArgs(args)}`;