commit

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

@@ -96,32 +96,32 @@ public class AuthController extends Controller {
 	}
 
 	@PostMapping("/signup")
-	public ResponseEntity<?> registerUser( @RequestBody TbCfUserInfo signUpRequest) {
+	public Result<?> registerUser( @RequestBody TbCfUserInfo signUpRequest) {
 		Optional<TbCfUserInfo> byAccount = userRepository.findByAccount(signUpRequest.getAccount());
 		if ( byAccount.isPresent() ) {
-			return ResponseEntity
-					.badRequest()
-					.body(new MessageResponse("Error: Username is already taken!"));
+			return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Username is already taken!");
 		}
 
-		Optional<TbCfUserInfo> byEmail = userRepository.findFirstByEmail(signUpRequest.getEmail());
+		Optional<TbCfUserInfo> byEmail = userRepository.findByFirebaseUid(signUpRequest.getEmail());
 
 		if ( byEmail.isPresent() ) {
-			return ResponseEntity
-					.badRequest()
-					.body(new MessageResponse("Error: Email is already in use!"));
+			return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Email is already in use!");
 		}
 
 
+		signUpRequest.setFirebaseUid(signUpRequest.getEmail());
+
 		signUpRequest.setUserId(IdUtil.createIdbyUUID());
 
-		signUpRequest.setPassword(encoder.encode(signUpRequest.getPassword()));
+		String password = signUpRequest.getPassword();
+
+		signUpRequest.setPassword(encoder.encode(password));
 
 
 		TbCfUserInfo userInfo = userRepository.save(signUpRequest);
 
 
-		return ResponseEntity.ok(new Result<>(userInfo,"User createdSuccessfully"));
+		return authenticateUser(new LoginRequest(userInfo.getFirebaseUid(),password));
 	}
 
 

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

@@ -128,6 +128,7 @@ public class TbCfUserInfo {
     @Transient
     private String token;
 
+    @Column(unique = true)
     private String firebaseUid;
 
     @JsonIgnore