Improved:Update oms-api package to latest release(#272)

hotwax · Mar 14, 2024 · 199b1d2 · 199b1d2
1 parent 8f39c9b
commit 199b1d2
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
@@ -18,7 +18,7 @@
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
     "@hotwax/dxp-components": "^1.12.0",
-    "@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
@@ -14,8 +14,7 @@ const login = async (username: string, password: string): 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
@@ -31,7 +31,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/`;
     },
 }
 export default getters;