From cca7b29a6d12cf55c05347b4c604c9969dde4683 Mon Sep 17 00:00:00 2001 From: Hugo Pointcheval Date: Fri, 29 Mar 2024 21:02:06 +0100 Subject: [PATCH] fix(authentication)!: use correct usecase and result --- .../authentication/authentication_cubit.dart | 10 +++++----- .../sign_in/blocs/sign_in_cubit.dart | 6 +++--- .../sign_up/blocs/sign_up_cubit.dart | 2 +- .../edit_account/blocs/edit_account_cubit.dart | 4 ++-- .../authentication_cache_data_source.dart | 2 +- .../authentication_session_data_source.dart | 3 +-- .../authentication_remote_data_source.dart | 3 +-- .../edit_account/cubit/edit_account_cubit.dart | 4 ++-- .../features/sign_in/cubit/sign_in_cubit.dart | 6 +++--- .../features/sign_up/cubit/sign_up_cubit.dart | 2 +- .../authentication_cubit_test.dart | 16 ++++++++-------- .../email_verification_cubit_test.dart | 18 +++++++++--------- .../password_reset_cubit_test.dart | 6 +++--- .../test/sign_in/sign_in_cubit_test.dart | 4 ++-- .../test/sign_up/sign_up_cubit_test.dart | 2 +- 15 files changed, 43 insertions(+), 45 deletions(-) diff --git a/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/authentication_cubit.dart b/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/authentication_cubit.dart index 04153f31..b7607bb4 100644 --- a/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/authentication_cubit.dart +++ b/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/authentication_cubit.dart @@ -27,34 +27,34 @@ class ExampleAuthenticationCubit extends AuthenticationCubit { Result result) async { debugPrint('onReauthenticate'); - return const Ok(1); + return Ok(1); } @override FutureOrResult onRefresh(Result result) { debugPrint('onRefresh'); - return const Ok(1); + return Ok(1); } @override FutureOrResult onSignInFromCache(AuthenticationSession session) { debugPrint('onSignInFromCache'); - return const Ok(1); + return Ok(1); } @override FutureOrResult onSignOut() { debugPrint('onSignOut'); - return const Ok(null); + return Ok(null); } @override FutureOrResult onDelete() { debugPrint('onDelete'); - return const Ok(null); + return Ok(null); } } diff --git a/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/sign_in/blocs/sign_in_cubit.dart b/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/sign_in/blocs/sign_in_cubit.dart index 0b391624..07d412e8 100644 --- a/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/sign_in/blocs/sign_in_cubit.dart +++ b/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/sign_in/blocs/sign_in_cubit.dart @@ -30,7 +30,7 @@ class ExampleSignInCubit extends SignInCubit { Result result, WyattForm form) { debugPrint('onSignInWithEmailAndPassword: ${result.ok?.accessToken}'); - return const Ok(1); + return Ok(1); } @override @@ -38,7 +38,7 @@ class ExampleSignInCubit extends SignInCubit { Result result, WyattForm form) { debugPrint('onSignInAnonymously'); - return const Ok(1); + return Ok(1); } @override @@ -46,6 +46,6 @@ class ExampleSignInCubit extends SignInCubit { Result result, WyattForm form) { debugPrint('onSignInWithGoogle'); - return const Ok(1); + return Ok(1); } } diff --git a/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/sign_up/blocs/sign_up_cubit.dart b/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/sign_up/blocs/sign_up_cubit.dart index 93c4509e..051a094f 100644 --- a/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/sign_up/blocs/sign_up_cubit.dart +++ b/packages/wyatt_authentication_bloc/example/lib/presentation/features/authentication/sign_up/blocs/sign_up_cubit.dart @@ -30,6 +30,6 @@ class ExampleSignUpCubit extends SignUpCubit { Result result, WyattForm form) async { debugPrint('onSignUpWithEmailAndPassword'); - return const Ok(1); + return Ok(1); } } diff --git a/packages/wyatt_authentication_bloc/example/lib/presentation/features/edit_account/blocs/edit_account_cubit.dart b/packages/wyatt_authentication_bloc/example/lib/presentation/features/edit_account/blocs/edit_account_cubit.dart index ae964202..cb13475f 100644 --- a/packages/wyatt_authentication_bloc/example/lib/presentation/features/edit_account/blocs/edit_account_cubit.dart +++ b/packages/wyatt_authentication_bloc/example/lib/presentation/features/edit_account/blocs/edit_account_cubit.dart @@ -28,7 +28,7 @@ class ExampleEditAccountCubit extends EditAccountCubit { Result result, WyattForm form) async { debugPrint('onEmailUpdated'); - return const Ok(1); + return Ok(1); } @override @@ -36,6 +36,6 @@ class ExampleEditAccountCubit extends EditAccountCubit { Result result, WyattForm form) async { debugPrint('onPasswordUpdated'); - return const Ok(1); + return Ok(1); } } diff --git a/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/local/authentication_cache_data_source.dart b/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/local/authentication_cache_data_source.dart index 911ec217..811c7ff4 100644 --- a/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/local/authentication_cache_data_source.dart +++ b/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/local/authentication_cache_data_source.dart @@ -20,7 +20,7 @@ import 'package:wyatt_authentication_bloc/src/domain/entities/account.dart'; /// {@template authentication_cache_data_source} /// A data source that manages the cache strategy. /// {@endtemplate} -abstract class AuthenticationCacheDataSource extends BaseLocalDataSource { +abstract class AuthenticationCacheDataSource extends BaseDataSource { /// {@macro authentication_cache_data_source} const AuthenticationCacheDataSource(); diff --git a/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/local/authentication_session_data_source.dart b/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/local/authentication_session_data_source.dart index c24d859a..24940fd7 100644 --- a/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/local/authentication_session_data_source.dart +++ b/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/local/authentication_session_data_source.dart @@ -20,8 +20,7 @@ import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; /// {@template authentication_session_data_source} /// A data source that manages the current session. /// {@endtemplate} -abstract class AuthenticationSessionDataSource - extends BaseLocalDataSource { +abstract class AuthenticationSessionDataSource extends BaseDataSource { /// {@macro authentication_session_data_source} const AuthenticationSessionDataSource(); diff --git a/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/remote/authentication_remote_data_source.dart b/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/remote/authentication_remote_data_source.dart index 8d9afab5..0d2b4a32 100644 --- a/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/remote/authentication_remote_data_source.dart +++ b/packages/wyatt_authentication_bloc/lib/src/domain/data_sources/remote/authentication_remote_data_source.dart @@ -22,8 +22,7 @@ import 'package:wyatt_authentication_bloc/src/domain/entities/account.dart'; /// It is responsible for all the external communication with the authentication /// providers. /// {@endtemplate} -abstract class AuthenticationRemoteDataSource - extends BaseRemoteDataSource { +abstract class AuthenticationRemoteDataSource extends BaseDataSource { /// {@macro authentication_remote_data_source} const AuthenticationRemoteDataSource(); diff --git a/packages/wyatt_authentication_bloc/lib/src/features/edit_account/cubit/edit_account_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/edit_account/cubit/edit_account_cubit.dart index abc378cc..f054a33d 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/edit_account/cubit/edit_account_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/edit_account/cubit/edit_account_cubit.dart @@ -43,12 +43,12 @@ class EditAccountCubit extends BaseEditAccountCubit Result result, WyattForm form, ) => - const Ok(null); + Ok(null); @override FutureOrResult onPasswordUpdated( Result result, WyattForm form, ) => - const Ok(null); + Ok(null); } diff --git a/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart index fbde339c..01e3ea8c 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart @@ -48,19 +48,19 @@ class SignInCubit extends BaseSignInCubit Result result, WyattForm form, ) => - const Ok(null); + Ok(null); @override FutureOrResult onSignInWithEmailAndPassword( Result result, WyattForm form, ) => - const Ok(null); + Ok(null); @override FutureOrResult onSignInWithGoogle( Result result, WyattForm form, ) => - const Ok(null); + Ok(null); } diff --git a/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart index 09a76667..1eb50777 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart @@ -43,5 +43,5 @@ class SignUpCubit extends BaseSignUpCubit Result result, WyattForm form, ) => - const Ok(null); + Ok(null); } diff --git a/packages/wyatt_authentication_bloc/test/authentication/authentication_cubit_test.dart b/packages/wyatt_authentication_bloc/test/authentication/authentication_cubit_test.dart index 5469c51b..a99c6878 100644 --- a/packages/wyatt_authentication_bloc/test/authentication/authentication_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/authentication/authentication_cubit_test.dart @@ -30,26 +30,26 @@ class TestAuthenticationCubit extends AuthenticationCubit { TestAuthenticationCubit({required super.authenticationRepository}); @override - FutureOrResult onDelete() async => const Ok(null); + FutureOrResult onDelete() async => Ok(null); @override FutureOrResult onReauthenticate( Result result, ) async => - const Ok(null); + Ok(null); @override FutureOrResult onRefresh(Result result) async => - const Ok(null); + Ok(null); @override FutureOrResult onSignInFromCache( AuthenticationSession session, ) async => - const Ok(null); + Ok(null); @override - FutureOrResult onSignOut() async => const Ok(null); + FutureOrResult onSignOut() async => Ok(null); } void main() { @@ -92,7 +92,7 @@ void main() { build: () => TestAuthenticationCubit( authenticationRepository: authenticationRepository, ), - seed: () => const AuthenticationState.unknown(), + seed: AuthenticationState.unknown, expect: () => [AuthenticationState.authenticated(session)], ); @@ -108,7 +108,7 @@ void main() { build: () => TestAuthenticationCubit( authenticationRepository: authenticationRepository, ), - seed: () => const AuthenticationState.unknown(), + seed: AuthenticationState.unknown, expect: () => [const AuthenticationState.unauthenticated()], ); }); @@ -119,7 +119,7 @@ void main() { setUp: () { when( () => authenticationRepository.signOut(), - ).thenAnswer((_) async => const Ok(null)); + ).thenAnswer((_) async => Ok(null)); }, build: () => TestAuthenticationCubit( authenticationRepository: authenticationRepository, diff --git a/packages/wyatt_authentication_bloc/test/email_verification/email_verification_cubit_test.dart b/packages/wyatt_authentication_bloc/test/email_verification/email_verification_cubit_test.dart index b7da3ae3..64363d00 100644 --- a/packages/wyatt_authentication_bloc/test/email_verification/email_verification_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/email_verification/email_verification_cubit_test.dart @@ -84,7 +84,7 @@ void main() { 'invokes sendEmailVerification,', setUp: () { when(() => authenticationRepository.sendEmailVerification()) - .thenAnswer((_) async => const Ok(null)); + .thenAnswer((_) async => Ok(null)); }, build: () => EmailVerificationCubit( authenticationRepository: authenticationRepository, @@ -100,12 +100,12 @@ void main() { 'emits success', setUp: () { when(() => authenticationRepository.sendEmailVerification()) - .thenAnswer((_) async => const Ok(null)); + .thenAnswer((_) async => Ok(null)); }, build: () => EmailVerificationCubit( authenticationRepository: authenticationRepository, ), - seed: () => const EmailVerificationState(), + seed: EmailVerificationState.new, act: (cubit) => cubit.sendEmailVerification(), expect: () => [ const EmailVerificationState( @@ -121,12 +121,12 @@ void main() { 'emits failure', setUp: () { when(() => authenticationRepository.sendEmailVerification()) - .thenAnswer((_) async => const Err(ServerException('erreur'))); + .thenAnswer((_) async => Err(const ServerException('erreur'))); }, build: () => EmailVerificationCubit( authenticationRepository: authenticationRepository, ), - seed: () => const EmailVerificationState(), + seed: EmailVerificationState.new, act: (cubit) => cubit.sendEmailVerification(), expect: () => [ const EmailVerificationState( @@ -183,7 +183,7 @@ void main() { build: () => EmailVerificationCubit( authenticationRepository: authenticationRepository, ), - seed: () => const EmailVerificationState(), + seed: EmailVerificationState.new, act: (cubit) => cubit.checkEmailVerification(), expect: () => [ const EmailVerificationState( @@ -206,7 +206,7 @@ void main() { build: () => EmailVerificationCubit( authenticationRepository: authenticationRepository, ), - seed: () => const EmailVerificationState(), + seed: EmailVerificationState.new, act: (cubit) => cubit.checkEmailVerification(), expect: () => [ const EmailVerificationState( @@ -222,12 +222,12 @@ void main() { 'emits failure on refresh error', setUp: () { when(() => authenticationRepository.refresh()) - .thenAnswer((_) async => const Err(ServerException('erreur'))); + .thenAnswer((_) async => Err(const ServerException('erreur'))); }, build: () => EmailVerificationCubit( authenticationRepository: authenticationRepository, ), - seed: () => const EmailVerificationState(), + seed: EmailVerificationState.new, act: (cubit) => cubit.checkEmailVerification(), expect: () => [ const EmailVerificationState( diff --git a/packages/wyatt_authentication_bloc/test/password_reset/password_reset_cubit_test.dart b/packages/wyatt_authentication_bloc/test/password_reset/password_reset_cubit_test.dart index 704a816e..f84a3d05 100644 --- a/packages/wyatt_authentication_bloc/test/password_reset/password_reset_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/password_reset/password_reset_cubit_test.dart @@ -57,7 +57,7 @@ void main() { () => authenticationRepository.sendPasswordResetEmail( email: any(named: 'email'), ), - ).thenAnswer((_) async => const Ok(null)); + ).thenAnswer((_) async => Ok(null)); when( () => authenticationRepository.formRepository, @@ -157,7 +157,7 @@ void main() { authenticationRepository: authenticationRepository, ), act: (cubit) => cubit.submit(), - expect: () => const [], + expect: () => [], ); blocTest, PasswordResetState>( @@ -272,7 +272,7 @@ void main() { () => authenticationRepository.sendPasswordResetEmail( email: any(named: 'email'), ), - ).thenAnswer((_) async => const Err(ServerException())); + ).thenAnswer((_) async => Err(const ServerException())); when( () => formRepository.accessForm(AuthFormName.passwordResetForm), ).thenAnswer( diff --git a/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart b/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart index 739f7664..f4cdaa06 100644 --- a/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart @@ -435,7 +435,7 @@ void main() { email: any(named: 'email'), password: any(named: 'password'), ), - ).thenAnswer((_) async => const Err(ServerException())); + ).thenAnswer((_) async => Err(const ServerException())); when( () => formRepository.accessForm(AuthFormName.signInForm), ).thenAnswer( @@ -615,7 +615,7 @@ void main() { setUp: () { when( () => authenticationRepository.signInAnonymously(), - ).thenAnswer((_) async => const Err(ServerException())); + ).thenAnswer((_) async => Err(const ServerException())); }, build: () => SignInCubit( authenticationRepository: authenticationRepository, diff --git a/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart b/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart index 0f266022..06f40632 100644 --- a/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart @@ -406,7 +406,7 @@ void main() { email: any(named: 'email'), password: any(named: 'password'), ), - ).thenAnswer((_) async => const Err(ServerException())); + ).thenAnswer((_) async => Err(const ServerException())); when( () => formRepository.accessForm(AuthFormName.signUpForm), ).thenAnswer(