HTM-1649: Add a password reset page (#1022)

* HTM-1690: Refactor tailormap-viewer: for the move of /validate-password

* Move NAME_REGEX to common API so it can be used in the viewer and the admin

* HTM-1649: add password reset page

* fix testcase and localsation keys

* Add Dutch and German translations

* lint fixes

* fix tests after refactoring

* fix interpolation translation

* Update projects/core/src/lib/pages/password-reset/password-reset.component.ts

Co-authored-by: Copilot <[email protected]>

* Update projects/core/assets/locale/messages.core.nl.xlf

Co-authored-by: Copilot <[email protected]>

* Update projects/core/assets/locale/messages.core.en.xlf

Co-authored-by: Copilot <[email protected]>

* Update projects/core/assets/locale/messages.core.de.xlf

Co-authored-by: Copilot <[email protected]>

* Fix typo in success message for password reset

* Add return to login link to the bottom of the reset password email form

* hide form when token has expired

* HTM-1690: Refactor tailormap-viewer: for the move of /validate-password

* Move NAME_REGEX to common API so it can be used in the viewer and the admin

* HTM-1649: add password reset page

* fix testcase and localsation keys

* Add Dutch and German translations

* lint fixes

* fix tests after refactoring

* fix interpolation translation

* Update projects/core/src/lib/pages/password-reset/password-reset.component.ts

Co-authored-by: Copilot <[email protected]>

* Update projects/core/assets/locale/messages.core.nl.xlf

Co-authored-by: Copilot <[email protected]>

* Update projects/core/assets/locale/messages.core.en.xlf

Co-authored-by: Copilot <[email protected]>

* Update projects/core/assets/locale/messages.core.de.xlf

Co-authored-by: Copilot <[email protected]>

* Fix typo in success message for password reset

* Add return to login link to the bottom of the reset password email form

* hide form when token has expired

* fix testcase after form changes

---------

Co-authored-by: Copilot <[email protected]>

Author: mprins

projects/admin-api/src/lib/services/tailormap-admin-api-v1-mock.service.ts

@@ -136,10 +136,6 @@ export class TailormapAdminApiV1MockService implements TailormapAdminApiV1Servic
     return of(true).pipe(delay(this.delay));
   }
 
-  public validatePasswordStrength$(_password: string): Observable<boolean> {
-    return of(true).pipe(delay(this.delay));
-  }
-
   public updateUser$(params: { username: string; user: Omit<UserModel, 'groupNames'> & { groups: string[] } }): Observable<UserModel> {
     return of({ ...params.user, groupNames: params.user.groups }).pipe(delay(this.delay));
   }

projects/admin-api/src/lib/services/tailormap-admin-api-v1-service.model.ts

@@ -37,7 +37,6 @@ export interface TailormapAdminApiV1ServiceModel {
   createUser$(params: { user: Omit<UserModel, 'groupNames'> & { groups: string[] } }): Observable<UserModel>;
   updateUser$(params: { username: string; user: Partial<Omit<UserModel, 'groupNames'>> & { groups: string[] } }): Observable<UserModel>;
   deleteUser$(username: string): Observable<boolean>;
-  validatePasswordStrength$(password: string): Observable<boolean>;
   getApplications$(): Observable<ApplicationModel[]>;
   createApplication$(params: { application: Partial<Omit<ApplicationModel, 'id'>> }): Observable<ApplicationModel>;
   updateApplication$(params: { id: string; application: Partial<ApplicationModel> }): Observable<ApplicationModel>;

projects/admin-api/src/lib/services/tailormap-admin-api-v1.service.ts

@@ -207,12 +207,6 @@ export class TailormapAdminApiV1Service implements TailormapAdminApiV1ServiceMod
     );
   }
 
-  public validatePasswordStrength$(password: string): Observable<boolean> {
-    const body = new HttpParams().set('password', password);
-    return this.httpClient.post<{ result: boolean }>(`${TailormapAdminApiV1Service.BASE_URL}/validate-password`, body)
-      .pipe(map(response => response.result));
-  }
-
   public getApplications$(): Observable<ApplicationModel[]> {
     return this.httpClient.get<{ _embedded: { applications: ApplicationModel[] }}>(`${TailormapAdminApiV1Service.BASE_URL}/applications?size=1000&sort=title`)
       .pipe(map(response => response._embedded.applications));

projects/admin-core/src/lib/application/application-form/application-form.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, ChangeDetectionStrategy, Input, Output, EventEmitter, OnDestroy, inject } from '@angular/core';
 import { AbstractControl, FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from '@angular/forms';
-import { BoundsModel, I18nSettingsModel, UiSettingsModel } from '@tailormap-viewer/api';
+import { BoundsModel, I18nSettingsModel, UiSettingsModel, ValidatorsHelper } from '@tailormap-viewer/api';
 import { ApplicationModel, GroupModel, AuthorizationRuleGroup, AUTHORIZATION_RULE_ANONYMOUS } from '@tailormap-admin/admin-api';
 import { Observable, debounceTime, filter, Subject, takeUntil, map, distinctUntilChanged } from 'rxjs';
 import { FormHelper } from '../../helpers/form.helper';
@@ -51,7 +51,7 @@ export class ApplicationFormComponent implements OnInit, OnDestroy {
       nonNullable: true,
       validators: [
         Validators.required,
-        Validators.pattern(FormHelper.NAME_REGEX),
+        Validators.pattern(ValidatorsHelper.NAME_REGEX),
         this.isUniqueApplicationName(),
       ],
     }),

projects/admin-core/src/lib/helpers/form.helper.ts

@@ -6,8 +6,6 @@ export type ComparableValuesArray = Array<[ValueType, ValueType]>;
 
 export class FormHelper {
 
-  public static NAME_REGEX = /^[a-zA-Z0-9\-_]+$/;
-
   public static isValidValue(value: string | undefined | null) {
     return typeof value !== 'undefined' && value !== null && value.length > 0;
   }

projects/admin-core/src/lib/user/group-form/group-form.component.ts

@@ -2,10 +2,10 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, OnI
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { BehaviorSubject, combineLatest, debounceTime, map, Observable, of, Subject, takeUntil } from 'rxjs';
 import { AdditionalPropertyModel, GroupModel, OIDCConfigurationModel } from '@tailormap-admin/admin-api';
-import { FormHelper } from '../../helpers/form.helper';
 import { AdminFieldLocation, AdminFieldModel, AdminFieldRegistrationService } from '../../shared/services/admin-field-registration.service';
 import { GroupService } from '../services/group.service';
 import { OIDCConfigurationService } from '../../oidc/services/oidc-configuration.service';
+import { ValidatorsHelper } from '@tailormap-viewer/api';
 
 @Component({
   selector: 'tm-admin-group-form',
@@ -23,7 +23,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   public groupForm = new FormGroup({
     name: new FormControl<string>('', {
       nonNullable: true,
-      validators: [ Validators.required, Validators.pattern(FormHelper.NAME_REGEX) ],
+      validators: [ Validators.required, Validators.pattern(ValidatorsHelper.NAME_REGEX) ],
     }),
     description: new FormControl<string>('', { nonNullable: false }),
     aliasForGroup: new FormControl<string>('', { nonNullable: false }),

projects/admin-core/src/lib/user/services/user.service.ts

@@ -9,12 +9,14 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { selectUsers, selectUsersLoadStatus } from '../state/user.selectors';
 import { DebounceHelper, LoadingStateEnum } from '@tailormap-viewer/shared';
 import { UserAddUpdateModel } from '../models/user-add-update.model';
+import { TailormapSecurityApiV1Service } from '@tailormap-viewer/api';
 
 @Injectable({
   providedIn: 'root',
 })
 export class UserService {
   private adminApiService = inject(TailormapAdminApiV1Service);
+  private securityApiService = inject(TailormapSecurityApiV1Service);
   private store$ = inject(Store);
   private adminSnackbarService = inject(AdminSnackbarService);
   private sseService = inject(AdminSseService);
@@ -111,7 +113,7 @@ export class UserService {
   }
 
   public validatePasswordStrength$(password: string) {
-    return this.adminApiService.validatePasswordStrength$(password);
+    return this.securityApiService.validatePasswordStrength$(password);
   }
 
   private updateUserState(

projects/admin-core/src/lib/user/user-form/user-form.component.spec.ts

@@ -10,11 +10,14 @@ import { initialUserState, userStateKey } from '../state/user.state';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { SharedAdminComponentsModule } from '../../shared/components/shared-admin-components.module';
 import { AuthenticatedUserTestHelper } from '../../test-helpers/authenticated-user-test.helper.spec';
+import { TailormapSecurityApiV1Service } from '@tailormap-viewer/api';
 
 const setup = async (isValidPassword: boolean) => {
-  const mockApiService = {
+  const mockAdminApiService = {
     getGroups$: jest.fn(() => of([])),
     getUsers$: jest.fn(() => of([])),
+  };
+  const mockApiService = {
     validatePasswordStrength$: jest.fn(() => of(isValidPassword)),
   };
   const userUpdated = jest.fn();
@@ -23,7 +26,8 @@ const setup = async (isValidPassword: boolean) => {
     declarations: [PasswordFieldComponent],
     on: { userUpdated },
     providers: [
-      { provide: TailormapAdminApiV1Service, useValue: mockApiService },
+      { provide: TailormapAdminApiV1Service, useValue: mockAdminApiService },
+      { provide: TailormapSecurityApiV1Service, useValue: mockApiService },
       provideMockStore({ initialState: { [userStateKey]: initialUserState } }),
       AuthenticatedUserTestHelper.provideAuthenticatedUserServiceWithAdminUser(),
     ],

projects/admin-core/src/lib/user/user-form/user-form.component.ts

@@ -6,8 +6,8 @@ import { GroupService } from '../services/group.service';
 import { formatDate } from '@angular/common';
 import { UserService } from '../services/user.service';
 import { UserAddUpdateModel } from '../models/user-add-update.model';
-import { FormHelper } from '../../helpers/form.helper';
 import { AdminFieldLocation, AdminFieldModel, AdminFieldRegistrationService } from '../../shared/services/admin-field-registration.service';
+import { ValidatorsHelper } from '@tailormap-viewer/api';
 
 @Component({
   selector: 'tm-admin-user-form',
@@ -25,7 +25,7 @@ export class UserFormComponent implements OnInit, OnDestroy {
   public userForm = new FormGroup({
     username: new FormControl<string>('', {
       nonNullable: true,
-      validators: [ Validators.required, Validators.pattern(FormHelper.NAME_REGEX) ],
+      validators: [ Validators.required, Validators.pattern(ValidatorsHelper.NAME_REGEX) ],
     }),
     password: new FormControl<string>('', {
       nonNullable: true,

projects/admin-core/src/lib/user/user-list/user-list.component.spec.ts

@@ -8,16 +8,19 @@ import { provideMockStore } from '@ngrx/store/testing';
 import { initialUserState, userStateKey } from '../state/user.state';
 import { AuthenticatedUserTestHelper } from '../../test-helpers/authenticated-user-test.helper.spec';
 import { SharedAdminComponentsModule } from '../../shared/components/shared-admin-components.module';
+import { TailormapSecurityApiV1Service } from '@tailormap-viewer/api';
 
 const setup = async () => {
-  const mockApiService = {
+  const mockAdminApiService = {
     getUsers$: jest.fn(() => of(getUsers)),
   };
+  const mockApiService = {};
 
   await render(UserListComponent, {
     imports: [ SharedModule, MatListModule, SharedAdminComponentsModule ],
     providers: [
-      { provide: TailormapAdminApiV1Service, useValue: mockApiService },
+      { provide: TailormapAdminApiV1Service, useValue: mockAdminApiService },
+      { provide: TailormapSecurityApiV1Service, useValue: mockApiService },
       provideMockStore({ initialState: { [userStateKey]: initialUserState } }),
       AuthenticatedUserTestHelper.provideAuthenticatedUserServiceWithAdminUser(),
     ],