Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
data-testid="input-registered-since"
></input-text>
</div>
<input-text email inputType="email" title="Email" formControlName="email" [isRequired]="true" data-testid="input-email"></input-text>
<input-text title="Email" formControlName="email" [isRequired]="true" data-testid="input-email"></input-text>
<grid-buttons>
<button-submit [name]="'Update'" (click)="onSubmit()" [disabled]="form.pending" data-testid="button-update-submit"></button-submit>
@if (isUpdatingLoading) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { SERV } from '@services/main.config';
import { changeOwnPasswordResponseSchema } from '@src/app/account/settings/acc-settings/acc-settings.schema';
import { JUserSchema } from '@src/app/core/_models/user.schema';
import { JsonAPISerializer } from '@src/app/core/_services/api/serializer-service';
import { emailValidator } from '@src/app/core/_validators/email.validator';
import { passwordMatchValidator } from '@src/app/core/_validators/password.validator';

export interface UpdateUserPassword {
Expand Down Expand Up @@ -85,6 +86,9 @@ export class AccountSettingsComponent implements OnInit, OnDestroy {
this.createForm();
this.loadUserSettings();
this.createUpdatePassForm();

this.form.markAllAsTouched();
this.form.updateValueAndValidity();
}

/**
Expand All @@ -102,7 +106,7 @@ export class AccountSettingsComponent implements OnInit, OnDestroy {
this.form = new FormGroup({
name: new FormControl({ value: '', disabled: true }), // disabled, no validators needed
registeredSince: new FormControl({ value: '', disabled: true }), // disabled, no validators needed
email: new FormControl('', [Validators.required, Validators.email])
email: new FormControl('', [Validators.required, emailValidator])
});
}

Expand Down
3 changes: 2 additions & 1 deletion src/app/core/_services/metadata.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ConfigTooltipsLevel, TooltipService } from '@services/shared/tooltip.se
import { fileFormat } from '@src/app/core/_constants/files.config';
import { ACCESS_GROUP_FIELD_MAPPING, FieldMapping } from '@src/app/core/_constants/select.config';
import { Option, Setting, dateFormats, proxytype, serverlog } from '@src/app/core/_constants/settings.config';
import { emailValidator } from '@src/app/core/_validators/email.validator';
import { urlValidator } from '@src/app/core/_validators/url.validator';

/**
Expand Down Expand Up @@ -1138,7 +1139,7 @@ export class MetadataService {
label: 'Email',
type: 'email',
requiredasterisk: true,
validators: [Validators.required, Validators.email]
validators: [Validators.required, emailValidator]
},
{
name: 'globalPermissionGroupId',
Expand Down
14 changes: 14 additions & 0 deletions src/app/core/_validators/email.validator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { AbstractControl, ValidationErrors } from '@angular/forms';

/**
* Validates email-adresses with a regex, which mirrors PHP's FILTER_VALIDATE_EMAIL internal implementation
*/
export const emailValidator = (control: AbstractControl): ValidationErrors | null => {
const value = control.value as string;
if (!value) return null;

const phpEmailRegex =
/^[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;

return phpEmailRegex.test(value) ? null : { email: true };
};
4 changes: 3 additions & 1 deletion src/app/users/new-user/new-user.form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*/
import { FormControl, FormGroup, Validators } from '@angular/forms';

import { emailValidator } from '@src/app/core/_validators/email.validator';

/**
* Interface definition for NewUserForm
* @prop username Username
Expand All @@ -24,7 +26,7 @@ export interface NewUserForm {
export const getNewUserForm = () => {
return new FormGroup<NewUserForm>({
username: new FormControl('', [Validators.required]),
email: new FormControl('', [Validators.required, Validators.email]),
email: new FormControl('', [Validators.required, emailValidator]),
globalPermissionGroupId: new FormControl(undefined, [Validators.required]),
isValid: new FormControl(false)
});
Expand Down
Loading