From dc07e5661efc2c41a22e487a57ba6a8832f60614 Mon Sep 17 00:00:00 2001 From: dab246 Date: Wed, 7 Jun 2023 00:20:01 +0700 Subject: [PATCH] TF-1899 Perform invoke get stored session when no network (cherry picked from commit 3fa40218e4762ba43fb87e0af37e60360aed1cb6) --- .../presentation/session_controller.dart | 28 ++++++++++++++++--- .../presentation/session_page_bindings.dart | 4 +++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/features/session/presentation/session_controller.dart b/lib/features/session/presentation/session_controller.dart index f2cc0a415..283d4bb2e 100644 --- a/lib/features/session/presentation/session_controller.dart +++ b/lib/features/session/presentation/session_controller.dart @@ -1,3 +1,4 @@ +import 'package:core/core.dart'; import 'package:core/data/network/config/dynamic_url_interceptors.dart'; import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; @@ -13,7 +14,9 @@ import 'package:tmail_ui_user/features/login/domain/usecases/update_authenticati import 'package:tmail_ui_user/features/manage_account/domain/usecases/log_out_oidc_interactor.dart'; import 'package:tmail_ui_user/features/session/domain/extensions/session_extensions.dart'; import 'package:tmail_ui_user/features/session/domain/state/get_session_state.dart'; +import 'package:tmail_ui_user/features/session/domain/state/get_stored_session_state.dart'; import 'package:tmail_ui_user/features/session/domain/usecases/get_session_interactor.dart'; +import 'package:tmail_ui_user/features/session/domain/usecases/get_stored_session_interactor.dart'; import 'package:tmail_ui_user/main/exceptions/remote_exception.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/routes/app_routes.dart'; @@ -25,6 +28,7 @@ class SessionController extends ReloadableController { final GetSessionInteractor _getSessionInteractor; final AppToast _appToast; final DynamicUrlInterceptors _dynamicUrlInterceptors; + final GetStoredSessionInteractor _getStoredSessionInteractor; SessionController( LogoutOidcInteractor logoutOidcInteractor, @@ -34,6 +38,7 @@ class SessionController extends ReloadableController { this._getSessionInteractor, this._appToast, this._dynamicUrlInterceptors, + this._getStoredSessionInteractor, ) : super( getAuthenticatedAccountInteractor, updateAuthenticationAccountInteractor @@ -62,7 +67,17 @@ class SessionController extends ReloadableController { void handleSuccessViewState(Success success) { super.handleSuccessViewState(success); if (success is GetSessionSuccess) { - _goToMailboxDashBoard(success); + _goToMailboxDashBoard(success.session); + } else if (success is GetStoredSessionSuccess) { + _goToMailboxDashBoard(success.session); + } + } + + @override + void handleExceptionAction(Exception exception) { + super.handleExceptionAction(exception); + if (PlatformInfo.isMobile && exception is NoNetworkError) { + _handleGetStoredSession(); } } @@ -105,17 +120,22 @@ class SessionController extends ReloadableController { return sessionException is ConnectError || sessionException is BadGateway || sessionException is SocketError; } - void _goToMailboxDashBoard(GetSessionSuccess success) { - final apiUrl = success.session.getQualifiedApiUrl(baseUrl: _dynamicUrlInterceptors.jmapUrl); + void _goToMailboxDashBoard(Session session) { + final apiUrl = session.getQualifiedApiUrl(baseUrl: _dynamicUrlInterceptors.jmapUrl); log('SessionController::_goToMailboxDashBoard():apiUrl: $apiUrl'); if (apiUrl.isNotEmpty) { _dynamicUrlInterceptors.changeBaseUrl(apiUrl); pushAndPop( RouteUtils.generateNavigationRoute(AppRoutes.dashboard, NavigationRouter()), - arguments: success.session); + arguments: session); } else { logError('SessionController::_goToMailboxDashBoard(): apiUrl is NULL'); performInvokeLogoutAction(); } } + + void _handleGetStoredSession() { + log('SessionController::_handleGetStoredSession():'); + consumeState(_getStoredSessionInteractor.execute()); + } } \ No newline at end of file diff --git a/lib/features/session/presentation/session_page_bindings.dart b/lib/features/session/presentation/session_page_bindings.dart index a2ff3d886..a59b012a9 100644 --- a/lib/features/session/presentation/session_page_bindings.dart +++ b/lib/features/session/presentation/session_page_bindings.dart @@ -18,7 +18,9 @@ import 'package:tmail_ui_user/features/login/domain/usecases/get_credential_inte import 'package:tmail_ui_user/features/login/domain/usecases/get_stored_token_oidc_interactor.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/update_authentication_account_interactor.dart'; import 'package:tmail_ui_user/features/manage_account/domain/usecases/log_out_oidc_interactor.dart'; +import 'package:tmail_ui_user/features/session/domain/repository/session_repository.dart'; import 'package:tmail_ui_user/features/session/domain/usecases/get_session_interactor.dart'; +import 'package:tmail_ui_user/features/session/domain/usecases/get_stored_session_interactor.dart'; import 'package:tmail_ui_user/features/session/presentation/session_controller.dart'; import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart'; @@ -34,6 +36,7 @@ class SessionPageBindings extends BaseBindings { Get.find(), Get.find(), Get.find(), + Get.find(), )); } @@ -68,6 +71,7 @@ class SessionPageBindings extends BaseBindings { Get.find(), )); Get.lazyPut(() => UpdateAuthenticationAccountInteractor(Get.find())); + Get.lazyPut(() => GetStoredSessionInteractor(Get.find())); } @override