ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: do not close login loading dialog until user has been redirected to chat list (#2451)

Browse source
This commit is contained in:
ggurdin 2025-04-15 16:46:45 -04:00 • committed by GitHub
parent 278219b163
commit 0ab43aa7f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/pangea/login/utils/sso_login_action.dart
View file

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_web_auth_2/flutter_web_auth_2.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:universal_html/html.dart' as html;
@ -10,6 +11,7 @@ import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart';
import 'package:fluffychat/pangea/common/utils/firebase_analytics.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/fluffy_chat_app.dart';
import 'package:fluffychat/widgets/matrix.dart';
Future<void> pangeaSSOLoginAction(
@ -56,11 +58,37 @@ Future<void> pangeaSSOLoginAction(
final token = Uri.parse(result).queryParameters['loginToken'];
if (token?.isEmpty ?? false) return;
final redirect = client.onLoginStateChanged.stream
.where((state) => state == LoginState.loggedIn)
.first
.then(
(_) {
final route = FluffyChatApp.router.state.fullPath;
if (route == null || !route.contains("/rooms")) {
context.go("/rooms");
}
},
).timeout(const Duration(seconds: 30));
final loginRes = await client.login(
LoginType.mLoginToken,
token: token,
initialDeviceDisplayName: PlatformInfos.clientName,
onInitStateChanged: (state) {
if (state == InitState.settingUpEncryption) {
context.go("/rooms");
}
},
);
if (client.onLoginStateChanged.value == LoginState.loggedIn) {
final route = FluffyChatApp.router.state.fullPath;
if (route == null || !route.contains("/rooms")) {
context.go("/rooms");
}
} else {
await redirect;
}
GoogleAnalytics.login(provider.name!, loginRes.userId);
}

27
lib/pangea/user/utils/p_login.dart
View file

@ -8,6 +8,7 @@ import 'package:fluffychat/pages/login/login.dart';
import 'package:fluffychat/pangea/common/utils/firebase_analytics.dart';
import 'package:fluffychat/pangea/login/widgets/p_sso_button.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/fluffy_chat_app.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart';
import 'package:fluffychat/widgets/matrix.dart';
@ -62,7 +63,21 @@ Future<void> _loginFuture({
identifier = AuthenticationUserIdentifier(user: username);
}
final loginRes = await matrix.getLoginClient().login(
final client = matrix.getLoginClient();
final redirect = client.onLoginStateChanged.stream
.where((state) => state == LoginState.loggedIn)
.first
.then(
(_) {
final route = FluffyChatApp.router.state.fullPath;
if (route == null || !route.contains("/rooms")) {
context.go("/rooms");
}
},
).timeout(const Duration(seconds: 30));
final loginRes = await client.login(
LoginType.mLoginPassword,
identifier: identifier,
// To stay compatible with older server versions
@ -78,5 +93,15 @@ Future<void> _loginFuture({
}
},
);
if (client.onLoginStateChanged.value == LoginState.loggedIn) {
final route = FluffyChatApp.router.state.fullPath;
if (route == null || !route.contains("/rooms")) {
context.go("/rooms");
}
} else {
await redirect;
}
GoogleAnalytics.login("pangea", loginRes.userId);
}