inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MNT-21636] Fix redirect URL for viewer (#6564)

Browse Source 
* fix redirect URL for viewer

* fix unit
fix login SSO show when user is logged in

* update js-api

* remove protractor change
This commit is contained in:
Eugenio Romano
2021-01-22 17:17:14 +00:00
committed by GitHub
parent b126c14a07
commit 8f0633b133
9 changed files with 99 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/core/services/auth-guard.service.ts
View File

@@ -45,23 +45,23 @@ export class AuthGuard extends AuthGuardBase {
ticketChange(event: StorageEvent) {
if (event.key.includes('ticket-ECM') && event.newValue !== event.oldValue) {
this.ticketChangeRedirect(event, 'ECM');
this.ticketChangeRedirect(event);
}
if (event.key.includes('ticket-BPM') && event.newValue !== event.oldValue) {
this.ticketChangeRedirect(event, 'BPM');
this.ticketChangeRedirect(event);
}
if (event.key.endsWith(JwtHelperService.USER_ACCESS_TOKEN) &&
this.jwtHelperService.getValueFromToken(event.newValue, JwtHelperService.USER_PREFERRED_USERNAME) !==
this.jwtHelperService.getValueFromToken(event.oldValue, JwtHelperService.USER_PREFERRED_USERNAME)) {
this.ticketChangeRedirect(event, 'ALL');
this.ticketChangeRedirect(event);
}
}
private ticketChangeRedirect(event: StorageEvent, provider: string) {
private ticketChangeRedirect(event: StorageEvent) {
if (!event.newValue) {
this.redirectToUrl(provider, this.router.url);
this.redirectToUrl(this.router.url);
} else {
window.location.reload();
}
@@ -71,7 +71,7 @@ export class AuthGuard extends AuthGuardBase {
if (this.authenticationService.isLoggedIn() || this.withCredentials) {
return true;
}
this.redirectToUrl('ALL', redirectUrl);
this.redirectToUrl( redirectUrl);
return false;
}
}