Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature(stark-ui): add logout button on the Session Timeout Warning dialog #3479

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feature(stark-ui): add logout button on the Session Timeout Warning dialog #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/stark-ui/src/modules/session-ui/assets/translations/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/stark-ui/src/modules/session-ui/assets/translations/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/stark-ui/src/modules/session-ui/assets/translations/nl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions ...i/components/session-timeout-warning-dialog/session-timeout-warning-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 10 additions & 0 deletions ...omponents/session-timeout-warning-dialog/session-timeout-warning-dialog.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}));
});
});
4 changes: 4 additions & 0 deletions ...-ui/components/session-timeout-warning-dialog/session-timeout-warning-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
8 changes: 6 additions & 2 deletions packages/stark-ui/src/modules/session-ui/effects/session-timeout-warning.effects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
});
})
Expand Down
2 changes: 1 addition & 1 deletion showcase/src/stark-app-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"logoutUrl": "http://localhost:5001/logout",
"baseUrl": "/",
"sessionTimeout": 1337,
"sessionTimeoutWarningPeriod": 20,
"sessionTimeoutWarningPeriod": 20,
"keepAliveUrl": "http://localhost:5000/keepalive",
"keepAliveInterval": 20,
"angularDebugInfoEnabled": null,
Expand Down