Merge pull request #687 from h-da/bugfix/#564-regex-profile-page

WIP: bugfix/#564-regex-profile-page

Author: PatrickSkowronek

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed wasteful course data usage #654 via specialized course model interfaces.
 - Fixed a broken documentation link #583.
 - Limited the first- and lastname to 64 characters in registration- and edit page. [#585](https://github.com/h-da/geli/issues/585)
+- add correct E-Mail validator to edit-profile and register component [#564]
 
 ### Security
 - Fixed multiple severe course related security issues #594, #653.

app/webFrontend/src/app/auth/register/register.component.ts

@@ -7,6 +7,7 @@ import {MatSnackBar} from '@angular/material';
 import {errorCodes} from '../../../../../../api/src/config/errorCodes';
 import {TitleService} from '../../shared/services/title.service';
 import {APIInfoService} from '../../shared/services/data.service';
+import {emailValidator} from '../../shared/validators/validators';
 
 @Component({
   selector: 'app-register',
@@ -112,7 +113,7 @@ export class RegisterComponent implements OnInit {
         firstName: ['', Validators.compose([Validators.required, Validators.minLength(2), Validators.maxLength(64)])],
         lastName: ['', Validators.compose([Validators.required, Validators.minLength(2), Validators.maxLength(64)])],
       }),
-      email: ['', Validators.compose([Validators.required, Validators.email, this.validateTeacherEmail.bind(this)])],
+      email: ['', Validators.compose([emailValidator, Validators.required, Validators.email, this.validateTeacherEmail.bind(this)])],
       uid: ['', [this.validateMatriculationNumber.bind(this)]]
     });
   }

app/webFrontend/src/app/user/user-edit/user-edit.component.html

@@ -50,7 +50,7 @@ <h1>Edit profile</h1>
   </div>
 
   <mat-form-field class="full-width">
-    <input matInput formControlName="email" placeholder="e-mail"/>
+    <input matInput formControlName="email" [placeholder]="'common.email'|translate"/>
   </mat-form-field>
   <button mat-raised-button color="primary" class="mat-button" type="submit" [disabled]="!userForm?.valid">Save</button>
   <button mat-raised-button class="mat-button" routerLink="/profile" routerLinkActive="active">
@@ -68,4 +68,4 @@ <h1>Edit profile</h1>
     Change Password
   </button>
 </div>
-</div>
+</div>

app/webFrontend/src/app/user/user-edit/user-edit.component.ts

@@ -9,6 +9,7 @@ import {ShowProgressService} from '../../shared/services/show-progress.service';
 import {DialogService} from '../../shared/services/dialog.service';
 import {TitleService} from '../../shared/services/title.service';
 import {ThemeService} from '../../shared/services/theme.service';
+import {emailValidator} from '../../shared/validators/validators';
 
 @Component({
   selector: 'app-user-edit',
@@ -124,7 +125,7 @@ export class UserEditComponent implements OnInit {
         theme: [''],
       }),
       username: [''],
-      email: ['', Validators.required],
+      email: ['', emailValidator],
       currentPassword: ['']
     });
   }