commit

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

@@ -248,14 +248,24 @@ public class AuthController extends Controller {
 				if( user.getAvatar() != null && b){
 					userInfo.setAvatar(user.getAvatar());
 				}
+
 				boolean b1 = userInfo.getNick() == null || userInfo.getNick().isEmpty();
 				if( user.getNick() != null && b1){
 					userInfo.setNick(user.getNick());
 				}
 
+				if( user.getEmail() != null && isEmailValid(user.getEmail()) ){
+					userInfo.setEmail(user.getEmail());
+				}
+
+				if( user.getPhone() != null ){
+					userInfo.setPhone(user.getPhone());
+				}
+
 				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
 			if( user.getPassword() == null ){
@@ -264,6 +274,7 @@ public class AuthController extends Controller {
 
 
 
+
 			fixCode(user);
 
 			//addToNetwork(user);