fix : Fixed username logic and added logging

Author: gmbcode

lib/features/auth/data/firebase_auth_repo.dart

@@ -67,12 +67,6 @@ class FirebaseAuthRepo implements AuthRepo {
       UserCredential userCredential = await firebaseAuth
           .createUserWithEmailAndPassword(email: email, password: password);
 
-      //data saved to firestore
-      await userRepo.saveUserData(
-        userCredential.user!.uid,
-        email,
-        name,
-      );
 
       //create user
       AppUser user = AppUser(
@@ -135,7 +129,7 @@ class FirebaseAuthRepo implements AuthRepo {
 
     //get username from userrepo
     try {
-      final username = await userRepo.getUserUsername(firebaseUser.uid);
+      final username = await userRepo.getUserUsername(firebaseUser.uid) ;
 
       return AppUser(
         uid: firebaseUser.uid,

lib/features/auth/data/firebase_user_repo.dart

@@ -4,7 +4,6 @@ import 'package:cloud_firestore/cloud_firestore.dart';
 class FirebaseUserRepo implements UserRepo {
   final FirebaseFirestore _firestore = FirebaseFirestore.instance;
 
-
   //save user data
   @override
   Future<void> saveUserData(String uid, String email, String username) async {
@@ -62,4 +61,13 @@ class FirebaseUserRepo implements UserRepo {
       throw Exception('Failed to delete user data: $e');
     }
   }
+  @override
+  Future<bool> checkIfUserExists(String uid) async{
+    try {
+      DocumentSnapshot s = await _firestore.collection('users').doc(uid).get();
+      return s.exists;
+    } catch (e) {
+      throw Exception('Failed to check if user exists: $e');
+    }
+  }
 }

lib/features/auth/domain/repos/user_repo.dart

@@ -4,4 +4,5 @@ abstract class UserRepo {
   Future<Map<String, dynamic>?> getUserData(String uid);
   Future<void> updateUsername(String uid, String newUsername);
   Future<void> deleteUserData(String uid);
+  Future<bool> checkIfUserExists(String uid);
 }

lib/features/auth/presentation/cubits/auth_cubit.dart

@@ -2,14 +2,17 @@
 
 import 'package:azt/features/auth/domain/entities/app_user.dart';
 import 'package:azt/features/auth/domain/repos/auth_repo.dart';
+import 'package:azt/features/auth/domain/repos/user_repo.dart';
 import 'package:azt/features/auth/presentation/cubits/auth_states.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-
+import 'package:logger/logger.dart';
 class AuthCubit extends Cubit<AuthState>{
   final AuthRepo authRepo;
+  final UserRepo userRepo;
+  final logger = Logger();
   AppUser? _currentUser;
-
-  AuthCubit({required this.authRepo}) : super(AuthInitial());
+  String? _pendingUserName;
+  AuthCubit({required this.authRepo,required this.userRepo}) : super(AuthInitial());
 
   //get current user
   AppUser? get currentUser => _currentUser;
@@ -25,6 +28,16 @@ class AuthCubit extends Cubit<AuthState>{
     if (user!= null){
       _currentUser = user;
         if (user.emailVerified){
+          bool status = await userRepo.checkIfUserExists(user.uid);
+          logger.d("Current status is $status\n from checkAuth()");
+          if(!status){//If user does not exist on CFS then create user
+            
+            userRepo.saveUserData(
+            user.uid,
+            user.email,
+            user.name,
+            );
+          }
           emit(Authenticated(user));
         }
         else{
@@ -67,6 +80,7 @@ class AuthCubit extends Cubit<AuthState>{
       authRepo.sendEmailVerification();
       if (user != null){
         _currentUser = user;
+        _pendingUserName = name;
         if(user.emailVerified){
         emit(Authenticated(user));
         }
@@ -160,6 +174,21 @@ Future<void> checkEmailVerification() async {
       final updatedUser = await authRepo.getCurrentUser();
 
       if (updatedUser?.emailVerified ?? false) {
+        bool status = await userRepo.checkIfUserExists(updatedUser!.uid);
+        if(!status){
+            logger.d("Creating user in Firestore after email verification from checkEmailVerification:authCubit");
+            final userName = _pendingUserName ?? updatedUser.name;
+            await userRepo.saveUserData(
+              user.uid,
+              user.email,
+              userName,
+            );
+            _pendingUserName = null;
+            logger.d("Firestore user created successfully");
+        } 
+        else {
+            logger.d("User already exists in Firestore");
+        }
         emit(Authenticated(updatedUser!));
       } else {
         emit(EmailNotVerified(updatedUser!));

lib/main.dart

@@ -42,7 +42,7 @@ class MyApp extends StatelessWidget {
       //auth cubit
       BlocProvider<AuthCubit>(
         create: (context)=>
-         AuthCubit(authRepo: firebaseAuthRepo)..checkAuth()      //calls checkauth function to check if authenticated
+         AuthCubit(authRepo: firebaseAuthRepo,userRepo: firebaseUserRepo)..checkAuth()      //calls checkauth function to check if authenticated
       ),
     ],
 

pubspec.lock

@@ -272,6 +272,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.1.1"
+  logger:
+    dependency: "direct main"
+    description:
+      name: logger
+      sha256: a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.2"
   matcher:
     dependency: transitive
     description:

pubspec.yaml

@@ -40,6 +40,7 @@ dependencies:
   google_sign_in: ^7.2.0
   google_sign_in_web: ^1.1.0
   cloud_firestore: ^6.1.0
+  logger: ^2.6.2
 
 dev_dependencies:
   flutter_test: