From 1ab03dc1e1b1d8f49bec145181ebe69073bf744d Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 29 Aug 2023 09:36:27 +0700 Subject: [PATCH] Remove NoAuthenticatedAccountFailure state unnecessary (cherry picked from commit 38b6632a4a8d2ce9478dabf1d5547ab7ef289586) --- .../base/reloadable/reloadable_controller.dart | 2 +- lib/features/home/presentation/home_controller.dart | 3 +-- .../domain/state/get_authenticated_account_state.dart | 2 -- .../usecases/get_authenticated_account_interactor.dart | 10 +--------- lib/features/login/presentation/login_controller.dart | 3 +-- .../work_manager/sending_email_worker.dart | 1 - 6 files changed, 4 insertions(+), 17 deletions(-) diff --git a/lib/features/base/reloadable/reloadable_controller.dart b/lib/features/base/reloadable/reloadable_controller.dart index c5d962a69..a08e78b97 100644 --- a/lib/features/base/reloadable/reloadable_controller.dart +++ b/lib/features/base/reloadable/reloadable_controller.dart @@ -43,7 +43,7 @@ abstract class ReloadableController extends BaseController { _handleGetSessionFailure(); } else if (failure is GetStoredTokenOidcFailure) { goToLogin(arguments: LoginArguments(LoginFormType.ssoForm)); - } else if (failure is GetAuthenticatedAccountFailure || failure is NoAuthenticatedAccountFailure) { + } else if (failure is GetAuthenticatedAccountFailure) { goToLogin(arguments: LoginArguments(LoginFormType.credentialForm)); } } diff --git a/lib/features/home/presentation/home_controller.dart b/lib/features/home/presentation/home_controller.dart index 0afa400c7..814d3fd49 100644 --- a/lib/features/home/presentation/home_controller.dart +++ b/lib/features/home/presentation/home_controller.dart @@ -122,8 +122,7 @@ class HomeController extends BaseController { @override void handleFailureViewState(Failure failure) async { super.handleFailureViewState(failure); - if (failure is NoAuthenticatedAccountFailure || - failure is GetAuthenticatedAccountFailure || + if (failure is GetAuthenticatedAccountFailure || failure is GetStoredTokenOidcFailure || failure is GetCredentialFailure) { _goToLogin(arguments: LoginArguments(LoginFormType.baseUrlForm)); diff --git a/lib/features/login/domain/state/get_authenticated_account_state.dart b/lib/features/login/domain/state/get_authenticated_account_state.dart index 9dc55aab3..89319696f 100644 --- a/lib/features/login/domain/state/get_authenticated_account_state.dart +++ b/lib/features/login/domain/state/get_authenticated_account_state.dart @@ -2,8 +2,6 @@ import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; import 'package:model/account/personal_account.dart'; -class NoAuthenticatedAccountFailure extends FeatureFailure {} - class GetAuthenticatedAccountSuccess extends UIState { final PersonalAccount account; diff --git a/lib/features/login/domain/usecases/get_authenticated_account_interactor.dart b/lib/features/login/domain/usecases/get_authenticated_account_interactor.dart index de2eab1b7..71eb479cd 100644 --- a/lib/features/login/domain/usecases/get_authenticated_account_interactor.dart +++ b/lib/features/login/domain/usecases/get_authenticated_account_interactor.dart @@ -1,9 +1,7 @@ import 'package:core/presentation/state/failure.dart'; import 'package:core/presentation/state/success.dart'; -import 'package:core/utils/app_logger.dart'; import 'package:dartz/dartz.dart'; import 'package:model/account/authentication_type.dart'; -import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart'; import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart'; import 'package:tmail_ui_user/features/login/domain/state/get_authenticated_account_state.dart'; import 'package:tmail_ui_user/features/login/domain/usecases/get_credential_interactor.dart'; @@ -24,7 +22,6 @@ class GetAuthenticatedAccountInteractor { try { yield Right(LoadingState()); final account = await _accountRepository.getCurrentAccount(); - log('GetAuthenticatedAccountInteractor::execute(): account: $account'); yield Right(GetAuthenticatedAccountSuccess(account)); if (account.authenticationType == AuthenticationType.oidc) { yield* _getStoredTokenOidcInteractor.execute(account.id); @@ -32,12 +29,7 @@ class GetAuthenticatedAccountInteractor { yield await _getCredentialInteractor.execute(); } } catch (e) { - logError('GetAuthenticatedAccountInteractor::execute(): $e'); - if (e is NotFoundAuthenticatedAccountException) { - yield Left(NoAuthenticatedAccountFailure()); - } else { - yield Left(GetAuthenticatedAccountFailure(e)); - } + yield Left(GetAuthenticatedAccountFailure(e)); } } } \ No newline at end of file diff --git a/lib/features/login/presentation/login_controller.dart b/lib/features/login/presentation/login_controller.dart index 69d42126e..0caea8a21 100644 --- a/lib/features/login/presentation/login_controller.dart +++ b/lib/features/login/presentation/login_controller.dart @@ -143,8 +143,7 @@ class LoginController extends ReloadableController { } else if (failure is CheckOIDCIsAvailableFailure || failure is GetStoredOidcConfigurationFailure || failure is GetOIDCIsAvailableFailure || - failure is GetAuthenticatedAccountFailure || - failure is NoAuthenticatedAccountFailure) { + failure is GetAuthenticatedAccountFailure) { _showFormLoginWithCredentialAction(); } } diff --git a/lib/features/offline_mode/work_manager/sending_email_worker.dart b/lib/features/offline_mode/work_manager/sending_email_worker.dart index fef80ffbe..7f75f10a9 100644 --- a/lib/features/offline_mode/work_manager/sending_email_worker.dart +++ b/lib/features/offline_mode/work_manager/sending_email_worker.dart @@ -91,7 +91,6 @@ class SendingEmailWorker extends Worker { if (failure is SendEmailFailure) { _handleSendEmailFailure(failure); } else if (failure is GetAuthenticatedAccountFailure || - failure is NoAuthenticatedAccountFailure || failure is GetSessionFailure || failure is GetStoredTokenOidcFailure || failure is GetCredentialFailure) {