From 7a3cb09b2e0487acd1b1e174fa99152b230d705b Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Thu, 5 Dec 2024 16:31:34 -0800 Subject: [PATCH 1/3] 24755 - fix: when and how is account fetched. --- src/components/bcros/header/Index.vue | 4 +++- src/middleware/02.setupAuth.global.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/bcros/header/Index.vue b/src/components/bcros/header/Index.vue index 24b26732..3157726c 100644 --- a/src/components/bcros/header/Index.vue +++ b/src/components/bcros/header/Index.vue @@ -89,7 +89,9 @@ const { createAccount, logout } = useBcrosAuth() function switchAccount (accountId: number) { account.switchCurrentAccount(accountId) // refresh the page so that account based checks are rerun - window.location.reload() + const url = new URL(window.location) + url.searchParams.set('accountid', accountId.toString()) + window.location.assign(url.toString()) } // logged out menu options diff --git a/src/middleware/02.setupAuth.global.ts b/src/middleware/02.setupAuth.global.ts index cf003a97..7b0b8954 100644 --- a/src/middleware/02.setupAuth.global.ts +++ b/src/middleware/02.setupAuth.global.ts @@ -35,6 +35,7 @@ export default defineNuxtRouteMiddleware(async (to) => { // set account stuff (normally would happen after kc init in 'setupAuth') const account = useBcrosAccount() await account.setUserName() - await account.setAccountInfo() + const accountNumber = to?.params?.accountid || to?.query?.accountid || undefined + await account.setAccountInfo(+accountNumber) } }) From cd73d6b187db7e450e857c6e21fab74957d9791b Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Fri, 6 Dec 2024 10:56:31 -0800 Subject: [PATCH 2/3] fix: issue when there are multiple accountid query params. --- src/middleware/02.setupAuth.global.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/middleware/02.setupAuth.global.ts b/src/middleware/02.setupAuth.global.ts index 7b0b8954..9396f547 100644 --- a/src/middleware/02.setupAuth.global.ts +++ b/src/middleware/02.setupAuth.global.ts @@ -35,7 +35,10 @@ export default defineNuxtRouteMiddleware(async (to) => { // set account stuff (normally would happen after kc init in 'setupAuth') const account = useBcrosAccount() await account.setUserName() - const accountNumber = to?.params?.accountid || to?.query?.accountid || undefined + let accountNumber = to?.params?.accountid || to?.query?.accountid || undefined + if(Array.isArray(accountNumber)) { + accountNumber = accountNumber[0] + } await account.setAccountInfo(+accountNumber) } }) From 9f465570f7292a77784753e93972d8beac798689 Mon Sep 17 00:00:00 2001 From: Hrvoje Fekete Date: Fri, 6 Dec 2024 11:11:04 -0800 Subject: [PATCH 3/3] fix: eslint --- src/middleware/02.setupAuth.global.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/middleware/02.setupAuth.global.ts b/src/middleware/02.setupAuth.global.ts index 9396f547..8db26fc3 100644 --- a/src/middleware/02.setupAuth.global.ts +++ b/src/middleware/02.setupAuth.global.ts @@ -36,7 +36,7 @@ export default defineNuxtRouteMiddleware(async (to) => { const account = useBcrosAccount() await account.setUserName() let accountNumber = to?.params?.accountid || to?.query?.accountid || undefined - if(Array.isArray(accountNumber)) { + if (Array.isArray(accountNumber)) { accountNumber = accountNumber[0] } await account.setAccountInfo(+accountNumber)