@dsivd/prestations-ng 18.2.4 → 18.3.0-beta.2

package/CHANGELOG.md

@@ -6,6 +6,13 @@
 
 ---
 
+## [18.3.0] - should be aligned with prestations-be 18.3.x
+
+### Added
+
+- [gesdem-action-recovery-login.component.ts](projects/prestations-ng/src/gesdem-action-recovery/gesdem-action-recovery-login/gesdem-action-recovery-login.component.ts)
+    - Display a countdown to get a new OTP during action recovery (to handle backend rate limiter)
+
 ## [18.2.4]
 
 ### Fixed

package/fesm2022/dsivd-prestations-ng.mjs

@@ -2,8 +2,8 @@ import * as i0 from '@angular/core';
 import { Optional, Inject, Injectable, EventEmitter, Input, HostBinding, Output, forwardRef, ViewChildren, ViewChild, Directive, Pipe, Component, ContentChildren, HostListener, NgModule, inject, TemplateRef, ContentChild } from '@angular/core';
 import * as i1$1 from '@angular/router';
 import { ActivatedRoute, NavigationStart, RouterModule, NavigationEnd, RouterLink } from '@angular/router';
-import { of, Subject, BehaviorSubject, combineLatest, throwError, switchMap as switchMap$1, forkJoin, tap as tap$1, concat, toArray, EMPTY, startWith, filter as filter$1, merge, withLatestFrom, debounceTime as debounceTime$1, map as map$1 } from 'rxjs';
-import { map, shareReplay, filter, tap, debounceTime, catchError, switchMap, first, throttleTime, mergeMap, share, finalize, distinctUntilChanged } from 'rxjs/operators';
+import { of, Subject, BehaviorSubject, combineLatest, throwError, switchMap as switchMap$1, forkJoin, tap as tap$1, concat, toArray, EMPTY, startWith, filter as filter$1, merge, interval, withLatestFrom, debounceTime as debounceTime$1, map as map$1 } from 'rxjs';
+import { map, shareReplay, filter, tap, debounceTime, catchError, switchMap, first, throttleTime, mergeMap, share, finalize, take, distinctUntilChanged } from 'rxjs/operators';
 import * as i1 from '@angular/common/http';
 import { HttpStatusCode, HttpResponseBase, HttpErrorResponse, HttpParams, HttpEventType, HttpResponse, HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi, HttpClient } from '@angular/common/http';
 import * as i3 from '@angular/forms';
@@ -1253,6 +1253,10 @@ const DEFAULT_DICTIONARY = {
     'gesdem-confirmation.resume-my-demand.label': 'Vous pouvez reprendre votre demande en cliquant sur le lien ci-dessous',
     'gesdem-confirmation.resume-my-demand.button': 'Reprendre ma demande',
     'gesdem.download-pdf.button.title': 'Télécharger le PDF',
+    'gesdem-action-recovery-login.request-now-code.label': 'Pour obtenir un nouveau code, vous devez recliquer sur le ' +
+        '<a href="{redirectTarget}">lien</a> de reprise de la demande.\n',
+    'gesdem-action-recovery-login.rate-limited.label': "Merci d'attendre {rateLimitCounter} seconde{plural} " +
+        'pour demander un nouveau code.',
     'gesdem-action-recovery-login.save.label': 'Les données de votre demande enregistrée le {date} ont été chargées.',
     'gesdem-action-recovery-login.invalid-otp.label': "Le mot de passe saisi n'est pas valide",
     'gesdem-action-recovery-login.password-generation-failed.label': 'Impossible de générer un mot de passe, veuillez réessayer plus tard.',
@@ -1409,7 +1413,7 @@ const DEFAULT_DICTIONARY = {
     'gesdem-error.title.error': 'Erreur rencontrée',
     'gesdem-error.title.recovery': 'Reprise de la demande',
     'gesdem-error.text.wrong-etape-requested': 'La demande {reference} ne peut plus être modifiée via ce formulaire',
-    'gesdem-error.text.demande-not-found': 'La demande {reference} a été supprimée',
+    'gesdem-error.text.demande-not-found': 'Les conditions préalables pour la reprise de cette demande ne sont pas remplies',
     'gesdem-error.text.has-reference': 'Vous pouvez essayer de reprendre votre demande en cliquant sur le lien ci-dessous',
     'gesdem-error.link.has-reference': 'Reprendre ma demande',
     'gesdem-error.text.has-no-reference': 'Vous pouvez recommencer une demande en cliquant sur le lien ci-dessous',
@@ -1966,7 +1970,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImpo
 const SESSION_EXPIRED = 'SESSION_EXPIRED';
 const DEMANDE_SHOULD_EXIST = 'DEMANDE_SHOULD_EXIST';
 const WRONG_ETAPE_REQUESTED = 'WRONG_ETAPE_REQUESTED';
-const DEMANDE_NOT_FOUND = 'DEMANDE_NOT_FOUND';
+const OBJECT_NOT_FOUND = 'OBJECT_NOT_FOUND';
 class GesdemErrorHandlerService {
     constructor(growlService, router, iamExpiredInterceptorService) {
         this.growlService = growlService;
@@ -5667,12 +5671,12 @@ class GesdemActionRecoveryLoginComponent {
         this.router = router;
         this.route = route;
         this.eventsLoggerService = eventsLoggerService;
-        this.missingRecoveryInfos = false;
-        this.alreadyTransferred = false;
+        this.demandeNotFound = false;
+        this.rateLimited = false;
+        this.rateLimitCounter = 0;
     }
     ngOnInit() {
         this.otpRecipient = null;
-        this.missingRecoveryInfos = false;
         this.applicationInfoService.currentEtapeInfo
             .pipe(tap(currentEtape => {
             if (currentEtape.reprisePossible) {
@@ -5698,6 +5702,9 @@ class GesdemActionRecoveryLoginComponent {
             // eslint-disable-next-line rxjs-angular/prefer-async-pipe
             .subscribe();
     }
+    ngOnDestroy() {
+        this.rateLimitCounterSub?.unsubscribe();
+    }
     validateOtp() {
         this.eventsLoggerService.addEvent(SdkEventType.RECOVERY_LOGIN_STARTED);
         if (!this.route.snapshot.queryParams.reCaptchaByPassUUID &&
@@ -5763,35 +5770,56 @@ class GesdemActionRecoveryLoginComponent {
             }
         });
     }
+    getPluralMarker(count) {
+        return this.dictionaryService.getPluralMarkerSync(count);
+    }
     startRecovery() {
+        this.rateLimited = false;
+        this.demandeNotFound = false;
         this.recoveryService
             .startRecovery(this.reference)
             .pipe(catchError((response) => {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const { error, status } = response;
-            this.missingRecoveryInfos =
+            this.rateLimited = status === 429;
+            if (this.rateLimited) {
+                this.startRateLimitCounter();
+                return EMPTY;
+            }
+            this.demandeNotFound =
                 status === 404 &&
                     error &&
-                    JSON.parse(error).code === 'ACTION_RECOVERY_NOT_FOUND';
-            this.alreadyTransferred =
-                status === 409 &&
-                    error &&
-                    JSON.parse(error).code === 'ACTION_ALREADY_TRANSFERRED';
-            if (!this.missingRecoveryInfos &&
-                !this.alreadyTransferred) {
-                this.growlService.addWithType(GrowlType.DANGER, this.dictionaryService.getKeySync('gesdem-action-recovery-login.password-generation-failed.label'));
+                    JSON.parse(error).code === OBJECT_NOT_FOUND;
+            if (this.demandeNotFound) {
+                return EMPTY;
             }
+            this.growlService.addWithType(GrowlType.DANGER, this.dictionaryService.getKeySync('gesdem-action-recovery-login.password-generation-failed.label'));
             return throwError(() => true);
         }))
             // eslint-disable-next-line rxjs-angular/prefer-async-pipe
-            .subscribe(otpRecipient => (this.otpRecipient = otpRecipient));
+            .subscribe(otpRecipient => {
+            this.otpRecipient = otpRecipient;
+            this.startRateLimitCounter();
+        });
+    }
+    startRateLimitCounter() {
+        this.rateLimitCounter = 30;
+        const rateLimitCounterSub = interval(1000)
+            .pipe(take(30))
+            // eslint-disable-next-line rxjs-angular/prefer-async-pipe
+            .subscribe(() => {
+            this.rateLimitCounter--;
+            if (this.rateLimitCounter === 0) {
+                rateLimitCounterSub?.unsubscribe();
+            }
+        });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: GesdemActionRecoveryLoginComponent, deps: [{ token: GesdemActionRecoveryService }, { token: GrowlBrokerService }, { token: FoehnConfirmModalService }, { token: ValidationHandlerService }, { token: ApplicationInfoService }, { token: GesdemHandlerService }, { token: SdkDictionaryService }, { token: i1$1.Router }, { token: i1$1.ActivatedRoute }, { token: SdkEventsLoggerService }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.17", type: GesdemActionRecoveryLoginComponent, isStandalone: false, selector: "gesdem-action-recovery-login", inputs: { reference: "reference", redirectTarget: "redirectTarget" }, viewQueries: [{ propertyName: "loginForm", first: true, predicate: FoehnFormComponent, descendants: true }, { propertyName: "recaptchaComponent", first: true, predicate: SdkRecaptchaComponent, descendants: true }], ngImport: i0, template: "<div class=\"container mt-5\">\n    <div class=\"alert alert-danger\" *ngIf=\"missingRecoveryInfos\">\n        Vous n'avez pas indiqu\u00E9 d'informations de contact pour la reprise de\n        cette demande, merci de contacter le support.\n    </div>\n    <div class=\"alert alert-danger\" *ngIf=\"alreadyTransferred\">\n        La demande que vous essayez de reprendre a d\u00E9j\u00E0 \u00E9t\u00E9 transmise, elle\n        n'est plus modifiable.\n    </div>\n\n    <foehn-form [shouldDisplayAlertSummary]=\"false\" *ngIf=\"otpRecipient\">\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                <foehn-input-text\n                    [label]=\"\n                        'Veuillez saisir le code envoy\u00E9 par SMS au num\u00E9ro ' +\n                        otpRecipient\n                    \"\n                    [(model)]=\"otp\"\n                    name=\"otp\"\n                    [required]=\"true\"\n                ></foehn-input-text>\n            </div>\n        </div>\n\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                Pour obtenir un nouveau code, vous devez recliquer sur le\n                <a [href]=\"redirectTarget\">lien</a>\n                de reprise de la demande\n            </div>\n        </div>\n\n        <br />\n\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                <captcha></captcha>\n\n                <button\n                    id=\"nextButton\"\n                    type=\"submit\"\n                    class=\"btn btn-dark float-end\"\n                    (click)=\"validateOtp()\"\n                >\n                    Suivant\n                </button>\n            </div>\n        </div>\n    </foehn-form>\n</div>\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: FoehnInputTextComponent, selector: "foehn-input-text", inputs: ["numberOnly"] }, { kind: "component", type: FoehnFormComponent, selector: "foehn-form", inputs: ["shouldDisplayAlertSummary"] }, { kind: "component", type: SdkRecaptchaComponent, selector: "captcha" }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.2.17", type: GesdemActionRecoveryLoginComponent, isStandalone: false, selector: "gesdem-action-recovery-login", inputs: { reference: "reference", redirectTarget: "redirectTarget" }, viewQueries: [{ propertyName: "loginForm", first: true, predicate: FoehnFormComponent, descendants: true }, { propertyName: "recaptchaComponent", first: true, predicate: SdkRecaptchaComponent, descendants: true }], ngImport: i0, template: "<div class=\"container mt-5\">\n    <div\n        class=\"alert alert-danger\"\n        *ngIf=\"demandeNotFound\"\n        [innerHTML]=\"'gesdem-error.text.demande-not-found' | fromDictionary\"\n    ></div>\n\n    <div class=\"alert alert-danger\" *ngIf=\"rateLimited\">\n        @if (rateLimitCounter > 0) {\n            <span\n                [innerHTML]=\"\n                    'gesdem-action-recovery-login.rate-limited.label'\n                        | fromDictionary\n                            : {\n                                  rateLimitCounter:\n                                      rateLimitCounter?.toString(),\n                                  plural: getPluralMarker(rateLimitCounter)\n                              }\n                \"\n            ></span>\n        } @else {\n            <span\n                [innerHTML]=\"\n                    'gesdem-action-recovery-login.request-now-code.label'\n                        | fromDictionary: { redirectTarget: redirectTarget }\n                \"\n            ></span>\n        }\n    </div>\n\n    <foehn-form [shouldDisplayAlertSummary]=\"false\" *ngIf=\"otpRecipient\">\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                <foehn-input-text\n                    [label]=\"\n                        'Veuillez saisir le code envoy\u00E9 par SMS au num\u00E9ro ' +\n                        otpRecipient\n                    \"\n                    [(model)]=\"otp\"\n                    name=\"otp\"\n                    [required]=\"true\"\n                ></foehn-input-text>\n            </div>\n        </div>\n\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                @if (rateLimitCounter > 0) {\n                    <span\n                        [innerHTML]=\"\n                            'gesdem-action-recovery-login.rate-limited.label'\n                                | fromDictionary\n                                    : {\n                                          rateLimitCounter:\n                                              rateLimitCounter?.toString(),\n                                          plural: getPluralMarker(\n                                              rateLimitCounter\n                                          )\n                                      }\n                        \"\n                    ></span>\n                } @else {\n                    <span\n                        [innerHTML]=\"\n                            'gesdem-action-recovery-login.request-now-code.label'\n                                | fromDictionary\n                                    : { redirectTarget: redirectTarget }\n                        \"\n                    ></span>\n                }\n            </div>\n        </div>\n\n        <br />\n\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                <captcha></captcha>\n\n                <button\n                    id=\"nextButton\"\n                    type=\"submit\"\n                    class=\"btn btn-dark float-end\"\n                    (click)=\"validateOtp()\"\n                >\n                    Suivant\n                </button>\n            </div>\n        </div>\n    </foehn-form>\n</div>\n", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: FoehnInputTextComponent, selector: "foehn-input-text", inputs: ["numberOnly"] }, { kind: "component", type: FoehnFormComponent, selector: "foehn-form", inputs: ["shouldDisplayAlertSummary"] }, { kind: "component", type: SdkRecaptchaComponent, selector: "captcha" }, { kind: "pipe", type: SdkDictionaryPipe, name: "fromDictionary" }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.17", ngImport: i0, type: GesdemActionRecoveryLoginComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'gesdem-action-recovery-login', standalone: false, template: "<div class=\"container mt-5\">\n    <div class=\"alert alert-danger\" *ngIf=\"missingRecoveryInfos\">\n        Vous n'avez pas indiqu\u00E9 d'informations de contact pour la reprise de\n        cette demande, merci de contacter le support.\n    </div>\n    <div class=\"alert alert-danger\" *ngIf=\"alreadyTransferred\">\n        La demande que vous essayez de reprendre a d\u00E9j\u00E0 \u00E9t\u00E9 transmise, elle\n        n'est plus modifiable.\n    </div>\n\n    <foehn-form [shouldDisplayAlertSummary]=\"false\" *ngIf=\"otpRecipient\">\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                <foehn-input-text\n                    [label]=\"\n                        'Veuillez saisir le code envoy\u00E9 par SMS au num\u00E9ro ' +\n                        otpRecipient\n                    \"\n                    [(model)]=\"otp\"\n                    name=\"otp\"\n                    [required]=\"true\"\n                ></foehn-input-text>\n            </div>\n        </div>\n\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                Pour obtenir un nouveau code, vous devez recliquer sur le\n                <a [href]=\"redirectTarget\">lien</a>\n                de reprise de la demande\n            </div>\n        </div>\n\n        <br />\n\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                <captcha></captcha>\n\n                <button\n                    id=\"nextButton\"\n                    type=\"submit\"\n                    class=\"btn btn-dark float-end\"\n                    (click)=\"validateOtp()\"\n                >\n                    Suivant\n                </button>\n            </div>\n        </div>\n    </foehn-form>\n</div>\n" }]
+            args: [{ selector: 'gesdem-action-recovery-login', standalone: false, template: "<div class=\"container mt-5\">\n    <div\n        class=\"alert alert-danger\"\n        *ngIf=\"demandeNotFound\"\n        [innerHTML]=\"'gesdem-error.text.demande-not-found' | fromDictionary\"\n    ></div>\n\n    <div class=\"alert alert-danger\" *ngIf=\"rateLimited\">\n        @if (rateLimitCounter > 0) {\n            <span\n                [innerHTML]=\"\n                    'gesdem-action-recovery-login.rate-limited.label'\n                        | fromDictionary\n                            : {\n                                  rateLimitCounter:\n                                      rateLimitCounter?.toString(),\n                                  plural: getPluralMarker(rateLimitCounter)\n                              }\n                \"\n            ></span>\n        } @else {\n            <span\n                [innerHTML]=\"\n                    'gesdem-action-recovery-login.request-now-code.label'\n                        | fromDictionary: { redirectTarget: redirectTarget }\n                \"\n            ></span>\n        }\n    </div>\n\n    <foehn-form [shouldDisplayAlertSummary]=\"false\" *ngIf=\"otpRecipient\">\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                <foehn-input-text\n                    [label]=\"\n                        'Veuillez saisir le code envoy\u00E9 par SMS au num\u00E9ro ' +\n                        otpRecipient\n                    \"\n                    [(model)]=\"otp\"\n                    name=\"otp\"\n                    [required]=\"true\"\n                ></foehn-input-text>\n            </div>\n        </div>\n\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                @if (rateLimitCounter > 0) {\n                    <span\n                        [innerHTML]=\"\n                            'gesdem-action-recovery-login.rate-limited.label'\n                                | fromDictionary\n                                    : {\n                                          rateLimitCounter:\n                                              rateLimitCounter?.toString(),\n                                          plural: getPluralMarker(\n                                              rateLimitCounter\n                                          )\n                                      }\n                        \"\n                    ></span>\n                } @else {\n                    <span\n                        [innerHTML]=\"\n                            'gesdem-action-recovery-login.request-now-code.label'\n                                | fromDictionary\n                                    : { redirectTarget: redirectTarget }\n                        \"\n                    ></span>\n                }\n            </div>\n        </div>\n\n        <br />\n\n        <div class=\"row\">\n            <div class=\"col-md-8\">\n                <captcha></captcha>\n\n                <button\n                    id=\"nextButton\"\n                    type=\"submit\"\n                    class=\"btn btn-dark float-end\"\n                    (click)=\"validateOtp()\"\n                >\n                    Suivant\n                </button>\n            </div>\n        </div>\n    </foehn-form>\n</div>\n" }]
         }], ctorParameters: () => [{ type: GesdemActionRecoveryService }, { type: GrowlBrokerService }, { type: FoehnConfirmModalService }, { type: ValidationHandlerService }, { type: ApplicationInfoService }, { type: GesdemHandlerService }, { type: SdkDictionaryService }, { type: i1$1.Router }, { type: i1$1.ActivatedRoute }, { type: SdkEventsLoggerService }], propDecorators: { reference: [{
                 type: Input
             }], redirectTarget: [{
@@ -5839,18 +5867,18 @@ class GesdemErrorComponent {
         }
     }
     ngOnInit() {
+        const errorCode = this.activatedRoute.snapshot.queryParamMap.get('errorCode');
         if (this.reference) {
             const firstPage = this.getFirstPage();
             if (this.gesdemService.prefix) {
                 this.link += `${this.gesdemService.prefix}/`;
             }
             this.link += `${this.reference}/${firstPage.path}`;
-            const errorCode = this.activatedRoute.snapshot.queryParamMap.get('errorCode');
             this.hasSessionExpired = errorCode === SESSION_EXPIRED;
             this.demandeShouldExist = errorCode === DEMANDE_SHOULD_EXIST;
             this.wrongEtapeRequested = errorCode === WRONG_ETAPE_REQUESTED;
-            this.demandeNotFound = errorCode === DEMANDE_NOT_FOUND;
         }
+        this.demandeNotFound = errorCode === OBJECT_NOT_FOUND;
         // The error might have been caused by an issue with the prestation that has been identified
         // whilst the user is using the prestation. This ensures that if any alert is added by the
         // administrator, the user will at least see them if an error is shown.