commit

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

@@ -22,6 +22,7 @@ import com.example.afrishop_v3.util.IdUtil;
 import org.hashids.Hashids;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -72,9 +73,13 @@ public class AuthController extends Controller {
 			return new Result<>(ResultCodeEnum.VALIDATE_ERROR.getCode(),"User not found");
 		}
 
-
-		Authentication authentication = authenticationManager.authenticate(
-				new UsernamePasswordAuthenticationToken(loginRequest.getAccount(), loginRequest.getPassword()));
+		Authentication authentication;
+		try {
+			authentication = authenticationManager.authenticate(
+					new UsernamePasswordAuthenticationToken(loginRequest.getAccount(), loginRequest.getPassword()));
+		}catch (BadCredentialsException e){
+			return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Invalid username or password");
+		}
 
 		SecurityContextHolder.getContext().setAuthentication(authentication);
 		String jwt = jwtUtils.generateJwtToken(authentication);
@@ -108,15 +113,19 @@ public class AuthController extends Controller {
 //				return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Username is already taken!");
 //			}
 
-			boolean byEmail = userRepository.existsByFirebaseUid(signUpRequest.getEmail());
+			String email = signUpRequest.getEmail();
+
+			email = email == null ? "" : email.trim();
+
+			boolean byEmail = userRepository.existsByFirebaseUid(email);
 
 			if ( byEmail ) {
 				return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Email is already in use!");
 			}
 
 
-			signUpRequest.setFirebaseUid(signUpRequest.getEmail());
-			signUpRequest.setAccount(signUpRequest.getEmail());
+			signUpRequest.setFirebaseUid(email);
+			signUpRequest.setAccount(email);
 
 			signUpRequest.setUserId(IdUtil.createIdbyUUID());