From ad45393b410f04bd2b1a9e38d5a26c2206fd9afd Mon Sep 17 00:00:00 2001 From: Sourabh Raghuwanshi Date: Thu, 14 Mar 2024 10:01:54 +0530 Subject: [PATCH 1/2] Improved:Update oms-api package to latest release(#272) --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19bce483..caf88bd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.1.0", "@hotwax/dxp-components": "^1.12.1", - "@hotwax/oms-api": "^1.10.0", + "@hotwax/oms-api": "^1.13.0", "@ionic/core": "6.7.5", "@ionic/vue": "6.7.5", "@ionic/vue-router": "6.7.5", @@ -2870,9 +2870,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 b2caaa09..8d3c09db 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.1.0", "@hotwax/dxp-components": "^1.12.1", - "@hotwax/oms-api": "^1.10.0", + "@hotwax/oms-api": "^1.13.0", "@ionic/core": "6.7.5", "@ionic/vue": "6.7.5", "@ionic/vue-router": "6.7.5", From b6698b2fef96ff4f280bd0d4edf2c1d614ca1f63 Mon Sep 17 00:00:00 2001 From: Sourabh Raghuwanshi Date: Fri, 15 Mar 2024 14:50:52 +0530 Subject: [PATCH 2/2] Improved: added baseURL check, starts with 'http' and includes '/api'(#272) --- src/services/UserService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/UserService.ts b/src/services/UserService.ts index b5388834..97f2779b 100644 --- a/src/services/UserService.ts +++ b/src/services/UserService.ts @@ -14,7 +14,7 @@ const login = async (username: string, password: string): Promise => { const checkPermission = async (payload: any): Promise => { let baseURL = store.getters['user/getInstanceUrl']; - baseURL = baseURL && baseURL.startsWith('http') ? baseURL : `https://${baseURL}.hotwax.io/api/`; + baseURL = baseURL && baseURL.startsWith('http') ? (baseURL.includes('/api') ? baseURL : `${baseURL}/api/`) : `https://${baseURL}.hotwax.io/api/`; return client({ url: "checkPermission", method: "post",