A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(app): forward OAuth2 sign-in when old sessions expired (#3809)
Hampusf50792ae705c
diff --git a/fluxer_app/src/features/app/domain_migration/DomainMigrationBrowser.ts b/fluxer_app/src/features/app/domain_migration/DomainMigrationBrowser.tsindex d47698227..54773cf6f 100644--- a/fluxer_app/src/features/app/domain_migration/DomainMigrationBrowser.ts+++ b/fluxer_app/src/features/app/domain_migration/DomainMigrationBrowser.ts@@ -146,6 +146,15 @@ export async function hasStoredAccount(): Promise<boolean> {return accounts.some((account) => Boolean(account.token));}+export async function hasUsableStoredAccount(): Promise<boolean> {+ if (readActiveSessionToken() !== null) {+ return true;+ }+ const {default: accountStorage} = await import('@app/features/auth/state/AccountStorage');+ const {records: accounts} = await accountStorage.getAllAccounts();+ return accounts.some((account) => Boolean(account.token) && account.isValid !== false);+}+function openInBrowser(url: string): void {window.open(url, '_blank', 'noopener');}diff --git a/fluxer_app/src/features/app/domain_migration/DomainMigrationPreMount.ts b/fluxer_app/src/features/app/domain_migration/DomainMigrationPreMount.tsindex 3904f434f..ee8e3bd3d 100644--- a/fluxer_app/src/features/app/domain_migration/DomainMigrationPreMount.ts+++ b/fluxer_app/src/features/app/domain_migration/DomainMigrationPreMount.ts@@ -2,6 +2,7 @@import {hasStoredAccount,+ hasUsableStoredAccount,loadDomainMigrationDiscovery,readActiveSessionToken,readDomainMigrationDiscovery,@@ -501,6 +502,9 @@ async function forwardFromSource(side: DomainMigrationSide): Promise<boolean> {if (shouldForwardCompletedSource(discovery, readDomainMigrationMarker(getProtectedLocalStorage()), environment)) {return forwardCompletedSource(side);}+ if (oneShotRoute) {+ return (await hasUsableStoredAccount()) ? false : navigate(buildTargetUrl(side.target, pathname, search, hash));+ }if (discovery !== null &&anonymousRolloutIsOpen(discovery) &&