From 9b7a465885f82614465203201e5f13c355be5ac8 Mon Sep 17 00:00:00 2001 From: R-Sourabh Date: Wed, 9 Oct 2024 14:51:35 +0530 Subject: [PATCH 1/2] Implemented: support for permissions in the app and added suppor to make api calls on redirection oms(#323) --- .env.example | 2 +- package.json | 2 + src/api/index.ts | 19 +++- src/authorization/Actions.ts | 3 + src/authorization/Rules.ts | 3 + src/authorization/index.ts | 124 +++++++++++++++++++++++ src/main.ts | 7 ++ src/services/UserService.ts | 92 +++++++++++++++++ src/store/index.ts | 3 + src/store/modules/user/UserState.ts | 3 +- src/store/modules/user/actions.ts | 40 +++++++- src/store/modules/user/getters.ts | 5 +- src/store/modules/user/index.ts | 3 +- src/store/modules/user/mutation-types.ts | 3 +- src/store/modules/user/mutations.ts | 4 + 15 files changed, 301 insertions(+), 12 deletions(-) create mode 100644 src/authorization/Actions.ts create mode 100644 src/authorization/Rules.ts create mode 100644 src/authorization/index.ts diff --git a/.env.example b/.env.example index 9241f50..8278ab5 100644 --- a/.env.example +++ b/.env.example @@ -2,7 +2,7 @@ VUE_APP_I18N_LOCALE=en VUE_APP_I18N_FALLBACK_LOCALE=en VUE_APP_CACHE_MAX_AGE=3600 VUE_APP_VIEW_SIZE=10 -VUE_APP_PERMISSION_ID= +VUE_APP_PERMISSION_ID="COMPANY_APP_VIEW" VUE_APP_DEFAULT_LOG_LEVEL="error" VUE_APP_COMPANY_PARTY_ID="COMPANY" VUE_APP_LOGIN_URL="https://launchpad.hotwax.io/login" diff --git a/package.json b/package.json index dfdff9a..f8d8de8 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "dependencies": { "@capacitor/android": "^2.4.7", "@capacitor/core": "^2.4.7", + "@casl/ability": "^6.0.0", "@hotwax/app-version-info": "^1.0.0", "@hotwax/apps-theme": "^1.2.6", "@hotwax/dxp-components": "^1.15.0", @@ -23,6 +24,7 @@ "@ionic/vue-router": "^7.6.0", "axios": "^0.21.1", "axios-cache-adapter": "^2.7.3", + "boon-js": "^2.0.3", "core-js": "^3.6.5", "http-status-codes": "^2.1.4", "luxon": "^2.3.0", diff --git a/src/api/index.ts b/src/api/index.ts index 693ee54..77d0d0a 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -5,13 +5,20 @@ import emitter from "@/event-bus" import store from "@/store"; import { StatusCodes } from "http-status-codes"; +let apiConfig = {} as any + axios.interceptors.request.use((config: any) => { // TODO: pass csrf token const token = store.getters["user/getUserToken"]; - if (token) { + if (token && !apiConfig.useOmsRedirection) { config.headers["api_key"] = token; config.headers["Content-Type"] = "application/json"; } + const omsRedirectionInfo = store.getters["user/getOmsRedirectionInfo"] + if (apiConfig.useOmsRedirection && omsRedirectionInfo.token) { + config.headers["Authorization"] = `Bearer ${omsRedirectionInfo.token}`; + config.headers["Content-Type"] = "application/json"; + } return config; }); @@ -77,6 +84,7 @@ const axiosCache = setupCache({ * @return {Promise} Response from API as returned by Axios */ const api = async (customConfig: any) => { + apiConfig = customConfig // Prepare configuration const config: any = { url: customConfig.url, @@ -87,7 +95,14 @@ const api = async (customConfig: any) => { } const baseURL = store.getters["user/getInstanceUrl"]; - if (baseURL) config.baseURL = baseURL.startsWith('http') ? baseURL.includes('/rest/s1/admin') ? baseURL : `${baseURL}/rest/s1/admin/` : `https://${baseURL}.hotwax.io/rest/s1/admin/`; + const omsRedirectionInfo = store.getters["user/getOmsRedirectionInfo"] + + if(customConfig.useOmsRedirection) { + config.baseURL = omsRedirectionInfo.url.startsWith('http') ? omsRedirectionInfo.url.includes('/api') ? omsRedirectionInfo.url : `${omsRedirectionInfo.url}/api/` : `https://${omsRedirectionInfo.url}.hotwax.io/api/`; + } else if (baseURL) { + config.baseURL = baseURL.startsWith('http') ? baseURL.includes('/rest/s1/admin') ? baseURL : `${baseURL}/rest/s1/admin/` : `https://${baseURL}.hotwax.io/rest/s1/admin/`; + } + if(customConfig.cache) config.adapter = axiosCache.adapter; const networkStatus = await OfflineHelper.getNetworkStatus(); if (customConfig.queue && !networkStatus.connected) { diff --git a/src/authorization/Actions.ts b/src/authorization/Actions.ts new file mode 100644 index 0000000..31e7e11 --- /dev/null +++ b/src/authorization/Actions.ts @@ -0,0 +1,3 @@ +export default { + "COMPANY_APP_VIEW": "COMPANY_APP_VIEW" +} \ No newline at end of file diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts new file mode 100644 index 0000000..7339d59 --- /dev/null +++ b/src/authorization/Rules.ts @@ -0,0 +1,3 @@ +export default { + "COMPANY_APP_VIEW": "COMPANY_APP_VIEW" +} as any \ No newline at end of file diff --git a/src/authorization/index.ts b/src/authorization/index.ts new file mode 100644 index 0000000..4ac0f6a --- /dev/null +++ b/src/authorization/index.ts @@ -0,0 +1,124 @@ +import { AbilityBuilder, PureAbility } from '@casl/ability'; +import { getEvaluator, parse } from 'boon-js'; +import { Tokens } from 'boon-js/lib/types' + +// TODO Improve this +// We will move this code to an external plugin and use below Actions and Rules accordlingly +let Actions = {} as any; +let Rules = {} as any; + +// We are using CASL library to define permissions. +// Instead of using Action-Subject based authorisation we are going with Claim based Authorization. +// We would be defining the permissions for each action and case, map with server permissiosn based upon certain rules. +// https://casl.js.org/v5/en/cookbook/claim-authorization +// Following the comment of Sergii Stotskyi, author of CASL +// https://github.com/stalniy/casl/issues/525 +// We are defining a PureAbility and creating an instance with AbilityBuilder. +type ClaimBasedAbility = PureAbility; +const { build } = new AbilityBuilder(PureAbility); +const ability = build(); + +/** + * The method returns list of permissions required for the rules. We are having set of rules, + * through which app permissions are defined based upon the server permissions. + * When getting server permissions, as all the permissions are not be required. + * Specific permissions used defining the rules are extracted and sent to server. + * @returns permissions + */ +const getServerPermissionsFromRules = () => { + // Iterate for each rule + const permissions = Object.keys(Rules).reduce((permissions: any, rule: any) => { + const permissionRule = Rules[rule]; + // some rules may be empty, no permission is required from server + if (permissionRule) { + // Each rule may have multiple permissions along with operators + // Boon js parse rules into tokens, each token may be operator or server permission + // permissionId will have token name as identifier. + const permissionTokens = parse(permissionRule); + permissions = permissionTokens.reduce((permissions: any, permissionToken: any) => { + // Token object with name as identifier has permissionId + if (Tokens.IDENTIFIER === permissionToken.name) { + permissions.add(permissionToken.value); + } + return permissions; + }, permissions) + } + return permissions; + }, new Set()) + return [...permissions]; +} + +/** + * The method is used to prepare app permissions from the server permissions. + * Rules could be defined such that each app permission could be defined based upon certain one or more server permissions. + * @param serverPermissions + * @returns appPermissions + */ +const prepareAppPermissions = (serverPermissions: any) => { + const serverPermissionsInput = serverPermissions.reduce((serverPermissionsInput: any, permission: any) => { + serverPermissionsInput[permission] = true; + return serverPermissionsInput; + }, {}) + // Boonjs evaluator needs server permissions as object with permissionId and boolean value + // Each rule is passed to evaluator along with the server permissions + // if the server permissions and rule matches, app permission is added to list + const permissions = Object.keys(Rules).reduce((permissions: any, rule: any) => { + const permissionRule = Rules[rule]; + // If for any app permission, we have empty rule we user is assigned the permission + // If rule is not defined, the app permisions is still evaluated or provided to all the users. + if (!permissionRule || (permissionRule && getEvaluator(permissionRule)(serverPermissionsInput))) { + permissions.push(rule); + } + return permissions; + }, []) + const { can, rules } = new AbilityBuilder(PureAbility); + permissions.map((permission: any) => { + can(permission); + }) + return rules; +} + +/** + * + * Sets the current app permissions. This should be used after perparing the app permissions from the server permissions + * @param permissions + * @returns + */ +const setPermissions = (permissions: any) => { + // If the user has passed undefined or null, it should not break the code + if (!permissions) permissions = []; + ability.update(permissions) + return true; +}; + +/** + * Resets the permissions list. Used for cases like logout + */ +const resetPermissions = () => setPermissions([]); + +/** + * + * @param permission + * @returns + */ +const hasPermission = (permission: string) => ability.can(permission); + +export { Actions, getServerPermissionsFromRules, hasPermission, prepareAppPermissions, resetPermissions, setPermissions}; + +// TODO Move this code to an external plugin, to be used across the apps +export default { + install(app: any, options: any) { + + // Rules and Actions could be app and OMS package specific + Rules = options.rules; + Actions = options.actions; + + // TODO Check why global properties is not working and apply across. + app.config.globalProperties.$permission = this; + }, + getServerPermissionsFromRules, + hasPermission, + prepareAppPermissions, + resetPermissions, + setPermissions +} \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index c16912a..da4d07e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -29,6 +29,9 @@ import i18n from "./i18n" import store from "./store" import { DateTime } from "luxon"; import logger from './logger'; +import permissionPlugin from '@/authorization'; +import permissionRules from '@/authorization/Rules'; +import permissionActions from '@/authorization/Actions'; import { dxpComponents } from "@hotwax/dxp-components" import { login, logout, loader } from "@/user-utils"; import { askQuery, getConfig, getGitBookPage, initialise, searchQuery } from '@/adapter'; @@ -44,6 +47,10 @@ const app = createApp(App) .use(router) .use(i18n) .use(store) + .use(permissionPlugin, { + rules: permissionRules, + actions: permissionActions + }) .use(dxpComponents, { defaultImgUrl: require("@/assets/images/defaultImage.png"), login, diff --git a/src/services/UserService.ts b/src/services/UserService.ts index 05f0bba..6cb3168 100644 --- a/src/services/UserService.ts +++ b/src/services/UserService.ts @@ -69,9 +69,101 @@ const setUserTimeZone = async (payload: any): Promise => { }); } +const getUserPermissions = async (payload: any, url: string, token: any): Promise => { + // Currently, making this request in ofbiz + const omsRedirectionInfo = store.getters["user/getOmsRedirectionInfo"] + const baseURL = omsRedirectionInfo.url.startsWith('http') ? omsRedirectionInfo.url.includes('/api') ? omsRedirectionInfo.url : `${omsRedirectionInfo.url}/api/` : `https://${omsRedirectionInfo.url}.hotwax.io/api/`; + let serverPermissions = [] as any; + + // If the server specific permission list doesn't exist, getting server permissions will be of no use + // It means there are no rules yet depending upon the server permissions. + if (payload.permissionIds && payload.permissionIds.length == 0) return serverPermissions; + // TODO pass specific permissionIds + let resp; + // TODO Make it configurable from the environment variables. + // Though this might not be an server specific configuration, + // we will be adding it to environment variable for easy configuration at app level + const viewSize = 200; + + try { + const params = { + "viewIndex": 0, + viewSize, + permissionIds: payload.permissionIds + } + resp = await client({ + url: "getPermissions", + method: "post", + baseURL, + data: params, + headers: { + Authorization: 'Bearer ' + token, + 'Content-Type': 'application/json' + } + }) + if(resp.status === 200 && resp.data.docs?.length && !hasError(resp)) { + serverPermissions = resp.data.docs.map((permission: any) => permission.permissionId); + const total = resp.data.count; + const remainingPermissions = total - serverPermissions.length; + if (remainingPermissions > 0) { + // We need to get all the remaining permissions + const apiCallsNeeded = Math.floor(remainingPermissions / viewSize) + ( remainingPermissions % viewSize != 0 ? 1 : 0); + const responses = await Promise.all([...Array(apiCallsNeeded).keys()].map(async (index: any) => { + const response = await client({ + url: "getPermissions", + method: "post", + baseURL, + data: { + "viewIndex": index + 1, + viewSize, + permissionIds: payload.permissionIds + }, + headers: { + Authorization: 'Bearer ' + token, + 'Content-Type': 'application/json' + } + }) + if(!hasError(response)){ + return Promise.resolve(response); + } else { + return Promise.reject(response); + } + })) + const permissionResponses = { + success: [], + failed: [] + } + responses.reduce((permissionResponses: any, permissionResponse: any) => { + if (permissionResponse.status !== 200 || hasError(permissionResponse) || !permissionResponse.data?.docs) { + permissionResponses.failed.push(permissionResponse); + } else { + permissionResponses.success.push(permissionResponse); + } + return permissionResponses; + }, permissionResponses) + + serverPermissions = permissionResponses.success.reduce((serverPermissions: any, response: any) => { + serverPermissions.push(...response.data.docs.map((permission: any) => permission.permissionId)); + return serverPermissions; + }, serverPermissions) + + // If partial permissions are received and we still allow user to login, some of the functionality might not work related to the permissions missed. + // Show toast to user intimiting about the failure + // Allow user to login + // TODO Implement Retry or improve experience with show in progress icon and allowing login only if all the data related to user profile is fetched. + if (permissionResponses.failed.length > 0) Promise.reject("Something went wrong while getting complete user permissions."); + } + } + return serverPermissions; + } catch(error: any) { + return Promise.reject(error); + } +} + export const UserService = { getAvailableTimeZones, getUserProfile, + getUserPermissions, login, setUserTimeZone, } \ No newline at end of file diff --git a/src/store/index.ts b/src/store/index.ts index f7966f9..ca81254 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -7,6 +7,7 @@ import createPersistedState from "vuex-persistedstate"; import userModule from "./modules/user"; import productStoreModule from "./modules/productStore"; import utilModule from "./modules/util" +import { setPermissions } from "@/authorization" // TODO check how to register it from the components only // Handle same module registering multiple time on page refresh @@ -33,6 +34,8 @@ const store = createStore({ }, }) +setPermissions(store.getters['user/getUserPermissions']); + export default store export function useStore(): typeof store { return useVuexStore() diff --git a/src/store/modules/user/UserState.ts b/src/store/modules/user/UserState.ts index 65ff622..a881f07 100644 --- a/src/store/modules/user/UserState.ts +++ b/src/store/modules/user/UserState.ts @@ -5,5 +5,6 @@ export default interface UserState { omsRedirectionInfo: { url: string; token: string; - } + }, + permissions: any; } \ No newline at end of file diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts index 3758526..ab42e96 100644 --- a/src/store/modules/user/actions.ts +++ b/src/store/modules/user/actions.ts @@ -10,6 +10,7 @@ import emitter from "@/event-bus" import { Settings } from "luxon" import { useAuthStore } from '@hotwax/dxp-components' import { resetConfig } from '@/adapter' +import { getServerPermissionsFromRules, prepareAppPermissions, resetPermissions, setPermissions } from "@/authorization" const actions: ActionTree = { @@ -23,6 +24,36 @@ const actions: ActionTree = { const { token, oms, omsRedirectionUrl } = payload; dispatch("setUserInstanceUrl", oms); + + // Getting the permissions list from server + const permissionId = process.env.VUE_APP_PERMISSION_ID; + // Prepare permissions list + const serverPermissionsFromRules = getServerPermissionsFromRules(); + if (permissionId) serverPermissionsFromRules.push(permissionId); + if(omsRedirectionUrl && token) { + dispatch("setOmsRedirectionInfo", { url: omsRedirectionUrl, token }) + } + + const serverPermissions: Array = await UserService.getUserPermissions({ + permissionIds: [...new Set(serverPermissionsFromRules)] + }, omsRedirectionUrl, token); + const appPermissions = prepareAppPermissions(serverPermissions); + + + // Checking if the user has permission to access the app + // If there is no configuration, the permission check is not enabled + if (permissionId) { + // As the token is not yet set in the state passing token headers explicitly + // TODO Abstract this out, how token is handled should be part of the method not the callee + const hasPermission = appPermissions.some((appPermission: any) => appPermission.action === permissionId ); + // If there are any errors or permission check fails do not allow user to login + if (!hasPermission) { + const permissionError = 'You do not have permission to access the app.'; + showToast(translate(permissionError)); + logger.error("error", permissionError); + return Promise.reject(new Error(permissionError)); + } + } emitter.emit("presentLoader", { message: "Logging in...", backdropDismiss: false }) const api_key = await UserService.login(token) @@ -32,12 +63,11 @@ const actions: ActionTree = { if (userProfile.timeZone) { Settings.defaultZone = userProfile.timeZone; } - - if(omsRedirectionUrl && token) { - dispatch("setOmsRedirectionInfo", { url: omsRedirectionUrl, token }) - } + + setPermissions(appPermissions); commit(types.USER_TOKEN_CHANGED, { newToken: api_key }) commit(types.USER_INFO_UPDATED, userProfile); + commit(types.USER_PERMISSIONS_UPDATED, appPermissions); this.dispatch('util/fetchOrganizationPartyId'); emitter.emit("dismissLoader") } catch (err: any) { @@ -62,7 +92,7 @@ const actions: ActionTree = { this.dispatch("util/clearUtilState"); dispatch("setOmsRedirectionInfo", { url: "", token: "" }) resetConfig(); - + resetPermissions(); // reset plugin state on logout authStore.$reset() diff --git a/src/store/modules/user/getters.ts b/src/store/modules/user/getters.ts index b8ec36d..7cd1d2f 100644 --- a/src/store/modules/user/getters.ts +++ b/src/store/modules/user/getters.ts @@ -24,6 +24,9 @@ const getters: GetterTree = { }, getOmsRedirectionInfo(state) { return state.omsRedirectionInfo; - } + }, + getUserPermissions (state) { + return state.permissions; + }, } export default getters; \ No newline at end of file diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts index d64167c..e57c372 100644 --- a/src/store/modules/user/index.ts +++ b/src/store/modules/user/index.ts @@ -14,7 +14,8 @@ const userModule: Module = { omsRedirectionInfo: { url: "", token: "" - } + }, + permissions: [] }, getters, actions, diff --git a/src/store/modules/user/mutation-types.ts b/src/store/modules/user/mutation-types.ts index dcf320e..894c6b8 100644 --- a/src/store/modules/user/mutation-types.ts +++ b/src/store/modules/user/mutation-types.ts @@ -3,4 +3,5 @@ export const USER_TOKEN_CHANGED = SN_USER + "/TOKEN_CHANGED" export const USER_END_SESSION = SN_USER + "/END_SESSION" export const USER_INFO_UPDATED = SN_USER + "/INFO_UPDATED" export const USER_INSTANCE_URL_UPDATED = SN_USER + "/INSTANCE_URL_UPDATED" -export const USER_OMS_REDIRECTION_INFO_UPDATED = SN_USER + '/OMS_REDIRECTION_INFO_UPDATED' \ No newline at end of file +export const USER_OMS_REDIRECTION_INFO_UPDATED = SN_USER + '/OMS_REDIRECTION_INFO_UPDATED' +export const USER_PERMISSIONS_UPDATED = SN_USER + '/PERMISSIONS_UPDATED' \ No newline at end of file diff --git a/src/store/modules/user/mutations.ts b/src/store/modules/user/mutations.ts index 7a0ec30..32e84c9 100644 --- a/src/store/modules/user/mutations.ts +++ b/src/store/modules/user/mutations.ts @@ -9,6 +9,7 @@ const mutations: MutationTree = { [types.USER_END_SESSION] (state) { state.token = "" state.current = null + state.permissions = [] }, [types.USER_INFO_UPDATED] (state, payload) { state.current = payload @@ -18,6 +19,9 @@ const mutations: MutationTree = { }, [types.USER_OMS_REDIRECTION_INFO_UPDATED](state, payload) { state.omsRedirectionInfo = payload; + }, + [types.USER_PERMISSIONS_UPDATED] (state, payload) { + state.permissions = payload } } export default mutations; \ No newline at end of file From 49a3e728fb240edc4c37b269cfb36bbe1ef864b7 Mon Sep 17 00:00:00 2001 From: R-Sourabh Date: Mon, 14 Oct 2024 16:46:17 +0530 Subject: [PATCH 2/2] Improved: client method to not honor the interceptors and removed logic to use api method for making ofbiz calls --- src/api/index.ts | 29 +++++++++-------------------- src/services/UserService.ts | 3 +-- src/store/modules/user/actions.ts | 6 +++--- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/api/index.ts b/src/api/index.ts index 77d0d0a..434b48d 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -3,22 +3,15 @@ import { setupCache } from "axios-cache-adapter" import OfflineHelper from "@/offline-helper" import emitter from "@/event-bus" import store from "@/store"; -import { StatusCodes } from "http-status-codes"; -let apiConfig = {} as any axios.interceptors.request.use((config: any) => { // TODO: pass csrf token const token = store.getters["user/getUserToken"]; - if (token && !apiConfig.useOmsRedirection) { + if (token) { config.headers["api_key"] = token; config.headers["Content-Type"] = "application/json"; } - const omsRedirectionInfo = store.getters["user/getOmsRedirectionInfo"] - if (apiConfig.useOmsRedirection && omsRedirectionInfo.token) { - config.headers["Authorization"] = `Bearer ${omsRedirectionInfo.token}`; - config.headers["Content-Type"] = "application/json"; - } return config; }); @@ -50,12 +43,12 @@ axios.interceptors.response.use(function (response) { if (error.response) { // TODO Handle case for failed queue request const { status } = error.response; - if (status === StatusCodes.UNAUTHORIZED) { - store.dispatch("user/logout"); - const redirectUrl = window.location.origin + '/login'; - // Explicitly passing isLoggedOut as in case of maarg apps we need to call the logout api in launchpad - window.location.href = `${process.env.VUE_APP_LOGIN_URL}?redirectUrl=${redirectUrl}&isLoggedOut=true`; - } + // if (status === StatusCodes.UNAUTHORIZED) { + // store.dispatch("user/logout"); + // const redirectUrl = window.location.origin + '/login'; + // // Explicitly passing isLoggedOut as in case of maarg apps we need to call the logout api in launchpad + // window.location.href = `${process.env.VUE_APP_LOGIN_URL}?redirectUrl=${redirectUrl}&isLoggedOut=true`; + // } } // Any status codes that falls outside the range of 2xx cause this function to trigger // Do something with response error @@ -84,7 +77,6 @@ const axiosCache = setupCache({ * @return {Promise} Response from API as returned by Axios */ const api = async (customConfig: any) => { - apiConfig = customConfig // Prepare configuration const config: any = { url: customConfig.url, @@ -95,11 +87,8 @@ const api = async (customConfig: any) => { } const baseURL = store.getters["user/getInstanceUrl"]; - const omsRedirectionInfo = store.getters["user/getOmsRedirectionInfo"] - if(customConfig.useOmsRedirection) { - config.baseURL = omsRedirectionInfo.url.startsWith('http') ? omsRedirectionInfo.url.includes('/api') ? omsRedirectionInfo.url : `${omsRedirectionInfo.url}/api/` : `https://${omsRedirectionInfo.url}.hotwax.io/api/`; - } else if (baseURL) { + if (baseURL) { config.baseURL = baseURL.startsWith('http') ? baseURL.includes('/rest/s1/admin') ? baseURL : `${baseURL}/rest/s1/admin/` : `https://${baseURL}.hotwax.io/rest/s1/admin/`; } @@ -123,7 +112,7 @@ const api = async (customConfig: any) => { * @return {Promise} Response from API as returned by Axios */ const client = (config: any) => { - return axios.request(config); + return axios.create().request(config); } export { api as default, client, axios }; \ No newline at end of file diff --git a/src/services/UserService.ts b/src/services/UserService.ts index 6cb3168..438279a 100644 --- a/src/services/UserService.ts +++ b/src/services/UserService.ts @@ -71,8 +71,7 @@ const setUserTimeZone = async (payload: any): Promise => { const getUserPermissions = async (payload: any, url: string, token: any): Promise => { // Currently, making this request in ofbiz - const omsRedirectionInfo = store.getters["user/getOmsRedirectionInfo"] - const baseURL = omsRedirectionInfo.url.startsWith('http') ? omsRedirectionInfo.url.includes('/api') ? omsRedirectionInfo.url : `${omsRedirectionInfo.url}/api/` : `https://${omsRedirectionInfo.url}.hotwax.io/api/`; + const baseURL = url.startsWith('http') ? url.includes('/api') ? url : `${url}/api/` : `https://${url}.hotwax.io/api/`; let serverPermissions = [] as any; // If the server specific permission list doesn't exist, getting server permissions will be of no use diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts index ab42e96..62c6945 100644 --- a/src/store/modules/user/actions.ts +++ b/src/store/modules/user/actions.ts @@ -30,9 +30,6 @@ const actions: ActionTree = { // Prepare permissions list const serverPermissionsFromRules = getServerPermissionsFromRules(); if (permissionId) serverPermissionsFromRules.push(permissionId); - if(omsRedirectionUrl && token) { - dispatch("setOmsRedirectionInfo", { url: omsRedirectionUrl, token }) - } const serverPermissions: Array = await UserService.getUserPermissions({ permissionIds: [...new Set(serverPermissionsFromRules)] @@ -65,6 +62,9 @@ const actions: ActionTree = { } setPermissions(appPermissions); + if(omsRedirectionUrl && token) { + dispatch("setOmsRedirectionInfo", { url: omsRedirectionUrl, token }) + } commit(types.USER_TOKEN_CHANGED, { newToken: api_key }) commit(types.USER_INFO_UPDATED, userProfile); commit(types.USER_PERMISSIONS_UPDATED, appPermissions);