Username allowed characters

AlexP11223 · AlexP11223 · commit ecb1eb1f0084 · 2015-05-06T10:52:17.000+03:00
diff --git a/src/main/java/alexp/blog/model/User.java b/src/main/java/alexp/blog/model/User.java
@@ -4,6 +4,7 @@
 import org.hibernate.validator.constraints.NotBlank;
 
 import javax.persistence.*;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.util.ArrayList;
 import java.util.List;
@@ -27,6 +28,7 @@ public interface ChangePasswordValidationGroup {}
             @Size(max = 25, message = "Username too long", groups = {CreateValidationGroup.class})
     })
     @NotBlank(groups = {CreateValidationGroup.class})
+    @Pattern(regexp = "^[\\p{L}0-9\\._\\- ]+$", groups = {CreateValidationGroup.class})
     private String username;
 
     @Column(unique = true, nullable = false, length = 50)
diff --git a/src/main/webapp/WEB-INF/templates/registration.html b/src/main/webapp/WEB-INF/templates/registration.html
@@ -7,6 +7,7 @@
       layout:decorator="layouts/blog">
 
 <head>
+    <script src="../../js/xregexp-all-min.js" th:src="@{/js/xregexp-all-min.js}"></script>
     <script src="../../js/registration.js" th:src="@{/js/registration.js}"></script>
 </head>
 
diff --git a/src/main/webapp/js/registration.js b/src/main/webapp/js/registration.js
@@ -15,11 +15,16 @@ $(document).ready(function() {
         return "pending";
     };
 
+    $.validator.addMethod("username", function(value, element) {
+        return this.optional( element ) || XRegExp("^[\\p{L}0-9\\._\\- ]+$").test( value );
+    }, 'Only letters, numbers, space, ".", "-" and "_" are allowed.');
+
     $("#regForm").validate({
         rules: {
             username: {
                 required: true,
                 minlength: 3,
+                username: true,
                 remote: {
                     url: window.usernameCheckUrl,
                     type: "get",
diff --git a/src/main/webapp/js/xregexp-all-min.js b/src/main/webapp/js/xregexp-all-min.js
