Merge pull request #207 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.

package.json

@@ -18,7 +18,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",

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",

src/store/modules/user/getters.ts

@@ -34,7 +34,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;