From 77285ddc54c3d840aae08007f3c7d2fbc580c6ba Mon Sep 17 00:00:00 2001 From: Rupato Braganza Date: Mon, 17 Feb 2025 17:41:34 +0800 Subject: [PATCH 1/2] fix: silent login --- src/app/App.tsx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/app/App.tsx b/src/app/App.tsx index 44ec9cef..2e651205 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -74,11 +74,18 @@ function App() { const cookie_accounts = Cookies.get('client.accounts') || '{}'; const stored_accounts = JSON.parse(localStorage.getItem('clientAccounts') || '{}'); - Object.values(JSON.parse(cookie_accounts)).forEach(data => { - const account_data = data as { loginid: string; token: string }; - const loginid = account_data.loginid; - accounts_list[loginid] = account_data.token; - }); + if (Array.isArray(cookie_accounts)) { + cookie_accounts.forEach(data => { + const loginid = data.loginid; + console.log('loginid test', data.loginid); + accounts_list[loginid] = data.token; + }); + + console.log('loginid test cookie_accounts accounts_list', cookie_accounts, accounts_list); + localStorage.setItem('accountsList', accounts_list); + } else { + console.error('Invalid cookie_accounts format'); + } const client_accounts = { ...stored_accounts, From df901338d1c64e2c41640affd56fffee2fae08d9 Mon Sep 17 00:00:00 2001 From: Rupato Braganza Date: Mon, 17 Feb 2025 17:43:41 +0800 Subject: [PATCH 2/2] fix: silent login --- src/app/App.tsx | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/app/App.tsx b/src/app/App.tsx index 2e651205..692bd4b3 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -74,19 +74,15 @@ function App() { const cookie_accounts = Cookies.get('client.accounts') || '{}'; const stored_accounts = JSON.parse(localStorage.getItem('clientAccounts') || '{}'); - if (Array.isArray(cookie_accounts)) { - cookie_accounts.forEach(data => { - const loginid = data.loginid; - console.log('loginid test', data.loginid); - accounts_list[loginid] = data.token; - }); - - console.log('loginid test cookie_accounts accounts_list', cookie_accounts, accounts_list); - localStorage.setItem('accountsList', accounts_list); - } else { - console.error('Invalid cookie_accounts format'); - } + Object.values(JSON.parse(cookie_accounts)).forEach(data => { + const account_data = data as { loginid: string; token: string }; + const loginid = account_data.loginid; + accounts_list[loginid] = account_data.token; + }); + if (accounts_list) { + localStorage.setItem('accountsList', JSON.stringify(accounts_list)); + } const client_accounts = { ...stored_accounts, ...JSON.parse(cookie_accounts), @@ -99,6 +95,7 @@ function App() { active_loginid_cookie: Cookies.get('active_loginid') || '{}', active_loginid_local_storage: localStorage.getItem('active_loginid'), }); + if (client_accounts) { localStorage.setItem('clientAccounts', JSON.stringify(client_accounts)); }