Remove NoAuthenticatedAccountFailure state unnecessary
(cherry picked from commit 38b6632a4a8d2ce9478dabf1d5547ab7ef289586)
This commit is contained in:
@@ -43,7 +43,7 @@ abstract class ReloadableController extends BaseController {
|
|||||||
_handleGetSessionFailure();
|
_handleGetSessionFailure();
|
||||||
} else if (failure is GetStoredTokenOidcFailure) {
|
} else if (failure is GetStoredTokenOidcFailure) {
|
||||||
goToLogin(arguments: LoginArguments(LoginFormType.ssoForm));
|
goToLogin(arguments: LoginArguments(LoginFormType.ssoForm));
|
||||||
} else if (failure is GetAuthenticatedAccountFailure || failure is NoAuthenticatedAccountFailure) {
|
} else if (failure is GetAuthenticatedAccountFailure) {
|
||||||
goToLogin(arguments: LoginArguments(LoginFormType.credentialForm));
|
goToLogin(arguments: LoginArguments(LoginFormType.credentialForm));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -122,8 +122,7 @@ class HomeController extends BaseController {
|
|||||||
@override
|
@override
|
||||||
void handleFailureViewState(Failure failure) async {
|
void handleFailureViewState(Failure failure) async {
|
||||||
super.handleFailureViewState(failure);
|
super.handleFailureViewState(failure);
|
||||||
if (failure is NoAuthenticatedAccountFailure ||
|
if (failure is GetAuthenticatedAccountFailure ||
|
||||||
failure is GetAuthenticatedAccountFailure ||
|
|
||||||
failure is GetStoredTokenOidcFailure ||
|
failure is GetStoredTokenOidcFailure ||
|
||||||
failure is GetCredentialFailure) {
|
failure is GetCredentialFailure) {
|
||||||
_goToLogin(arguments: LoginArguments(LoginFormType.baseUrlForm));
|
_goToLogin(arguments: LoginArguments(LoginFormType.baseUrlForm));
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ import 'package:core/presentation/state/failure.dart';
|
|||||||
import 'package:core/presentation/state/success.dart';
|
import 'package:core/presentation/state/success.dart';
|
||||||
import 'package:model/account/personal_account.dart';
|
import 'package:model/account/personal_account.dart';
|
||||||
|
|
||||||
class NoAuthenticatedAccountFailure extends FeatureFailure {}
|
|
||||||
|
|
||||||
class GetAuthenticatedAccountSuccess extends UIState {
|
class GetAuthenticatedAccountSuccess extends UIState {
|
||||||
final PersonalAccount account;
|
final PersonalAccount account;
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import 'package:core/presentation/state/failure.dart';
|
import 'package:core/presentation/state/failure.dart';
|
||||||
import 'package:core/presentation/state/success.dart';
|
import 'package:core/presentation/state/success.dart';
|
||||||
import 'package:core/utils/app_logger.dart';
|
|
||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:model/account/authentication_type.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/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/state/get_authenticated_account_state.dart';
|
||||||
import 'package:tmail_ui_user/features/login/domain/usecases/get_credential_interactor.dart';
|
import 'package:tmail_ui_user/features/login/domain/usecases/get_credential_interactor.dart';
|
||||||
@@ -24,7 +22,6 @@ class GetAuthenticatedAccountInteractor {
|
|||||||
try {
|
try {
|
||||||
yield Right<Failure, Success>(LoadingState());
|
yield Right<Failure, Success>(LoadingState());
|
||||||
final account = await _accountRepository.getCurrentAccount();
|
final account = await _accountRepository.getCurrentAccount();
|
||||||
log('GetAuthenticatedAccountInteractor::execute(): account: $account');
|
|
||||||
yield Right(GetAuthenticatedAccountSuccess(account));
|
yield Right(GetAuthenticatedAccountSuccess(account));
|
||||||
if (account.authenticationType == AuthenticationType.oidc) {
|
if (account.authenticationType == AuthenticationType.oidc) {
|
||||||
yield* _getStoredTokenOidcInteractor.execute(account.id);
|
yield* _getStoredTokenOidcInteractor.execute(account.id);
|
||||||
@@ -32,12 +29,7 @@ class GetAuthenticatedAccountInteractor {
|
|||||||
yield await _getCredentialInteractor.execute();
|
yield await _getCredentialInteractor.execute();
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
logError('GetAuthenticatedAccountInteractor::execute(): $e');
|
yield Left(GetAuthenticatedAccountFailure(e));
|
||||||
if (e is NotFoundAuthenticatedAccountException) {
|
|
||||||
yield Left(NoAuthenticatedAccountFailure());
|
|
||||||
} else {
|
|
||||||
yield Left(GetAuthenticatedAccountFailure(e));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -143,8 +143,7 @@ class LoginController extends ReloadableController {
|
|||||||
} else if (failure is CheckOIDCIsAvailableFailure ||
|
} else if (failure is CheckOIDCIsAvailableFailure ||
|
||||||
failure is GetStoredOidcConfigurationFailure ||
|
failure is GetStoredOidcConfigurationFailure ||
|
||||||
failure is GetOIDCIsAvailableFailure ||
|
failure is GetOIDCIsAvailableFailure ||
|
||||||
failure is GetAuthenticatedAccountFailure ||
|
failure is GetAuthenticatedAccountFailure) {
|
||||||
failure is NoAuthenticatedAccountFailure) {
|
|
||||||
_showFormLoginWithCredentialAction();
|
_showFormLoginWithCredentialAction();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,7 +91,6 @@ class SendingEmailWorker extends Worker {
|
|||||||
if (failure is SendEmailFailure) {
|
if (failure is SendEmailFailure) {
|
||||||
_handleSendEmailFailure(failure);
|
_handleSendEmailFailure(failure);
|
||||||
} else if (failure is GetAuthenticatedAccountFailure ||
|
} else if (failure is GetAuthenticatedAccountFailure ||
|
||||||
failure is NoAuthenticatedAccountFailure ||
|
|
||||||
failure is GetSessionFailure ||
|
failure is GetSessionFailure ||
|
||||||
failure is GetStoredTokenOidcFailure ||
|
failure is GetStoredTokenOidcFailure ||
|
||||||
failure is GetCredentialFailure) {
|
failure is GetCredentialFailure) {
|
||||||
|
|||||||
Reference in New Issue
Block a user