Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(app): accept old official hosts in sign-in and OAuth2 (#3807)

Hampuse83c86ea03fe
diff --git a/fluxer_app/src/features/app/domain_migration/DomainMigrationCore.ts b/fluxer_app/src/features/app/domain_migration/DomainMigrationCore.ts
index 067b31b1a..7ee336d78 100644
--- a/fluxer_app/src/features/app/domain_migration/DomainMigrationCore.ts
+++ b/fluxer_app/src/features/app/domain_migration/DomainMigrationCore.ts
@@ -118,6 +118,10 @@ export function isDomainMigrationOneShotRoute(pathname: string): boolean {
return ONE_SHOT_ROUTE_PREFIXES.some((prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`));
}
+export function isForwardableOneShotRoute(pathname: string): boolean {
+ return pathname === '/oauth2/authorize' || pathname.startsWith('/oauth2/authorize/');
+}
+
export function buildTargetUrl(target: string, pathname: string, search: string, hash: string): string {
return `${target}${sanitizeNextPath(`${pathname}${search}${hash}`)}`;
}
diff --git a/fluxer_app/src/features/app/domain_migration/DomainMigrationPreMount.ts b/fluxer_app/src/features/app/domain_migration/DomainMigrationPreMount.ts
index 972308a8f..3904f434f 100644
--- a/fluxer_app/src/features/app/domain_migration/DomainMigrationPreMount.ts
+++ b/fluxer_app/src/features/app/domain_migration/DomainMigrationPreMount.ts
@@ -37,6 +37,7 @@ import {
isCompletedDomainMigrationMarker,
isDomainMigrationOneShotRoute,
isExportableLocalStorageKey,
+ isForwardableOneShotRoute,
keepValidTargetSession,
markDomainMigrationCompleted,
markDomainMigrationFailed,
@@ -485,10 +486,11 @@ async function startEnrolledSource(side: DomainMigrationSide): Promise<boolean>
async function forwardFromSource(side: DomainMigrationSide): Promise<boolean> {
const {pathname, search, hash} = readCurrentPath();
- if (isDomainMigrationOneShotRoute(pathname)) {
+ const oneShotRoute = isDomainMigrationOneShotRoute(pathname);
+ if (oneShotRoute && !isForwardableOneShotRoute(pathname)) {
return false;
}
- if (await startEnrolledSource(side)) {
+ if (!oneShotRoute && (await startEnrolledSource(side))) {
return true;
}
const environment = readDomainMigrationEnvironment();
diff --git a/fluxer_app/src/features/auth/flow/auth_login_core/useDesktopHandoffFlow.ts b/fluxer_app/src/features/auth/flow/auth_login_core/useDesktopHandoffFlow.ts
index c67f995d7..6f9b6138b 100644
--- a/fluxer_app/src/features/auth/flow/auth_login_core/useDesktopHandoffFlow.ts
+++ b/fluxer_app/src/features/auth/flow/auth_login_core/useDesktopHandoffFlow.ts
@@ -11,6 +11,7 @@ import type {UserData} from '@app/features/auth/state/AccountStorageContract';
import {type InstanceHTTPTarget, instanceTargetFromSnapshot} from '@app/features/platform/transport/InstanceHTTP';
import {Logger} from '@app/features/platform/utils/AppLogger';
import * as FormUtils from '@app/lib/forms';
+import {officialClientApiEndpointForAlias} from '@fluxer/instance_bootstrap/src/OfficialInstance';
import type {DesktopHandoffReturnMethod} from '@fluxer/schema/src/domains/auth/AuthSchemas';
import {formatDesktopHandoffCode, parseDesktopHandoffCode} from '@fluxer/schema/src/domains/auth/DesktopHandoffCode';
import {msg} from '@lingui/core/macro';
@@ -79,6 +80,12 @@ function hostOf(endpoint: string): string {
}
}
+function isSameInstanceOrigin(left: string, right: string): boolean {
+ if (left === right) return true;
+ const official = officialClientApiEndpointForAlias(`${left}/api`);
+ return official !== null && official === officialClientApiEndpointForAlias(`${right}/api`);
+}
+
function matchesIdentifier(identifier: string, userData: UserData): boolean {
const wanted = identifier.trim().toLowerCase();
return wanted === userData.username.toLowerCase() || wanted === userData.email?.toLowerCase();
@@ -177,7 +184,11 @@ export function useDesktopHandoffFlow({enabled, hasStoredAccounts, initialMode}:
setReturnMethod(null);
setReturnUrl(null);
const accountOrigin = originOf(runtimeSnapshot.apiEndpoint);
- if (request.apiOrigin != null && accountOrigin != null && request.apiOrigin !== accountOrigin) {
+ if (
+ request.apiOrigin != null &&
+ accountOrigin != null &&
+ !isSameInstanceOrigin(request.apiOrigin, accountOrigin)
+ ) {
failWith(
i18n._(INSTANCE_MISMATCH_DESCRIPTOR, {
accountHost: hostOf(accountOrigin),