refactor auth service and auth cubit logic

Author: amaury901130

app/lib/presentation/ui/pages/home/home_view.dart

@@ -1,10 +1,12 @@
 import 'package:app/main/init.dart';
-import 'package:domain/services/auth_service.dart';
+import 'package:domain/bloc/auth/auth_cubit.dart';
 import 'package:flutter/material.dart';
 import 'package:app/presentation/ui/custom/app_theme_switch.dart';
 
 class HomeView extends StatelessWidget {
-  AuthService get _authService => getIt();
+  /// Given this is a global cubit, we can access it directly from getIt
+  /// other wise use context.read<AuthCubit>() to read the Cubit under that context
+  AuthCubit get _authCubit => getIt();
 
   const HomeView({super.key});
 
@@ -14,7 +16,7 @@ class HomeView extends StatelessWidget {
       appBar: AppBar(
         actions: [
           IconButton(
-            onPressed: () => _authService.onLogout(),
+            onPressed: () => _authCubit.logOut(),
             icon: const Icon(Icons.logout),
           ),
           const AppThemeSwitch(),

app/lib/presentation/ui/pages/login/login_page.dart

@@ -5,18 +5,17 @@ import 'package:app/presentation/ui/custom/app_theme_switch.dart';
 import 'package:app/presentation/ui/custom/loading_screen.dart';
 import 'package:common/core/resource.dart';
 import 'package:domain/bloc/auth/auth_cubit.dart';
-import 'package:domain/services/auth_service.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 import '../../custom/environment_selector.dart';
 
 class LoginPage extends StatelessWidget {
-  AuthService get _authService => getIt();
-
   const LoginPage({super.key});
 
+  AuthCubit get _authCubit => getIt();
+
   @override
   Widget build(BuildContext context) {
     return Stack(
@@ -29,14 +28,15 @@ class LoginPage extends StatelessWidget {
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
+                const _Loading(),
                 const AppThemeSwitch(),
                 SizedBox(height: spacing.m),
                 SizedBox(
                   width: double.maxFinite,
                   child: ElevatedButton(
                     child: const Text('Login'),
                     onPressed: () {
-                      _authService.logInWithCredentials(
+                      _authCubit.login(
                         'Rootstrap',
                         '12345678',
                       );
@@ -51,7 +51,6 @@ class LoginPage extends StatelessWidget {
             ),
           ),
         ),
-        const _Loading(),
       ],
     );
   }

app/lib/presentation/ui/pages/splash/splash_page.dart

@@ -1,5 +1,5 @@
 import 'package:app/main/init.dart';
-import 'package:domain/services/auth_service.dart';
+import 'package:domain/bloc/auth/auth_cubit.dart';
 import 'package:flutter/material.dart';
 
 class SplashPage extends StatefulWidget {
@@ -10,12 +10,19 @@ class SplashPage extends StatefulWidget {
 }
 
 class _SplashPageState extends State<SplashPage> {
-  AuthService get _authService => getIt();
+  /// Given this is a global cubit, we can access it directly from getIt
+  /// other wise use context.read<AuthCubit>() to read the Cubit under that context
+  AuthCubit get _authCubit => getIt();
 
   @override
   void initState() {
     super.initState();
-    _authService.onValidate();
+
+    /// Add post frame callback to avoid calling bloc methods during build
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      await Future.delayed(const Duration(seconds: 1));
+      _authCubit.onValidate();
+    });
   }
 
   @override

app/melos.yaml

@@ -5,6 +5,9 @@ packages:
   - modules/*
 
 scripts:
+  run:web:
+    exec: cd app && flutter run -t lib/main.dart --dart-define-from-file=env/.dev -d chrome
+    description: Run the app in development mode for web.
   lint:all:
     run: melos run analyze && melos run format
     description: Run all static analysis checks.

modules/domain/lib/bloc/auth/auth_cubit.dart

@@ -1,9 +1,39 @@
 import 'package:common/core/resource.dart';
+import 'package:common/core/result_type.dart';
 import 'package:domain/bloc/base_cubit.dart';
 import 'package:domain/bloc/auth/auth_state.dart';
+import 'package:domain/services/auth_service.dart';
 
 class AuthCubit extends BaseCubit<AuthState> {
-  AuthCubit() : super(RSuccess(data: AuthStateUnknown()));
+  final AuthService _authService;
+  AuthCubit(this._authService) : super(RSuccess(data: AuthStateUnknown()));
+
+  Future login(String username, String password) async {
+    isLoading();
+    final authResult =
+        await _authService.logInWithCredentials(username, password);
+
+    authResult.map(
+      success: (_) => isLogin(),
+      error: (failure) {
+        isError(failure);
+        return failure;
+      },
+    );
+  }
+
+  Future<void> onValidate() async {
+    if (_authService.isLoggedIn()) {
+      isLogin();
+    } else {
+      isLogOut();
+    }
+  }
+
+  Future<void> logOut() async {
+    await _authService.onLogout();
+    isLogOut();
+  }
 
   void isLogin() => isSuccess(AuthStateAuthenticated());
 

modules/domain/lib/init.dart

@@ -5,11 +5,11 @@ import 'package:get_it/get_it.dart';
 
 class DomainInit {
   static Future<void> initialize(GetIt getIt) async {
-    //Cubits
+    //Services (with dependencies to repositories)
+    getIt.registerLazySingleton(() => AuthService(getIt()));
+    
+    //Global Cubits
     getIt.registerSingleton(AppCubit(getIt()));
-    getIt.registerSingleton(AuthCubit());
-
-    //Services
-    getIt.registerLazySingleton(() => AuthService(getIt(), getIt()));
+    getIt.registerSingleton(AuthCubit(getIt()));
   }
 }

modules/domain/lib/services/auth_service.dart

@@ -1,34 +1,18 @@
 import 'package:common/core/result_type.dart';
-import 'package:domain/bloc/auth/auth_cubit.dart';
 import 'package:domain/repositories/auth_repository.dart';
 
 class AuthService {
   final AuthRepository _authRepository;
-  final AuthCubit _sessionCubit;
 
-  AuthService(this._authRepository, this._sessionCubit);
+  AuthService(this._authRepository);
 
-  Future<void> logInWithCredentials(String username, String password) async {
-    _sessionCubit.isLoading();
-    final result = await _authRepository.login(username, password);
-    switch (result) {
-      case TSuccess<void> _:
-        _sessionCubit.isLogin();
-      case TError<void> _:
-        _sessionCubit.isError(result.error);
-    }
-  }
+  Future<ResultType<void>> logInWithCredentials(
+          String username, String password) =>
+      _authRepository.login(username, password);
 
-  void onValidate() {
-    if (_authRepository.isLoggedIn()) {
-      _sessionCubit.isLogin();
-    } else {
-      _sessionCubit.isLogOut();
-    }
-  }
+  bool isLoggedIn() => _authRepository.isLoggedIn();
 
   Future<void> onLogout() async {
     await _authRepository.logout();
-    _sessionCubit.isLogOut();
   }
 }