eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use TupleKey(ObjectKey-AccountId-UserName) to store data to hive

Browse Source 
(cherry picked from commit e0ace535d5f3af71eb13598d92524caf2c6d9bbf)
This commit is contained in:
dab246
2023-04-27 11:03:39 +07:00
committed by Dat Vu
parent 7d0a5729b2
commit 876cc368b0
107 changed files with 562 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/login/data/datasource/account_datasource.dart
+3 -3
View File
@@ -1,9 +1,9 @@
import 'package:model/account/account.dart';
import 'package:model/account/personal_account.dart';
abstract class AccountDatasource {
Future<Account> getCurrentAccount();
Future<PersonalAccount> getCurrentAccount();
Future<void> setCurrentAccount(Account newCurrentAccount);
Future<void> setCurrentAccount(PersonalAccount newCurrentAccount);
Future<void> deleteCurrentAccount(String accountId);
}
lib/features/login/data/datasource/authentication_datasource.dart
+3 -1
View File
@@ -1,4 +1,6 @@
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 AuthenticationDataSource {
Future<UserProfile> authenticationUser(Uri baseUrl, UserName userName, Password password);
lib/features/login/data/datasource_impl/authentication_datasource_impl.dart
+4 -2
View File
@@ -1,4 +1,6 @@
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';
import 'package:tmail_ui_user/features/login/data/datasource/authentication_datasource.dart';
class AuthenticationDataSourceImpl extends AuthenticationDataSource {
@@ -8,7 +10,7 @@ class AuthenticationDataSourceImpl extends AuthenticationDataSource {
@override
Future<UserProfile> authenticationUser(Uri baseUrl, UserName userName, Password password) {
return Future.sync(() {
return UserProfile(userName.userName);
return UserProfile(userName.value);
});
}
}
lib/features/login/data/datasource_impl/hive_account_datasource_impl.dart
+3 -3
View File
@@ -1,4 +1,4 @@
import 'package:model/account/account.dart';
import 'package:model/account/personal_account.dart';
import 'package:tmail_ui_user/features/login/data/datasource/account_datasource.dart';
import 'package:tmail_ui_user/features/login/data/local/account_cache_manager.dart';
import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
@@ -11,14 +11,14 @@ class HiveAccountDatasourceImpl extends AccountDatasource {
HiveAccountDatasourceImpl(this._accountCacheManager, this._exceptionThrower);
@override
Future<Account> getCurrentAccount() {
Future<PersonalAccount> getCurrentAccount() {
return Future.sync(() async {
return await _accountCacheManager.getSelectedAccount();
}).catchError(_exceptionThrower.throwException);
}
@override
Future<void> setCurrentAccount(Account newCurrentAccount) {
Future<void> setCurrentAccount(PersonalAccount newCurrentAccount) {
return Future.sync(() async {
return await _accountCacheManager.setSelectedAccount(newCurrentAccount);
}).catchError(_exceptionThrower.throwException);
lib/features/login/data/extensions/account_cache_extensions.dart
+6 -5
View File
@@ -1,7 +1,8 @@
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:model/account/account.dart';
import 'package:jmap_dart_client/jmap/core/user_name.dart';
import 'package:model/account/authentication_type.dart';
import 'package:model/account/personal_account.dart';
import 'package:tmail_ui_user/features/login/data/model/account_cache.dart';
extension AccountCacheExtension on AccountCache {
@@ -15,14 +16,14 @@ extension AccountCacheExtension on AccountCache {
}
}
Account toAccount() {
PersonalAccount toAccount() {
final authenticationType = fromAuthenticationTypeString();
return Account(
return PersonalAccount(
id,
authenticationType,
isSelected: isSelected,
accountId: accountId != null ? AccountId(Id(accountId!)) : null,
apiUrl: apiUrl
);
apiUrl: apiUrl,
userName: userName != null ? UserName(userName!) : null);
}
}
lib/features/login/data/extensions/account_extensions.dart → lib/features/login/data/extensions/personal_account_extension.dart
+4 -4
View File
@@ -1,15 +1,15 @@
import 'package:model/account/account.dart';
import 'package:model/account/authentication_type.dart';
import 'package:model/account/personal_account.dart';
import 'package:tmail_ui_user/features/login/data/model/account_cache.dart';
extension AccountExtensions on Account {
extension PersonalAccountExtension on PersonalAccount {
AccountCache toCache() {
return AccountCache(
id,
authenticationType.asString(),
isSelected: isSelected,
accountId: accountId?.id.value,
apiUrl: apiUrl
);
apiUrl: apiUrl,
userName: userName?.value);
}
}
lib/features/login/data/local/account_cache_manager.dart
+4 -4
View File
@@ -1,8 +1,8 @@
import 'package:core/utils/app_logger.dart';
import 'package:model/account/account.dart';
import 'package:model/account/personal_account.dart';
import 'package:tmail_ui_user/features/caching/account_cache_client.dart';
import 'package:tmail_ui_user/features/login/data/extensions/account_cache_extensions.dart';
import 'package:tmail_ui_user/features/login/data/extensions/account_extensions.dart';
import 'package:tmail_ui_user/features/login/data/extensions/personal_account_extension.dart';
import 'package:tmail_ui_user/features/login/domain/exceptions/authentication_exception.dart';
class AccountCacheManager {
@@ -10,7 +10,7 @@ class AccountCacheManager {
AccountCacheManager(this._accountCacheClient);
Future<Account> getSelectedAccount() async {
Future<PersonalAccount> getSelectedAccount() async {
try {
final allAccounts = await _accountCacheClient.getAll();
return allAccounts.firstWhere((account) => account.isSelected)
@@ -21,7 +21,7 @@ class AccountCacheManager {
}
}
Future<void> setSelectedAccount(Account account) {
Future<void> setSelectedAccount(PersonalAccount account) {
log('AccountCacheManager::setSelectedAccount(): $_accountCacheClient');
return _accountCacheClient.insertItem(account.id, account.toCache());
}
lib/features/login/data/model/account_cache.dart
+7 -2
View File
@@ -21,13 +21,17 @@ class AccountCache extends HiveObject with EquatableMixin {
@HiveField(4)
final String? apiUrl;
@HiveField(5)
final String? userName;
AccountCache(
this.id,
this.authenticationType,
{
required this.isSelected,
this.accountId,
this.apiUrl
this.apiUrl,
this.userName
}
);
@@ -37,6 +41,7 @@ class AccountCache extends HiveObject with EquatableMixin {
authenticationType,
isSelected,
accountId,
apiUrl
apiUrl,
userName
];
}
lib/features/login/data/network/config/authorization_interceptors.dart
+4 -4
View File
@@ -3,7 +3,7 @@ import 'dart:io';
import 'package:core/utils/app_logger.dart';
import 'package:dio/dio.dart';
import 'package:model/account/account.dart';
import 'package:model/account/personal_account.dart';
import 'package:model/account/authentication_type.dart';
import 'package:model/oidc/oidc_configuration.dart';
import 'package:model/oidc/token.dart';
@@ -93,13 +93,13 @@ class AuthorizationInterceptors extends InterceptorsWrapper {
await Future.wait([
_tokenOidcCacheManager.persistOneTokenOidc(newToken),
_accountCacheManager.deleteSelectedAccount(_token!.tokenIdHash),
_accountCacheManager.setSelectedAccount(Account(
_accountCacheManager.setSelectedAccount(PersonalAccount(
newToken.tokenIdHash,
AuthenticationType.oidc,
isSelected: true,
accountId: accountCurrent.accountId,
apiUrl: accountCurrent.apiUrl
)),
apiUrl: accountCurrent.apiUrl,
userName: accountCurrent.userName))
]);
log('AuthorizationInterceptors::onError(): refreshToken: $newToken');
lib/features/login/data/repository/account_repository_impl.dart
+3 -3
View File
@@ -1,5 +1,5 @@
import 'package:core/utils/app_logger.dart';
import 'package:model/account/account.dart';
import 'package:model/account/personal_account.dart';
import 'package:tmail_ui_user/features/login/data/datasource/account_datasource.dart';
import 'package:tmail_ui_user/features/login/domain/repository/account_repository.dart';
@@ -10,12 +10,12 @@ class AccountRepositoryImpl extends AccountRepository {
AccountRepositoryImpl(this._accountDatasource);
@override
Future<Account> getCurrentAccount() {
Future<PersonalAccount> getCurrentAccount() {
return _accountDatasource.getCurrentAccount();
}
@override
Future<void> setCurrentAccount(Account newCurrentAccount) {
Future<void> setCurrentAccount(PersonalAccount newCurrentAccount) {
log('AccountRepositoryImpl::setCurrentAccount(): $newCurrentAccount');
return _accountDatasource.setCurrentAccount(newCurrentAccount);
}
lib/features/login/data/repository/authentication_repository_impl.dart
+3 -1
View File
@@ -1,4 +1,6 @@
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';
import 'package:tmail_ui_user/features/login/data/datasource/authentication_datasource.dart';
import 'package:tmail_ui_user/features/login/domain/repository/authentication_repository.dart';
lib/features/login/domain/repository/account_repository.dart
+3 -3
View File
@@ -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);
}
lib/features/login/domain/repository/authentication_repository.dart
+4 -1
View File
@@ -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);
lib/features/login/domain/state/get_authenticated_account_state.dart
+3 -5
View File
@@ -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];
lib/features/login/domain/state/get_credential_state.dart
+4 -4
View File
@@ -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];
lib/features/login/domain/usecases/authentication_user_interactor.dart
+10 -6
View File
@@ -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
))
lib/features/login/domain/usecases/get_credential_interactor.dart
+7 -5
View File
@@ -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()));
}
lib/features/login/domain/usecases/get_token_oidc_interactor.dart
+5 -5
View File
@@ -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),
]);
lib/features/login/domain/usecases/update_authentication_account_interactor.dart
+6 -4
View File
@@ -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());
lib/features/login/presentation/login_controller.dart
+1 -1
View File
@@ -10,8 +10,8 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:jmap_dart_client/jmap/core/user_name.dart';
import 'package:model/account/password.dart';
import 'package:model/account/user_name.dart';
import 'package:model/oidc/oidc_configuration.dart';
import 'package:model/oidc/request/oidc_request.dart';
import 'package:model/oidc/response/oidc_response.dart';