From 3a6163c555351c51f096fdeb489d6fbe881f3835 Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Tue, 24 Mar 2015 23:33:33 +0200
Subject: [PATCH] remove old registration

---
 .../java/org/baeldung/spring/MvcConfig.java   |   1 +
 .../controller/RegistrationController.java    |   4 +-
 .../src/main/webapp/WEB-INF/view/badUser.jsp  |   2 +-
 .../webapp/WEB-INF/view/expiredAccount.jsp    |   2 +-
 .../webapp/WEB-INF/view/forgetPassword.jsp    |   2 +-
 .../src/main/webapp/WEB-INF/view/login.jsp    |   2 +-
 .../main/webapp/WEB-INF/view/registration.jsp | 122 ++++++++++++------
 7 files changed, 87 insertions(+), 48 deletions(-)

diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
index 5229893298..30a7b31202 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -36,6 +36,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
     public void addViewControllers(final ViewControllerRegistry registry) {
         super.addViewControllers(registry);
         registry.addViewController("/login.html");
+        registry.addViewController("/registration.html");
         registry.addViewController("/logout.html");
         registry.addViewController("/homepage.html");
         registry.addViewController("/expiredAccount.html");
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
index 3d5e42ab2c..c0c3f7c02f 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
@@ -68,9 +68,7 @@ public class RegistrationController {
     @ResponseBody
     public GenericResponse registerUserAccount(@Valid final UserDto accountDto, final HttpServletRequest request) {
         LOGGER.debug("Registering user account with information: {}", accountDto);
-        // if (result.hasErrors()) {
-        // return new GenericResponse(result.getFieldErrors(), result.getGlobalErrors());
-        // }
+
         final User registered = createUserAccount(accountDto);
         if (registered == null) {
             return new GenericResponse("email", messages.getMessage("message.regError", null, request.getLocale()));
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp
index 38c8a8e3a0..e090c55e29 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp
@@ -17,7 +17,7 @@ code="label.badUser.title"></spring:message></title>
 				 ${param.message}
 </h1>
 <br>
-<a href="<c:url value="/old/user/registration" />"><spring:message
+<a href="<c:url value="/registration.html" />"><spring:message
 code="label.form.loginSignUp"></spring:message></a>
 
 <c:if test="${param.expired}">
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp
index fa6796c6a8..6d45aa3da4 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp
@@ -16,7 +16,7 @@
   <spring:message code="auth.message.expired"></spring:message> 
 </h1>
 <br>
-<a href="<c:url value="/old/user/registration" />"><spring:message
+<a href="<c:url value="/registration.html" />"><spring:message
 code="label.form.loginSignUp"></spring:message></a>
 
 </body>
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp
index 9a25ea9b2b..7e7ee0c01f 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp
@@ -32,7 +32,7 @@
 </div>
 
 <br> 
-<a href="<c:url value="/old/user/registration" />"><spring:message code="label.form.loginSignUp"></spring:message></a>
+<a href="<c:url value="/registration.html" />"><spring:message code="label.form.loginSignUp"></spring:message></a>
 <br>
 <a href="<c:url value="login.html" />"><spring:message code="label.form.loginLink"></spring:message></a>
 
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
index c8d8acc07b..a0611aed8b 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
@@ -97,7 +97,7 @@ ${param.message}
 
 			</form>
 			<br> Current Locale : ${pageContext.response.locale} <br> <a
-				href="<c:url value="/old/user/registration" />"><spring:message
+				href="<c:url value="/registration.html" />"><spring:message
 					code="label.form.loginSignUp"></spring:message></a>
 			<br><br><br>
             <a href="<c:url value="/forgetPassword.html" />"><spring:message
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp
index 8060c8f356..a7f3821342 100644
--- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp
+++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp
@@ -1,55 +1,95 @@
 <!DOCTYPE html>
 <%@ page contentType="text/html;charset=UTF-8" language="java"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ page session="false"%>
 <html>
 <head>
-<link href="<c:url value="/resources/bootstrap.css" />" rel="stylesheet">
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title><spring:message code="label.form.title"></spring:message></title>
 </head>
 <body>
-	<div class="container">
-		<div class="span12">
-			<h1>
-				<spring:message code="label.form.title"></spring:message>
-			</h1>
-			<form:form modelAttribute="user" method="POST" enctype="utf8">
-				<br>
-				<tr>
-					<td><label><spring:message code="label.user.firstName"></spring:message></label></td>
-					<td><form:input path="firstName" value="" /></td>
-					<form:errors path="firstName" cssClass="alert alert-error" element="div" />
-				</tr>
-				<tr>
-					<td><label><spring:message code="label.user.lastName"></spring:message></label></td>
-					<td><form:input path="lastName" value="" /></td>
-					<form:errors path="lastName" cssClass="alert alert-error" element="div" />
-				</tr>
-				<tr>
-					<td><label><spring:message code="label.user.email"></spring:message></label></td>
-					<td><form:input path="email" value="" /></td>
-					<form:errors path="email" cssClass="alert alert-error" element="div" />
-				</tr>
-				<tr>
-					<td><label><spring:message code="label.user.password"></spring:message></label></td>
-					<td><form:input path="password" value="" type="password" /></td>
-					<form:errors path="password" cssClass="alert alert-error" element="div" />
-				</tr>
-				<tr>
-					<td><label><spring:message code="label.user.confirmPass"></spring:message></label></td>
-					<td><form:input path="matchingPassword" value="" type="password" /></td>
-					<form:errors cssClass="alert alert-error" element="div" />
-				</tr>
-				<button type="submit" class="btn btn-primary">
-					<spring:message code="label.form.submit"></spring:message>
-				</button>
-			</form:form>
-			<br> <a href="<c:url value="login.html" />"><spring:message code="label.form.loginLink"></spring:message></a>
-		</div>
-	</div>
+    <div class="container">
+        <div >
+            <h1>
+                <spring:message code="label.form.title"></spring:message>
+            </h1>
+            <br>
+            <form action="/" method="POST" enctype="utf8">
+                <div class="form-group row" >
+                    <label class="col-sm-3"><spring:message code="label.user.firstName"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" name="firstName" value="" /></span>
+                    <span id="firstNameError" class="alert alert-danger col-sm-4" style="display:none"></span>
+                    
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-3"><spring:message code="label.user.lastName"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" name="lastName" value="" /></span>
+                    <span id="lastNameError" class="alert alert-danger col-sm-4" style="display:none"></span>
+                    
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-3"><spring:message code="label.user.email"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" name="email" value="" /></span>                    
+                    <span id="emailError" class="alert alert-danger col-sm-4" style="display:none"></span>
+                    
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-3"><spring:message code="label.user.password"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" name="password" value="" type="password" /></span>
+                    <span id="passwordError" class="alert alert-danger col-sm-4" style="display:none"></span>
+                </div>
+                <div class="form-group row">
+                    <label class="col-sm-3"><spring:message code="label.user.confirmPass"></spring:message></label>
+                    <span class="col-sm-5"><input class="form-control" name="matchingPassword" value="" type="password" /></span>
+                    <span id="globalError" class="alert alert-danger col-sm-4" style="display:none"></span>
+                </div>
+                <br>
+                <a href="#" class="btn btn-primary" onclick="register()">
+                    <spring:message code="label.form.submit"></spring:message>
+                </a>
+            </form>
+            <br> 
+            <a href="<c:url value="login.html" />"><spring:message code="label.form.loginLink"></spring:message></a>
+        </div>
+    </div>
+
+<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+<script type="text/javascript">
+function register(){
+    $(".alert").html("").hide();
+    var formData= $('form').serialize();
+    $.post("/spring-security-login-and-registration/user/registration",formData ,function(data){
+        if(data.message == "success"){
+            window.location.href = "<c:url value="/successRegister.html"></c:url>";
+        }
+        else if(data.message == "email"){
+            $("#emailError").show().html(data.error);
+        }
+        else{
+            
+            var errors = $.parseJSON(data.message);
+            $.each( errors, function( index,item ){
+                $("#"+item.field+"Error").show().html(item.defaultMessage);
+            });
+            errors = $.parseJSON(data.error);
+            $.each( errors, function( index,item ){
+                $("#globalError").show().append(item.defaultMessage+"<br>");
+            });
+        }
+    })
+    .fail(function(data) {
+        if(data.responseJSON.error.indexOf("MailError") > -1)
+        {
+            window.location.href = "<c:url value="/emailError.html"></c:url>";
+        }
+        else{
+            window.location.href = "<c:url value="/login.html"></c:url>" + "?message=" + data.responseJSON.message;
+        }
+    });
+}
+</script>
 </body>
 
 </html>
\ No newline at end of file