OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1895 from famedly/krille/call-logout-on-soft-logout-cancel 

fix: Call logout on soft logout fail
This commit is contained in:
Krille-chan 2024-07-31 14:06:24 +02:00 committed by GitHub
parent 9819b05e30 a771f1e3bf
commit 6dbc11180c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/src/client.dart
View File

@ -1866,7 +1866,10 @@ class Client extends MatrixApi {
Future<void> _handleSoftLogout() async { Future<void> _handleSoftLogout() async {
final onSoftLogout = this.onSoftLogout; final onSoftLogout = this.onSoftLogout;
if (onSoftLogout == null) return; if (onSoftLogout == null) {
await logout();
return;
}
_handleSoftLogoutFuture ??= () async { _handleSoftLogoutFuture ??= () async {
onLoginStateChanged.add(LoginState.softLoggedOut); onLoginStateChanged.add(LoginState.softLoggedOut);
@ -1875,7 +1878,7 @@ class Client extends MatrixApi {
onLoginStateChanged.add(LoginState.loggedIn); onLoginStateChanged.add(LoginState.loggedIn);
} catch (e, s) { } catch (e, s) {
Logs().w('Unable to refresh session after soft logout', e, s); Logs().w('Unable to refresh session after soft logout', e, s);
await clear(); await logout();
rethrow; rethrow;
} }
}(); }();
@ -1991,10 +1994,10 @@ class Client extends MatrixApi {
onSyncStatus.add(SyncStatusUpdate(SyncStatus.error, onSyncStatus.add(SyncStatusUpdate(SyncStatus.error,
error: SdkError(exception: e, stackTrace: s))); error: SdkError(exception: e, stackTrace: s)));
if (e.error == MatrixError.M_UNKNOWN_TOKEN) { if (e.error == MatrixError.M_UNKNOWN_TOKEN) {
final onSoftLogout = this.onSoftLogout; if (e.raw.tryGet<bool>('soft_logout') == true) {
if (e.raw.tryGet<bool>('soft_logout') == true && onSoftLogout != null) { Logs().w(
Logs().w('The user has been soft logged out! Try to login again...'); 'The user has been soft logged out! Calling client.onSoftLogout() if present.',
);
await _handleSoftLogout(); await _handleSoftLogout();
} else { } else {
Logs().w('The user has been logged out!'); Logs().w('The user has been logged out!');