github-mirrors/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2026-05-18 03:10:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(mobile): clear local data on forced logout (#27957)

Browse Source
This commit is contained in:
Luis Nachtigall
2026-04-21 22:52:00 +02:00
committed by GitHub
parent 70397dc5a6
commit 3dc7dc93d8
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/lib/routing/auth_guard.dart
+5 -3
View File
@@ -7,13 +7,15 @@ import 'package:immich_mobile/domain/services/store.service.dart';
import 'package:immich_mobile/entities/store.entity.dart'; import 'package:immich_mobile/entities/store.entity.dart';
import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/routing/router.dart';
import 'package:immich_mobile/services/api.service.dart'; import 'package:immich_mobile/services/api.service.dart';
import 'package:immich_mobile/services/auth.service.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:openapi/api.dart'; import 'package:openapi/api.dart';
class AuthGuard extends AutoRouteGuard { class AuthGuard extends AutoRouteGuard {
final ApiService _apiService; final ApiService _apiService;
final AuthService _authService;
final _log = Logger("AuthGuard"); final _log = Logger("AuthGuard");
AuthGuard(this._apiService); AuthGuard(this._apiService, this._authService);
@override @override
void onNavigation(NavigationResolver resolver, StackRouter router) async { void onNavigation(NavigationResolver resolver, StackRouter router) async {
resolver.next(true); resolver.next(true);
@@ -27,7 +29,7 @@ class AuthGuard extends AutoRouteGuard {
if (res == null || res.authStatus != true) { if (res == null || res.authStatus != true) {
// If the access token is invalid, take user back to login // If the access token is invalid, take user back to login
_log.fine('User token is invalid. Redirecting to login'); _log.fine('User token is invalid. Redirecting to login');
unawaited(router.replaceAll([const LoginRoute()])); unawaited(router.replaceAll([const LoginRoute()]).then((_) => _authService.clearLocalData()));
} }
} on StoreKeyNotFoundException catch (_) { } on StoreKeyNotFoundException catch (_) {
// If there is no access token, take us to the login page // If there is no access token, take us to the login page
@@ -38,7 +40,7 @@ class AuthGuard extends AutoRouteGuard {
// On an unauthorized request, take us to the login page // On an unauthorized request, take us to the login page
if (e.code == HttpStatus.unauthorized) { if (e.code == HttpStatus.unauthorized) {
_log.warning("Unauthorized access token."); _log.warning("Unauthorized access token.");
unawaited(router.replaceAll([const LoginRoute()])); unawaited(router.replaceAll([const LoginRoute()]).then((_) => _authService.clearLocalData()));
return; return;
} }
} catch (e) { } catch (e) {
mobile/lib/routing/router.dart
+4 -1
View File
@@ -73,6 +73,7 @@ import 'package:immich_mobile/routing/auth_guard.dart';
import 'package:immich_mobile/routing/duplicate_guard.dart'; import 'package:immich_mobile/routing/duplicate_guard.dart';
import 'package:immich_mobile/routing/locked_guard.dart'; import 'package:immich_mobile/routing/locked_guard.dart';
import 'package:immich_mobile/services/api.service.dart'; import 'package:immich_mobile/services/api.service.dart';
import 'package:immich_mobile/services/auth.service.dart';
import 'package:immich_mobile/services/local_auth.service.dart'; import 'package:immich_mobile/services/local_auth.service.dart';
import 'package:immich_mobile/services/secure_storage.service.dart'; import 'package:immich_mobile/services/secure_storage.service.dart';
import 'package:maplibre_gl/maplibre_gl.dart'; import 'package:maplibre_gl/maplibre_gl.dart';
@@ -82,6 +83,7 @@ part 'router.gr.dart';
final appRouterProvider = Provider( final appRouterProvider = Provider(
(ref) => AppRouter( (ref) => AppRouter(
ref.watch(apiServiceProvider), ref.watch(apiServiceProvider),
ref.watch(authServiceProvider),
ref.watch(galleryPermissionNotifier.notifier), ref.watch(galleryPermissionNotifier.notifier),
ref.watch(secureStorageServiceProvider), ref.watch(secureStorageServiceProvider),
ref.watch(localAuthServiceProvider), ref.watch(localAuthServiceProvider),
@@ -96,11 +98,12 @@ class AppRouter extends RootStackRouter {
AppRouter( AppRouter(
ApiService apiService, ApiService apiService,
AuthService authService,
GalleryPermissionNotifier galleryPermissionNotifier, GalleryPermissionNotifier galleryPermissionNotifier,
SecureStorageService secureStorageService, SecureStorageService secureStorageService,
LocalAuthService localAuthService, LocalAuthService localAuthService,
) { ) {
_authGuard = AuthGuard(apiService); _authGuard = AuthGuard(apiService, authService);
_duplicateGuard = const DuplicateGuard(); _duplicateGuard = const DuplicateGuard();
_lockedGuard = LockedGuard(apiService, secureStorageService, localAuthService); _lockedGuard = LockedGuard(apiService, secureStorageService, localAuthService);
} }