Use TupleKey(ObjectKey-AccountId-UserName) to store data to hive
(cherry picked from commit e0ace535d5f3af71eb13598d92524caf2c6d9bbf)
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
|
||||
import 'package:model/account/account.dart';
|
||||
import 'package:model/account/personal_account.dart';
|
||||
|
||||
abstract class AccountRepository {
|
||||
Future<Account> getCurrentAccount();
|
||||
Future<PersonalAccount> getCurrentAccount();
|
||||
|
||||
Future<void> setCurrentAccount(Account newCurrentAccount);
|
||||
Future<void> setCurrentAccount(PersonalAccount newCurrentAccount);
|
||||
|
||||
Future<void> deleteCurrentAccount(String accountId);
|
||||
}
|
||||
@@ -1,4 +1,7 @@
|
||||
import 'package:model/model.dart';
|
||||
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:model/account/password.dart';
|
||||
import 'package:model/user/user_profile.dart';
|
||||
|
||||
abstract class AuthenticationRepository {
|
||||
Future<UserProfile> authenticationUser(Uri baseUrl, UserName userName, Password password);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:model/account/account.dart';
|
||||
import 'package:model/account/personal_account.dart';
|
||||
|
||||
class NoAuthenticatedAccountFailure extends FeatureFailure {
|
||||
|
||||
@@ -11,7 +11,7 @@ class NoAuthenticatedAccountFailure extends FeatureFailure {
|
||||
}
|
||||
|
||||
class GetAuthenticatedAccountSuccess extends UIState {
|
||||
final Account account;
|
||||
final PersonalAccount account;
|
||||
|
||||
GetAuthenticatedAccountSuccess(this.account);
|
||||
|
||||
@@ -20,9 +20,7 @@ class GetAuthenticatedAccountSuccess extends UIState {
|
||||
}
|
||||
|
||||
class GetAuthenticatedAccountFailure extends FeatureFailure {
|
||||
final dynamic exception;
|
||||
|
||||
GetAuthenticatedAccountFailure(this.exception);
|
||||
GetAuthenticatedAccountFailure(dynamic exception) : super(exception: exception);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [exception];
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:core/core.dart';
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:model/account/password.dart';
|
||||
import 'package:model/account/user_name.dart';
|
||||
|
||||
class GetCredentialViewState extends UIState {
|
||||
final Uri baseUrl;
|
||||
@@ -14,9 +15,8 @@ class GetCredentialViewState extends UIState {
|
||||
}
|
||||
|
||||
class GetCredentialFailure extends FeatureFailure {
|
||||
final dynamic exception;
|
||||
|
||||
GetCredentialFailure(this.exception);
|
||||
GetCredentialFailure(dynamic exception) : super(exception: exception);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [exception];
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
import 'package:core/core.dart';
|
||||
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/model.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:model/account/authentication_type.dart';
|
||||
import 'package:model/account/password.dart';
|
||||
import 'package:model/account/personal_account.dart';
|
||||
import 'package:tmail_ui_user/features/login/data/model/authentication_info_cache.dart';
|
||||
import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart';
|
||||
import 'package:tmail_ui_user/features/login/domain/repository/authentication_repository.dart';
|
||||
@@ -24,10 +29,9 @@ class AuthenticationInteractor {
|
||||
final user = await authenticationRepository.authenticationUser(baseUrl, userName, password);
|
||||
await Future.wait([
|
||||
credentialRepository.saveBaseUrl(baseUrl),
|
||||
credentialRepository.storeAuthenticationInfo(
|
||||
AuthenticationInfoCache(userName.userName, password.value)),
|
||||
_accountRepository.setCurrentAccount(Account(
|
||||
userName.userName,
|
||||
credentialRepository.storeAuthenticationInfo(AuthenticationInfoCache(userName.value, password.value)),
|
||||
_accountRepository.setCurrentAccount(PersonalAccount(
|
||||
userName.value,
|
||||
AuthenticationType.basic,
|
||||
isSelected: true
|
||||
))
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import 'dart:core';
|
||||
|
||||
import 'package:core/core.dart';
|
||||
import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:model/account/password.dart';
|
||||
import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart';
|
||||
import 'package:tmail_ui_user/features/login/domain/extensions/uri_extension.dart';
|
||||
import 'package:tmail_ui_user/features/login/domain/repository/credential_repository.dart';
|
||||
@@ -19,9 +21,9 @@ class GetCredentialInteractor {
|
||||
final authenticationInfo = await credentialRepository.getAuthenticationInfoStored();
|
||||
if (isCredentialValid(baseUrl) && authenticationInfo != null) {
|
||||
return Right(GetCredentialViewState(
|
||||
baseUrl,
|
||||
UserName(authenticationInfo.username),
|
||||
Password(authenticationInfo.password)));
|
||||
baseUrl,
|
||||
UserName(authenticationInfo.username),
|
||||
Password(authenticationInfo.password)));
|
||||
} else {
|
||||
return Left(GetCredentialFailure(BadCredentials()));
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@ 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/account.dart';
|
||||
import 'package:model/account/authentication_type.dart';
|
||||
import 'package:model/account/personal_account.dart';
|
||||
import 'package:model/oidc/oidc_configuration.dart';
|
||||
import 'package:model/oidc/token_oidc.dart';
|
||||
import 'package:tmail_ui_user/features/login/domain/extensions/oidc_configuration_extensions.dart';
|
||||
@@ -31,10 +31,10 @@ class GetTokenOIDCInteractor {
|
||||
config.scopes);
|
||||
await Future.wait([
|
||||
_credentialRepository.saveBaseUrl(baseUrl),
|
||||
_accountRepository.setCurrentAccount(Account(
|
||||
tokenOIDC.tokenIdHash,
|
||||
AuthenticationType.oidc,
|
||||
isSelected: true)),
|
||||
_accountRepository.setCurrentAccount(PersonalAccount(
|
||||
tokenOIDC.tokenIdHash,
|
||||
AuthenticationType.oidc,
|
||||
isSelected: true)),
|
||||
authenticationOIDCRepository.persistTokenOIDC(tokenOIDC),
|
||||
authenticationOIDCRepository.persistAuthorityOidc(config.authority),
|
||||
]);
|
||||
|
||||
@@ -2,7 +2,8 @@ import 'package:core/presentation/state/failure.dart';
|
||||
import 'package:core/presentation/state/success.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:model/extensions/account_extension.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:model/extensions/personal_account_extension.dart';
|
||||
import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart';
|
||||
import 'package:tmail_ui_user/features/login/domain/state/update_authentication_account_state.dart';
|
||||
|
||||
@@ -11,14 +12,15 @@ class UpdateAuthenticationAccountInteractor {
|
||||
|
||||
UpdateAuthenticationAccountInteractor(this._accountRepository);
|
||||
|
||||
Stream<Either<Failure, Success>> execute(AccountId accountId, String apiUrl) async* {
|
||||
Stream<Either<Failure, Success>> execute(AccountId accountId, String apiUrl, UserName userName) async* {
|
||||
try{
|
||||
yield Right(UpdateAuthenticationAccountLoading());
|
||||
final currentAccount = await _accountRepository.getCurrentAccount();
|
||||
await _accountRepository.setCurrentAccount(
|
||||
currentAccount.fromAccountId(
|
||||
currentAccount.fromAccount(
|
||||
accountId: accountId,
|
||||
apiUrl: apiUrl
|
||||
apiUrl: apiUrl,
|
||||
userName: userName
|
||||
)
|
||||
);
|
||||
yield Right(UpdateAuthenticationAccountSuccess());
|
||||
|
||||
Reference in New Issue
Block a user