Register Error Messages

Add register error messages in the form. Register Controller now returns
ResponseEntity with the error message that we want to be displayed.

src/main/client/src/app/welcome/register/register.component.html

@@ -8,6 +8,16 @@
       <img src="assets/img/img-01.png" alt="IMG">
     </div>
     <form class="register100-form validate-form" (ngSubmit)="onSubmit()" [formGroup]="registerForm">
+      <div *ngIf="showError">
+        <alert type="danger">
+          <strong>Error:</strong> {{ errorMessage }}
+        </alert>
+      </div>
+      <div *ngIf="showPasswordMismatch">
+        <alert type="danger">
+          <strong>Error:</strong> Passwords does not match!
+        </alert>
+      </div>
 					<span class="register100-form-title">
 						Hello, Welcome to Worklife!
 					</span>

src/main/client/src/app/welcome/register/register.component.ts

@@ -10,11 +10,16 @@ import {UserService} from "../../shared/user/user.service";
 })
 export class RegisterComponent implements OnInit {
   registerForm: FormGroup;
+  showError: boolean;
+  showPasswordMismatch: boolean;
+  errorMessage: string;
 
   constructor(private _fb: FormBuilder,
               private userService: UserService) { }
 
   ngOnInit() {
+    this.showError = false;
+    this.showPasswordMismatch = false;
     this.registerForm = this._fb.group({
       email: [null, [Validators.required, Validators.email]],
       name: [null, [Validators.required, Validators.minLength(3)]],
@@ -30,12 +35,19 @@ export class RegisterComponent implements OnInit {
 
   onSubmit() {
     if (this.registerForm.valid) {
+      this.showPasswordMismatch = false;
       let registerRequest = new Register(this.registerForm);
       this.userService.register(registerRequest)
         .then(() => {
           this.userService.loginUser(registerRequest.username, registerRequest.password);
         })
-        .catch(err => console.log(err));
+        .catch(err => {
+          console.log(err);
+          this.showError = true;
+          this.errorMessage = err.error;
+        });
+    } else {
+      this.showPasswordMismatch = true;
     }
   }
 }

src/main/java/com/linkedin/controller/AuthController.java

@@ -11,6 +11,8 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,19 +44,19 @@ public AuthController(UserService userService, UserConverter userConverter, User
 
 	@ApiOperation(value = "Register", notes = "Creates a new user", response = String.class)
 	@PostMapping(UrlConst.REGISTER)
-	public RegisterDto registerUser(@Valid @RequestBody RegisterRequestDto registerRequestDto) {
+	public ResponseEntity<String> registerUser(@Valid @RequestBody RegisterRequestDto registerRequestDto) {
 		if (userService.usernameTaken(registerRequestDto.getUsername())) {
-			return new RegisterDto("Username is already taken!");
+			return new ResponseEntity<>("Username is already taken!", HttpStatus.NOT_ACCEPTABLE);
 		}
 
 		if (userService.emailExists(registerRequestDto.getEmail())) {
-			return new RegisterDto("Email Address already in use!");
+			return new ResponseEntity<>("Email Address already in use!", HttpStatus.NOT_ACCEPTABLE);
 		}
 
 		// Creating user's account
 		userService.register(registerRequestDto);
 
-		return new RegisterDto("User registered successfully");
+		return new ResponseEntity<>("User registered successfully", HttpStatus.OK);
 	}
 
 	@ApiOperation(value = "Returns Users", notes = "Returns all Users", response = String.class)