Merge pull request #319 from acjh/patch-24

Add plus sign and apostrophe to email pattern

Author: alirizaadiyahsi

angular/src/account/register/register.component.html

@@ -19,7 +19,7 @@ <h4 class="text-center">{{l("Register")}}</h4>
 
             <div class="form-group form-float">
                 <div class="form-line">
-                    <input materialInput class="form-control" type="email" [(ngModel)]="model.emailAddress" name="EmailAddress" required maxlength="255" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$" />
+                    <input materialInput class="form-control" type="email" [(ngModel)]="model.emailAddress" name="EmailAddress" required maxlength="255" pattern="^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$" />
                     <label class="form-label">{{l('EmailAddress')}}</label>
                 </div>
             </div>

angular/src/app/tenants/create-tenant/create-tenant.component.html

@@ -35,7 +35,7 @@ <h4 class="modal-title">
                     </div>
                     <div class="form-group form-float">
                         <div class="form-line">
-                            <input type="email" name="AdminEmailAddress" class="form-control" [(ngModel)]="tenant.adminEmailAddress" required maxlength="256" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$">
+                            <input type="email" name="AdminEmailAddress" class="form-control" [(ngModel)]="tenant.adminEmailAddress" required maxlength="256" pattern="^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$">
                             <label class="form-label">{{l("AdminEmailAddress")}}</label>
                         </div>
                     </div>

angular/src/app/users/create-user/create-user.component.html

@@ -55,7 +55,7 @@ <h4 class="modal-title">
                                 <div class="col-sm-12">
                                     <div class="form-group form-float">
                                         <div class="form-line">
-                                            <input id="email" type="email" name="EmailAddress" [(ngModel)]="user.emailAddress" maxlength="256" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$" class="validate form-control">
+                                            <input id="email" type="email" name="EmailAddress" [(ngModel)]="user.emailAddress" maxlength="256" pattern="^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$" class="validate form-control">
                                             <label for="email" class="form-label">{{l("EmailAddress")}}</label>
                                         </div>
                                     </div>

angular/src/app/users/edit-user/edit-user.component.html

@@ -53,7 +53,7 @@ <h4 class="modal-title">
                                 <div class="col-sm-12">
                                     <div class="form-group form-float">
                                         <div class="form-line">
-                                            <input id="email" type="email" name="EmailAddress" [(ngModel)]="user.emailAddress" maxlength="256" pattern="^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{1,})+$" class="validate form-control">
+                                            <input id="email" type="email" name="EmailAddress" [(ngModel)]="user.emailAddress" maxlength="256" pattern="^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$" class="validate form-control">
                                             <label for="email" class="form-label">{{l("EmailAddress")}}</label>
                                         </div>
                                     </div>
@@ -99,4 +99,4 @@ <h4 class="modal-title">
             </form>
         </div>
     </div>
-</div>
+</div>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Account/RegisterViewModel.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Text.RegularExpressions;
 using Abp.Auditing;
 using Abp.Authorization.Users;
 using Abp.Extensions;
+using AbpCompanyName.AbpProjectName.Validation;
 
 namespace AbpCompanyName.AbpProjectName.Web.Models.Account
 {
@@ -37,8 +37,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext validationContex
         {
             if (!UserName.IsNullOrEmpty())
             {
-                var emailRegex = new Regex(@"^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$");
-                if (!UserName.Equals(EmailAddress) && emailRegex.IsMatch(UserName))
+                if (!UserName.Equals(EmailAddress) && ValidationHelper.IsEmail(UserName))
                 {
                     yield return new ValidationResult("Username cannot be an email address unless it's the same as your email address!");
                 }