fix(stark-ui): add logout button on the Session Timeout Warning dialog

ISSUES CLOSED: #1731
NationalBankBelgium · Sep 20, 2022 · 2474767 · 2474767
1 parent 3dd16dd
commit 2474767
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 2 deletions.
diff --git a/packages/stark-ui/src/modules/session-ui/assets/translations/en.ts b/packages/stark-ui/src/modules/session-ui/assets/translations/en.ts
@@ -24,6 +24,7 @@ export const translationsEn: object = {
 			LOGIN: "Log in again"
 		},
 		SESSION_TIMEOUT: {
+			CLOSE_SESSION: "Logout",
 			SECONDS: " seconds.",
 			STAY_CONNECTED: "Stay connected",
 			TITLE: "Session about to expire",

diff --git a/packages/stark-ui/src/modules/session-ui/assets/translations/fr.ts b/packages/stark-ui/src/modules/session-ui/assets/translations/fr.ts
@@ -24,6 +24,7 @@ export const translationsFr: object = {
 			LOGIN: "Connexion"
 		},
 		SESSION_TIMEOUT: {
+			CLOSE_SESSION: "Se déconnecter",
 			SECONDS: " secondes.",
 			STAY_CONNECTED: "Rester connecté",
 			TITLE: "Session sur le point d'expirer",

diff --git a/packages/stark-ui/src/modules/session-ui/assets/translations/nl.ts b/packages/stark-ui/src/modules/session-ui/assets/translations/nl.ts
@@ -24,6 +24,7 @@ export const translationsNl: object = {
 			LOGIN: "Opnieuw aanmelden"
 		},
 		SESSION_TIMEOUT: {
+			CLOSE_SESSION: "Afmelden",
 			SECONDS: " seconden vervallen.",
 			STAY_CONNECTED: "Blijf verbonden",
 			TITLE: "Sessie verlopen",

diff --git a/...i/components/session-timeout-warning-dialog/session-timeout-warning-dialog.component.html b/...i/components/session-timeout-warning-dialog/session-timeout-warning-dialog.component.html
@@ -11,5 +11,8 @@ <h1 mat-dialog-title translate>STARK.SESSION_TIMEOUT.TITLE</h1>
 		<button mat-raised-button color="primary" (click)="keepSession()" aria-label="Close Dialog">
 			<span translate>STARK.SESSION_TIMEOUT.STAY_CONNECTED</span>
 		</button>
+		<button mat-raised-button (click)="closeSession()" aria-label="Close Dialog">
+			<span translate>STARK.SESSION_TIMEOUT.CLOSE_SESSION</span>
+		</button>
 	</div>
 </div>
diff --git a/...omponents/session-timeout-warning-dialog/session-timeout-warning-dialog.component.spec.ts b/...omponents/session-timeout-warning-dialog/session-timeout-warning-dialog.component.spec.ts
@@ -68,4 +68,14 @@ describe("SessionTimeoutWarningDialogComponent", () => {
 			expect(mockDialogRef.close).toHaveBeenCalledWith("keep-logged");
 		}));
 	});
+
+	describe("closeSession", () => {
+		it("should close the windows when the button is clicked", fakeAsync(() => {
+			component.ngOnInit();
+			component.closeSession();
+
+			expect(mockDialogRef.close).toHaveBeenCalledTimes(1);
+			expect(mockDialogRef.close).toHaveBeenCalledWith("close-session");
+		}));
+	});
 });
diff --git a/...-ui/components/session-timeout-warning-dialog/session-timeout-warning-dialog.component.ts b/...-ui/components/session-timeout-warning-dialog/session-timeout-warning-dialog.component.ts
@@ -59,4 +59,8 @@ export class StarkSessionTimeoutWarningDialogComponent implements OnInit {
 	public keepSession(): void {
 		this.dialogRef.close("keep-logged");
 	}
+
+	public closeSession(): void {
+		this.dialogRef.close("close-session");
+	}
 }
diff --git a/packages/stark-ui/src/modules/session-ui/effects/session-timeout-warning.effects.ts b/packages/stark-ui/src/modules/session-ui/effects/session-timeout-warning.effects.ts
@@ -49,8 +49,12 @@ export class StarkSessionTimeoutWarningDialogEffects implements OnRunEffects {
 						})
 						.afterClosed()
 						.subscribe((result: string) => {
-							if (result && result === "keep-logged") {
-								this.sessionService.resumeUserActivityTracking();
+							if (result) {
+								if (result === "keep-logged") {
+									this.sessionService.resumeUserActivityTracking();
+								} else if (result === "close-session") {
+									this.sessionService.logout();
+								}
 							}
 						});
 				})