commit commit

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

@@ -117,6 +117,10 @@ public class AuthController extends Controller {
             userInfo.setFcm(loginRequest.getFcm());
         }
 
+        if( loginRequest.getVeryOldPassword() != null ){
+            userInfo.setPassword(loginRequest.getVeryOldPassword());
+        }
+
         userInfo.setLastLoginTime(new Date());
         userRepository.save(userInfo);
 
@@ -296,6 +300,8 @@ public class AuthController extends Controller {
                 user = userInfo;
 
             }
+
+            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
             // user exist we have to generate token also
             if (user.getPassword() == null || gotFromOld) {
@@ -311,7 +317,11 @@ public class AuthController extends Controller {
             userRepository.save(user);
             //注册成功 创建token
 
-            return authenticateUser(new LoginRequest(user.getFirebaseUid(), user.getFirebaseUid()));
+            LoginRequest loginRequest = new LoginRequest(user.getFirebaseUid(), user.getFirebaseUid());
+
+            loginRequest.setVeryOldPassword(very);
+
+            return authenticateUser(loginRequest);
 
 
         } else {

src/main/java/com/example/afrishop_v3/payload/request/LoginRequest.java

@@ -5,6 +5,7 @@ public class LoginRequest {
 	private String account;
 
 	private String password;
+	private String veryOldPassword;
 	private String fcm;
 
 
@@ -23,6 +24,14 @@ public class LoginRequest {
 		this.fcm = fcm;
 	}
 
+	public void setVeryOldPassword(String veryOldPassword) {
+		this.veryOldPassword = veryOldPassword;
+	}
+
+	public String getVeryOldPassword() {
+		return veryOldPassword;
+	}
+
 	public String getAccount() {
 		return account;
 	}