fix: login loading (fireship-io#10)

* refactor: rename initial login state

* feat(shared): add `GoogleSignInCancelledFailure`

* fix(user_repository): handle google signin cancellation

* refactor: rename logOut to signOut

* fix: handle google signin cancellation

Author: narcodico

lib/app/cubit/app_cubit.dart

@@ -27,7 +27,7 @@ class AppCubit extends Cubit<AppState> {
 
   Future<void> logOut() async {
     try {
-      await _userRepository.logOut();
+      await _userRepository.signOut();
     } on AppFailure catch (failure) {
       _onAppFailed(failure);
     }

lib/app/view/app.dart

@@ -52,8 +52,8 @@ class _AppView extends StatelessWidget {
               context.showSnackBar(l10n.authFailureMessage);
               return;
             }
-            if (failure is LogOutFailure) {
-              context.showSnackBar(l10n.logOutFailureMessage);
+            if (failure is SignOutFailure) {
+              context.showSnackBar(l10n.signOutFailureMessage);
               return;
             }
             context.showSnackBar(l10n.unknownFailureMessage);

lib/l10n/arb/app_en.arb

@@ -8,8 +8,8 @@
     "@authFailureMessage": {
         "description": "`AuthFailure` message"
     },
-    "logOutFailureMessage": "There's been an error while logging out, please try again!",
-    "@logOutFailureMessage": {
+    "signOutFailureMessage": "There's been an error while logging out, please try again!",
+    "@signOutFailureMessage": {
         "description": "`LogOutFailure` message"
     },
     "anonymousSignInFailureMessage": "You can't sign in as a guest at the moment, please try again later!",

lib/login/cubit/login_cubit.dart

@@ -8,7 +8,7 @@ part 'login_state.dart';
 class LoginCubit extends Cubit<LoginState> {
   LoginCubit({required UserRepository userRepository})
       : _userRepository = userRepository,
-        super(const LoginState.pure());
+        super(const LoginState.initial());
 
   final UserRepository _userRepository;
 
@@ -25,6 +25,8 @@ class LoginCubit extends Cubit<LoginState> {
     try {
       emit(const LoginState.signingInWithGoogle());
       await _userRepository.signInWithGoogle();
+    } on GoogleSignInCancelledFailure {
+      emit(const LoginState.initial());
     } on AppFailure catch (failure) {
       _onLoginFailed(failure);
     }
@@ -41,6 +43,6 @@ class LoginCubit extends Cubit<LoginState> {
 
   void _onLoginFailed(AppFailure failure) {
     emit(LoginState.failure(failure));
-    emit(const LoginState.pure());
+    emit(const LoginState.initial());
   }
 }

lib/login/cubit/login_state.dart

@@ -1,6 +1,6 @@
 part of 'login_cubit.dart';
 
-enum LoginStatus { pure, signingIn, failure }
+enum LoginStatus { initial, signingIn, failure }
 
 extension LoginStatusExtensions on LoginStatus {
   bool get isSigningIn => this == LoginStatus.signingIn;
@@ -16,12 +16,12 @@ extension SignInMethodExtensions on SignInMethod {
 
 class LoginState extends Equatable {
   const LoginState._({
-    this.status = LoginStatus.pure,
+    this.status = LoginStatus.initial,
     this.signInMethod = SignInMethod.none,
     this.failure = AppFailure.none,
   });
 
-  const LoginState.pure() : this._();
+  const LoginState.initial() : this._();
 
   const LoginState.signingInAnonymously()
       : this._(

packages/shared/lib/src/failures.dart

@@ -2,9 +2,11 @@ class AppFailure implements Exception {
   const AppFailure._();
 
   factory AppFailure.fromAuth() => const AuthFailure();
-  factory AppFailure.fromLogOut() => const LogOutFailure();
+  factory AppFailure.fromSignOut() => const SignOutFailure();
   factory AppFailure.fromAnonymousSignIn() => const AnonymousSignInFailure();
   factory AppFailure.fromGoogleSignIn() => const GoogleSignInFailure();
+  factory AppFailure.fromGoogleSignInCancelled() =>
+      const GoogleSignInCancelledFailure();
   factory AppFailure.fromAppleSignIn() => const AppleSignInFailure();
   factory AppFailure.fromSignInWithAppleNotSupported() =>
       const AppleSignInNotSupportedFailure();
@@ -24,8 +26,8 @@ class AuthFailure extends AppFailure {
   const AuthFailure() : super._();
 }
 
-class LogOutFailure extends AppFailure {
-  const LogOutFailure() : super._();
+class SignOutFailure extends AppFailure {
+  const SignOutFailure() : super._();
 }
 
 class AnonymousSignInFailure extends AppFailure {
@@ -36,6 +38,10 @@ class GoogleSignInFailure extends AppFailure {
   const GoogleSignInFailure() : super._();
 }
 
+class GoogleSignInCancelledFailure extends AppFailure {
+  const GoogleSignInCancelledFailure() : super._();
+}
+
 class AppleSignInFailure extends AppFailure {
   const AppleSignInFailure() : super._();
 }

packages/user_repository/lib/src/firebase_user_repository.dart

@@ -44,7 +44,7 @@ class FirebaseUserRepository implements UserRepository {
     try {
       final googleSignInAccount = await _googleSignIn.signIn();
       if (googleSignInAccount == null) {
-        return;
+        throw AppFailure.fromGoogleSignInCancelled();
       }
       final googleSignInAuth = await googleSignInAccount.authentication;
 
@@ -103,11 +103,14 @@ class FirebaseUserRepository implements UserRepository {
   }
 
   @override
-  Future<void> logOut() async {
+  Future<void> signOut() async {
     try {
-      await _firebaseAuth.signOut();
-    } on FirebaseAuthException {
-      throw AppFailure.fromLogOut();
+      await Future.wait([
+        _googleSignIn.signOut(),
+        _firebaseAuth.signOut(),
+      ]);
+    } on Exception {
+      throw AppFailure.fromSignOut();
     }
   }
 

packages/user_repository/lib/src/user_repository.dart

@@ -30,7 +30,7 @@ abstract class UserRepository {
   Future<void> signInWithApple();
 
   /// Logs out the current user.
-  Future<void> logOut();
+  Future<void> signOut();
 
   /// Marks a quiz as completed.
   ///