commit commit

src/main/java/com/example/afrishop_v3/controllers/AuthController.java

@@ -272,6 +272,10 @@ public class AuthController extends Controller {
                         userInfo.setFcm(user.getFcm());
                     }
 
+                    if (userInfo.getFirebaseUid() == null) {
+                        userInfo.setFirebaseUid(firebaseUid);
+                    }
+
                     String property = domainProperties.getProperty("user.avatar");
 
                     property = property == null ? "" : property;
@@ -304,9 +308,7 @@ public class AuthController extends Controller {
 
                 }
 
-                if( gotFromOld ){
-                    user.setFirebaseUid(firebaseUid);
-                }
+
 
                 String very = gotFromOld ? user.getPassword() : null;
                 // generate token codes has been moved downwards from if condition of checking if user doesn't exist in database, because even if