commit

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

@@ -227,7 +227,14 @@ public class AuthController extends Controller {
 					toicouponRepository.save(toi);
 				}
 			} else {
-				user = optional.get();
+				TbCfUserInfo userInfo = optional.get();
+
+				if( user.hasFcm()  && !userInfo.hasFcm()){
+					userInfo.setFcm(user.getFcm());
+				}
+
+				user = userInfo;
+
 			}
 			// 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

src/main/java/com/example/afrishop_v3/models/TbCfUserInfo.java

@@ -227,6 +227,10 @@ public class TbCfUserInfo {
     }
 
 
+    public void setFcm(String fcm) {
+        this.fcm = fcm;
+    }
+
     public boolean hasFcm(){
         return fcm != null;
     }