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

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

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
 }

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

src/store/modules/user/getters.ts

@@ -6,7 +6,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/`;
     },
     isAuthenticated (state) {
         return !!state.token;