commit

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

@@ -88,6 +88,11 @@ public class AuthController extends Controller {
 
 		userInfo.setToken(jwt);
 
+		if( loginRequest.getFcm() != null ){
+			userInfo.setFcm(loginRequest.getFcm());
+			userRepository.save(userInfo);
+		}
+
 		if( userInfo.hasFcm() ){
 			sendNotification(userInfo.getFcm(),"Welcome ",userInfo.display() + ", Welcome and start shopping !!!");
 		}
@@ -114,6 +119,8 @@ public class AuthController extends Controller {
 
 			signUpRequest.setUserId(IdUtil.createIdbyUUID());
 
+			fillUserNecessayInfo(signUpRequest);
+
 			String password = signUpRequest.getPassword();
 
 			signUpRequest.setPassword(encoder.encode(password));
@@ -122,7 +129,7 @@ public class AuthController extends Controller {
 			TbCfUserInfo userInfo = userRepository.save(signUpRequest);
 
 
-			return authenticateUser(new LoginRequest(userInfo.getFirebaseUid(),password));
+			return authenticateUser(new LoginRequest(userInfo.getFirebaseUid(),password,userInfo.getFcm()));
 		}
 		catch (Exception e){
 			System.out.println(e.getMessage());

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 fcm;
 
 
 	public LoginRequest(){
@@ -16,6 +17,12 @@ public class LoginRequest {
 		this.password = password;
 	}
 
+	public LoginRequest(String account,String password,String fcm){
+		this.account = account;
+		this.password = password;
+		this.fcm = fcm;
+	}
+
 	public String getAccount() {
 		return account;
 	}
@@ -28,6 +35,14 @@ public class LoginRequest {
 		return password;
 	}
 
+	public void setFcm(String fcm) {
+		this.fcm = fcm;
+	}
+
+	public String getFcm() {
+		return fcm;
+	}
+
 	public void setPassword(String password) {
 		this.password = password;
 	}