From 6f566d65a95d18c5ec8546cde7949bea564e3c4c Mon Sep 17 00:00:00 2001
From: Sourabh Raghuwanshi <rsourabh002@gmail.com>
Date: Thu, 14 Mar 2024 10:15:13 +0530
Subject: [PATCH] Improved:Update oms-api package to latest release(#272)

---
 package-lock.json                 | 8 ++++----
 package.json                      | 2 +-
 src/services/UserService.ts       | 3 +--
 src/store/modules/user/getters.ts | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 599dd838..fc415ba2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,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",
@@ -2849,9 +2849,9 @@
       }
     },
     "node_modules/@hotwax/oms-api": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.11.0.tgz",
-      "integrity": "sha512-HQCXuADMVkQXAS9ClWFrTYNjSFP8wQuGMILEkLDh9R2YR1gNnJ4GezeZuxXQOjhxBg7zXxbdL3v5/q03P32O5g==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.13.0.tgz",
+      "integrity": "sha512-D7bdS1XBfEu9fT23+mViC4FbyhFfg9GN95Epp/5V85Xcl8udxqOjHI9xcRMxANgrMjPNksshT1rm7F/TfEi/+g==",
       "dependencies": {
         "@types/node-json-transform": "^1.0.0",
         "axios": "^0.21.1",
diff --git a/package.json b/package.json
index 493e4140..2d193cc6 100644
--- 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
index 6ec25c8a..c2310acf 100644
--- 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
index d51e65ac..13d8e970 100644
--- 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