basesite-shared-grid-lib 21.0.1-beta.93 → 21.0.3

package/fesm2022/basesite-shared-grid-lib.mjs

@@ -48,17 +48,12 @@ class GridLibraryService {
         this.setBaseUrl();
     }
     setBaseUrl(environment = "") {
-        if (window.location.origin.includes('fcelspx')) {
-            this.baseUrl = window.location.origin + '/designhub/api';
-        }
-        else if (environment == 'uat') {
-            this.baseUrl = 'https://fcemsuat.intel.com/designhub/api';
-        }
-        else if (environment == 'production') {
-            this.baseUrl = 'https://fcems.intel.com/designhub/api';
+        //All envs except localhost can use dynamic URL (localhost can't because it should point to test or another port)
+        if (window.location.origin.includes('localhost')) {
+            this.baseUrl = 'https://fcemstest.intel.com/designhub/api';
         }
         else {
-            this.baseUrl = 'https://fcelspx-test.intel.com/designhub/api';
+            this.baseUrl = window.location.origin + '/designhub/api';
         }
     }
     getColDef(gridId) {
@@ -2764,14 +2759,8 @@ class GridLibraryComponent {
         if (this.enableServerSidePaging == true) {
             // Show loading overlay immediately when server-side paging is enabled
             this.gridAPI.showLoadingOverlay();
-            //call api
-            let reqHeaders = {
-                'Content-type': 'application/json',
-                Accept: 'application/json',
-                Authorization: 'Bearer ' + this.token,
-            };
             // Add timeout to prevent infinite loading
-            const API_TIMEOUT = 800000; //80 seconds
+            const API_TIMEOUT = 80000; //80 seconds
             let hasRetried = false;
             this.odataProvider = new OdataServerSideProvider({
                 isCaseSensitiveStringFilter: false,
@@ -2782,6 +2771,15 @@ class GridLibraryComponent {
                     const timeoutPromise = new Promise((_, reject) => {
                         setTimeout(() => reject(new Error('API request timeout')), API_TIMEOUT);
                     });
+                    // Build headers on every call so we always use the latest token.
+                    // Capturing the token once (e.g. at grid-ready) meant that after the
+                    // token expired, every subsequent filter/sort/paging request kept
+                    // sending the stale token and silently failed with a 401.
+                    const reqHeaders = {
+                        'Content-type': 'application/json',
+                        Accept: 'application/json',
+                        Authorization: 'Bearer ' + this.token,
+                    };
                     const fetchPromise = fetch(url, {
                         headers: reqHeaders,
                     })