Merge pull request hotwax#223 from R-Sourabh/hotwax#272-Update-oms-api

Improved:Updated the oms-api package to resolve login issues encountered when /api is omitted from the complete URL. Additionally, implemented a check in the app to handle direct URL access.
Ritika-Patel08 · Mar 22, 2024 · 0d7aa30 · 0d7aa30
2 parents 6e521a7 + ccf86c6
commit 0d7aa30
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.4",
     "@hotwax/dxp-components": "^1.11.0",
-    "@hotwax/oms-api": "^1.12.0",
+    "@hotwax/oms-api": "^1.13.0",
     "@ionic/core": "^6.7.5",
     "@ionic/vue": "^6.7.5",
     "@ionic/vue-router": "^6.7.5",

diff --git a/src/store/modules/user/getters.ts b/src/store/modules/user/getters.ts
@@ -25,7 +25,7 @@ const getters: GetterTree <UserState, RootState> = {
     getBaseUrl (state) {
         let baseURL = process.env.VUE_APP_BASE_URL;
         if (!baseURL) baseURL = state.instanceUrl;
-        return baseURL.startsWith('http') ? baseURL : `https://${baseURL}.hotwax.io/api/`;
+        return baseURL.startsWith('http') ? baseURL.includes('/api') ? baseURL : `${baseURL}/api/` : `https://${baseURL}.hotwax.io/api/`;
     },
     getPwaState (state) {
         return state.pwaState;