GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-03-01 13:00:41 +01:00
Code Issues Projects Releases Wiki Activity

refactor: UIA registering

Browse Source
This commit is contained in:
Christian Pauly 2021-05-13 11:10:05 +02:00
parent 6c876ab2ac
commit 48bf1169bc
2 changed files with 10 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/views/sign_up_password.dart
View File

@ -1,4 +1,3 @@
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:adaptive_page_layout/adaptive_page_layout.dart';
import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/famedlysdk.dart';
@ -7,7 +6,6 @@ import 'package:fluffychat/views/ui/sign_up_password_ui.dart';
import 'package:fluffychat/views/widgets/matrix.dart'; import 'package:fluffychat/views/widgets/matrix.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:url_launcher/url_launcher.dart';
import '../utils/platform_infos.dart'; import '../utils/platform_infos.dart';
class SignUpPassword extends StatefulWidget { class SignUpPassword extends StatefulWidget {
@ -22,13 +20,12 @@ class SignUpPassword extends StatefulWidget {
class SignUpPasswordController extends State<SignUpPassword> { class SignUpPasswordController extends State<SignUpPassword> {
final TextEditingController passwordController = TextEditingController(); final TextEditingController passwordController = TextEditingController();
String passwordError; String passwordError;
String _lastAuthWebViewStage;
bool loading = false; bool loading = false;
bool showPassword = true; bool showPassword = true;
void toggleShowPassword() => setState(() => showPassword = !showPassword); void toggleShowPassword() => setState(() => showPassword = !showPassword);
void signUpAction({AuthenticationData auth}) async { void signUpAction() async {
final matrix = Matrix.of(context); final matrix = Matrix.of(context);
if (passwordController.text.isEmpty) { if (passwordController.text.isEmpty) {
setState(() => passwordError = L10n.of(context).pleaseEnterYourPassword); setState(() => passwordError = L10n.of(context).pleaseEnterYourPassword);
@ -43,65 +40,13 @@ class SignUpPasswordController extends State<SignUpPassword> {
try { try {
setState(() => loading = true); setState(() => loading = true);
final waitForLogin = matrix.client.onLoginStateChanged.stream.first; final waitForLogin = matrix.client.onLoginStateChanged.stream.first;
await matrix.client.register( await matrix.client.uiaRequestBackground((auth) => matrix.client.register(
username: widget.username, username: widget.username,
password: passwordController.text, password: passwordController.text,
initialDeviceDisplayName: PlatformInfos.clientName, initialDeviceDisplayName: PlatformInfos.clientName,
auth: auth, auth: auth,
); ));
await waitForLogin; await waitForLogin;
} on MatrixException catch (exception) {
if (exception.requireAdditionalAuthentication) {
final stages = exception.authenticationFlows.first.stages;
final currentStage = exception.completedAuthenticationFlows == null
? stages.first
: stages.firstWhere((stage) =>
!exception.completedAuthenticationFlows.contains(stage) ??
true);
if (currentStage == 'm.login.dummy') {
signUpAction(
auth: AuthenticationData(
type: currentStage,
session: exception.session,
),
);
} else {
if (_lastAuthWebViewStage == currentStage) {
_lastAuthWebViewStage = null;
setState(
() => passwordError = L10n.of(context).oopsSomethingWentWrong);
return setState(() => loading = false);
}
_lastAuthWebViewStage = currentStage;
await launch(
Matrix.of(context).client.homeserver.toString() +
'/_matrix/client/r0/auth/$currentStage/fallback/web?session=${exception.session}',
);
if (OkCancelResult.ok ==
await showOkCancelAlertDialog(
message: L10n.of(context).pleaseFollowInstructionsOnWeb,
context: context,
okLabel: L10n.of(context).next,
cancelLabel: L10n.of(context).cancel,
useRootNavigator: false,
)) {
signUpAction(
auth: AuthenticationData(session: exception.session),
);
} else {
setState(() {
loading = false;
passwordError = null;
});
}
return;
}
} else {
setState(() => passwordError = exception.errorMessage);
return setState(() => loading = false);
}
} catch (exception) { } catch (exception) {
setState(() => passwordError = exception.toString()); setState(() => passwordError = exception.toString());
return setState(() => loading = false); return setState(() => loading = false);

4
lib/views/widgets/matrix.dart
View File

@ -155,7 +155,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
); );
default: default:
await launch( await launch(
Matrix.of(context).client.homeserver.toString() + client.homeserver.toString() +
'/_matrix/client/r0/auth/$stage/fallback/web?session=${uiaRequest.session}', '/_matrix/client/r0/auth/$stage/fallback/web?session=${uiaRequest.session}',
); );
if (OkCancelResult.ok == if (OkCancelResult.ok ==
@ -169,6 +169,8 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
return uiaRequest.completeStage( return uiaRequest.completeStage(
AuthenticationData(session: uiaRequest.session), AuthenticationData(session: uiaRequest.session),
); );
} else {
return uiaRequest.cancel();
} }
} }
} }