@gandalan/weblibs 1.1.67 → 1.1.69

package/api/fluentApi.js

@@ -96,7 +96,7 @@ export function isTokenValid(token)
  * @property {string} storageEntry - The storage entry.
  * @property {string} token - The JWT token for authorization.
  * @property {string} refreshToken - The refresh token.
- * @property {function(string) : FluentApi} useEnvironment - Sets the environment and returns the FluentApi object.
+ * @property {function(EnvironmentConfig) : FluentApi} useEnvironment - Sets the environment and returns the FluentApi object.
  * @property {function(string) : FluentApi} useAppToken - Sets the application token and returns the FluentApi object.
  * @property {function(string) : FluentApi} useBaseUrl - Sets the base URL for API requests and returns the FluentApi object.
  * @property {function(string) : FluentApi} useAuthUrl - Sets the authentication URL and returns the FluentApi object.
@@ -130,11 +130,14 @@ export function createApi() {
         /**
          * set the environment to use
          * 
-         * @param {string} env 
+         * @param {EnvironmentConfig} env 
          * @return {FluentApi}
          */
-        useEnvironment(env = "") {
-            this.env = env; return this;
+        useEnvironment(env = {}) { 
+            this.env = env; 
+            this.baseUrl = env.idas;
+            this.authUrl = env.idas;
+            return this; 
         },
 
         /**
@@ -154,7 +157,8 @@ export function createApi() {
          * @return {FluentApi}
          */
         useBaseUrl(url = "") {
-            this.baseUrl = url; return this;
+            this.baseUrl = url;
+            return this;
         },
 
         /**
@@ -270,12 +274,10 @@ export function createApi() {
             if (this.token && isTokenValid(this.token))
                 return;
 
-            await this.ensureBaseUrlIsSet();
-
             try {
                 const temptoken = await authBuilder()
                     .useAppToken(this.appToken)
-                    .useBaseUrl(this.authUrl)
+                    .useBaseUrl(this.authUrl || this.env.idas)
                     .useToken(this.token)
                     .useRefreshToken(this.refreshToken)
                     .authenticate() || "";
@@ -297,30 +299,6 @@ export function createApi() {
                 //this.redirectToLogin();
                 console.error("not authenticated", e);
             }
-        },
-        
-        /**
-         * Ensure the base URL is set before making a request. If not set, 
-         * retrieve the environment data and set the base URL.
-         *
-         * @async
-         * @private
-         */
-        async ensureBaseUrlIsSet() {
-            if (this.env && (!this.baseUrl || !this.authUrl)) {
-                const envInfo = await fetchEnv(this.env);
-                this.baseUrl = this.baseUrl || envInfo.idas;
-                this.authUrl = this.authUrl || envInfo.idas;
-                console.log("envInfo", envInfo);
-            }
-
-            if (!this.baseUrl) {
-                throw new Error("apiBaseurl not set");
-            }
-
-            if (!this.authUrl) {
-                throw new Error("authUrl not set");
-            }
         }
     };
 }
@@ -335,8 +313,7 @@ export function createApi() {
 export function idasApi(appToken = "") {
     return createApi()
         .useGlobalAuth()
-        .useAppToken(appToken)
-        .useEnvironment("dev");
+        .useAppToken(appToken);
 }
 
 /**
@@ -348,6 +325,5 @@ export function idasApi(appToken = "") {
 export function localApi() {
     return createApi()
         .useGlobalAuth()
-        .useBaseUrl("/api")
-        .useEnvironment("dev");
+        .useBaseUrl("api");
 }

package/api/fluentRestClient.js

@@ -48,7 +48,7 @@ export function restClient() {
          * @returns {Promise<any>}
          */
         async get(url = "", auth = true) {
-            const finalUrl = `${this.baseUrl}/${url}`;
+            const finalUrl = `${this.baseUrl}${url}`;
             const headers = this.token ? { "Authorization": `Bearer ${this.token}` } : {};
             const res = await fetch(finalUrl, { method: "GET", headers });
             if (res.ok)
@@ -65,7 +65,7 @@ export function restClient() {
          * @returns {Promise<any>}
          */
         async put(url = "", payload = {}) {
-            const finalUrl = `${this.baseUrl}/${url}`;
+            const finalUrl = `${this.baseUrl}${url}`;
             const headers = this.token ? { "Authorization": `Bearer ${this.token}`, "Content-Type": "application/json" } : {};
             const res = await fetch(finalUrl, { method: "PUT", body: JSON.stringify(payload), headers });
             if (res.ok)
@@ -82,7 +82,7 @@ export function restClient() {
          * @returns {Promise<any>}
          */
         async post(url = "", payload = {}) {
-            const finalUrl = `${this.baseUrl}/${url}`;
+            const finalUrl = `${this.baseUrl}${url}`;
             const headers = this.token ? { "Authorization": `Bearer ${this.token}`, "Content-Type": "application/json" } : {};
             const res = await fetch(finalUrl, { method: "POST", body: JSON.stringify(payload), headers });
             if (res.ok)
@@ -98,7 +98,7 @@ export function restClient() {
          * @returns {Promise<any>}
          */
         async delete(url = "") {
-            const finalUrl = `${this.baseUrl}/${url}`;
+            const finalUrl = `${this.baseUrl}${url}`;
             const headers = this.token ? { "Authorization": `Bearer ${this.token}` } : {};
             const res = await fetch(finalUrl, { method: "DELETE", headers });
             if (res.ok)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gandalan/weblibs",
-  "version": "1.1.67",
+  "version": "1.1.69",
   "description": "WebLibs for Gandalan JS/TS/Svelte projects",
   "keywords": [
     "gandalan"