Merge pull request #269 from R-Sourabh/#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.
hotwax · Mar 15, 2024 · 76f3977 · 76f3977
2 parents 5dd7513 + 6f566d6
commit 76f3977
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
     "@hotwax/dxp-components": "^1.12.1",
-    "@hotwax/oms-api": "^1.10.0",
+    "@hotwax/oms-api": "^1.13.0",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",
     "@ionic/vue-router": "^7.6.0",

diff --git a/src/services/UserService.ts b/src/services/UserService.ts
@@ -32,8 +32,7 @@ const getUserProfile = async (token: any): Promise<any> => {
 }
 
 const checkPermission = async (payload: any): Promise <any>  => {
-  let baseURL = store.getters['user/getInstanceUrl'];
-  baseURL = baseURL && baseURL.startsWith('http') ? baseURL : `https://${baseURL}.hotwax.io/api/`;
+  const baseURL = store.getters['user/getBaseUrl'];
   return client({
     url: "checkPermission",
     method: "post",

diff --git a/src/store/modules/user/getters.ts b/src/store/modules/user/getters.ts
@@ -12,7 +12,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/`; 
     },
     getUserToken (state) {
         return state.token