commit commit

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

@@ -226,6 +226,7 @@ public class AuthController extends Controller {
         // Check if firebase token is valid
         boolean isTokenValid = user.getToken() != null && validateFirebaseToken(user.getToken());
 
+        boolean gotFromOld = false;
 
         // if valid do sign in if firebase Uid exist in database or register as new user
         if (isTokenValid) {
@@ -234,10 +235,12 @@ public class AuthController extends Controller {
 
             if ( !optional.isPresent() && user.getEmail() != null && !user.getEmail().isEmpty() && userRepository.existsByAccount(user.getEmail())) {
                 optional = userRepository.findFirstByAccount(user.getEmail());
+                gotFromOld = optional.isPresent();
             }
 
             if ( !optional.isPresent() && user.getPhone() != null && !user.getPhone().isEmpty() && userRepository.existsByAccount(user.getPhone().replace("+",""))) {
                 optional = userRepository.findFirstByAccount(user.getPhone().replace("+",""));
+                gotFromOld = optional.isPresent();
             }
 
             if (!optional.isPresent()) {
@@ -294,7 +297,7 @@ public class AuthController extends Controller {
             }
             // generate token codes has been moved downwards from if condition of checking if user doesn't exist in database, because even if
             // user exist we have to generate token also
-            if (user.getPassword() == null) {
+            if (user.getPassword() == null || gotFromOld) {
                 user.setPassword(encoder.encode(user.getFirebaseUid()));// Assign user from database to the user we have to return back to request
             }