OfficialDakari
/
ExteraNext
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

refactor: Improved UIA support for OIDC and SSO

This commit is contained in:
OfficialDakari 2025-11-14 18:22:46 +05:00
parent 9dbb75dada
commit c372f7d79f
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/utils/uia_request_manager.dart
View File

@ -1,9 +1,11 @@
import 'dart:async'; import 'dart:async';
import 'package:extera_next/generated/l10n/l10n.dart'; import 'package:flutter/material.dart';
import 'package:matrix/matrix.dart';
import 'package:url_launcher/url_launcher_string.dart';
import 'package:matrix/matrix.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:extera_next/generated/l10n/l10n.dart';
import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart'; import 'package:extera_next/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart';
import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart'; import 'package:extera_next/widgets/adaptive_dialogs/show_text_input_dialog.dart';
import 'package:extera_next/widgets/fluffy_chat_app.dart'; import 'package:extera_next/widgets/fluffy_chat_app.dart';
@ -34,7 +36,7 @@ extension UiaRequestManager on MatrixState {
minLines: 1, minLines: 1,
maxLines: 1, maxLines: 1,
obscureText: true, obscureText: true,
hintText: l10n.password, hintText: L10n.of(context).password,
)); ));
if (input == null || input.isEmpty) { if (input == null || input.isEmpty) {
return uiaRequest.cancel(); return uiaRequest.cancel();
@ -80,24 +82,38 @@ extension UiaRequestManager on MatrixState {
), ),
); );
default: default:
final url = Uri.parse( final stageUrl = uiaRequest.params
'${client.homeserver}/_matrix/client/r0/auth/$stage/fallback/web?session=${uiaRequest.session}', .tryGetMap<String, Object?>(stage)
?.tryGet<String>('url');
final fallbackUrl = client.homeserver!.replace(
path: '/_matrix/client/v3/auth/$stage/fallback/web',
queryParameters: {
'session': uiaRequest.session,
},
); );
launchUrlString(url.toString()); final url = stageUrl != null
if (OkCancelResult.ok == ? (Uri.tryParse(stageUrl) ?? fallbackUrl)
await showOkCancelAlertDialog( : fallbackUrl;
final consent = await showOkCancelAlertDialog(
useRootNavigator: false, useRootNavigator: false,
title: l10n.pleaseFollowInstructionsOnWeb, title: l10n.pleaseFollowInstructionsOnWeb,
context: navigatorContext, context: navigatorContext,
okLabel: l10n.next, okLabel: l10n.open,
cancelLabel: l10n.cancel, cancelLabel: l10n.cancel,
)) { );
if (consent != OkCancelResult.ok) return uiaRequest.cancel();
launchUrl(url, mode: LaunchMode.inAppBrowserView);
final completer = Completer();
final listener =
AppLifecycleListener(onResume: () => completer.complete());
await completer.future;
listener.dispose();
return uiaRequest.completeStage( return uiaRequest.completeStage(
AuthenticationData(session: uiaRequest.session), AuthenticationData(session: uiaRequest.session),
); );
} else {
return uiaRequest.cancel();
}
} }
} catch (e, s) { } catch (e, s) {
Logs().e('Error while background UIA', e, s); Logs().e('Error while background UIA', e, s);