diff --git a/package-lock.json b/package-lock.json index 989aab09..83a1ad87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,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": "6.7.5", "@ionic/vue": "6.7.5", "@ionic/vue-router": "6.7.5", @@ -2908,9 +2908,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 1cda8406..06130c76 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,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": "6.7.5", "@ionic/vue": "6.7.5", "@ionic/vue-router": "6.7.5", diff --git a/src/adapter/index.ts b/src/adapter/index.ts index 23716e29..2d61e89d 100644 --- a/src/adapter/index.ts +++ b/src/adapter/index.ts @@ -1,4 +1,4 @@ -import { api, client, getConfig, init, initialise, logout, resetConfig, updateInstanceUrl, updateToken } from '@hotwax/oms-api' +import { api, client, getConfig, init, initialise, logout, resetConfig, updateInstanceUrl, updateToken, setUserLocale } from '@hotwax/oms-api' export { api, @@ -9,5 +9,6 @@ export { logout, resetConfig, updateInstanceUrl, - updateToken + updateToken, + setUserLocale } \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index a1c97d4c..ee03fb04 100644 --- a/src/main.ts +++ b/src/main.ts @@ -34,7 +34,7 @@ import permissionRules from '@/authorization/Rules'; import permissionActions from '@/authorization/Actions'; import { dxpComponents } from '@hotwax/dxp-components' import { login, logout, loader } from './user-utils'; -import { getConfig, initialise } from '@/adapter' +import { getConfig, initialise, setUserLocale } from '@/adapter' import localeMessages from './locales'; @@ -60,7 +60,8 @@ const app = createApp(App) appLoginUrl: process.env.VUE_APP_LOGIN_URL as string, getConfig, initialise, - localeMessages + localeMessages, + setUserLocale }); // Filters are removed in Vue 3 and global filter introduced https://v3.vuejs.org/guide/migration/filters.html#global-filters diff --git a/src/store/modules/user/getters.ts b/src/store/modules/user/getters.ts index b6c22f67..0bb59cf8 100644 --- a/src/store/modules/user/getters.ts +++ b/src/store/modules/user/getters.ts @@ -6,7 +6,7 @@ const getters: GetterTree = { 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/`; }, isAuthenticated (state) { return !!state.token;