commit

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

@@ -191,11 +191,17 @@ public class AuthController extends Controller {
 					userInfo.setFcm(user.getFcm());
 				}
 
-				if( user.getAvatar() != null ){
+				String property = domainProperties.getProperty("user.avatar");
+
+				property = property == null ? "" : property;
+
+				boolean b = property.equals(userInfo.getAvatar()) || userInfo.getAvatar() == null || userInfo.getAvatar().isEmpty();
+
+				if( user.getAvatar() != null && b){
 					userInfo.setAvatar(user.getAvatar());
 				}
-
-				if( user.getNick() != null){
+				boolean b1 = userInfo.getNick() == null || userInfo.getNick().isEmpty();
+				if( user.getNick() != null && b1){
 					userInfo.setNick(user.getNick());
 				}