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

[ADF-5465] Not being redirected to login page when Kerberos is enabled (#7348)

Browse Source 
* [ADF-5465] Not being redirected to login page when Kerberos is enabled

* [ci:force] force CI

* [ci:force] force CI
This commit is contained in:
Dharan
2021-11-04 16:25:30 +05:30
committed by GitHub
parent 736b91a65e
commit 15d91ca5e0
2 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/core/userinfo/components/user-info.component.ts
View File

@@ -25,7 +25,6 @@ import { EcmUserService } from '../../services/ecm-user.service';
import { IdentityUserService } from '../../services/identity-user.service';
import { of, Observable, Subject } from 'rxjs';
import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/menu';
import { filter, takeUntil } from 'rxjs/operators';
@Component({
selector: 'adf-userinfo',
@@ -75,11 +74,6 @@ export class UserInfoComponent implements OnInit, OnDestroy {
private bpmUserService: BpmUserService,
private identityUserService: IdentityUserService,
private authService: AuthenticationService) {
this.authService.onLogin
.pipe(
filter(() => this.authService.isKerberosEnabled()),
takeUntil(this.destroy$)
).subscribe(() => this.getUserInfo());
}
ngOnInit() {
@@ -100,14 +94,14 @@ export class UserInfoComponent implements OnInit, OnDestroy {
this.loadEcmUserInfo();
}
} else if (this.authService.isEcmLoggedIn() && this.authService.isBpmLoggedIn()) {
} else if (this.isAllLoggedIn()) {
this.loadEcmUserInfo();
this.loadBpmUserInfo();
this.mode = 'ALL';
} else if (this.authService.isEcmLoggedIn()) {
} else if (this.isEcmLoggedIn()) {
this.loadEcmUserInfo();
this.mode = 'CONTENT';
} else if (this.authService.isBpmLoggedIn()) {
} else if (this.isBpmLoggedIn()) {
this.loadBpmUserInfo();
this.mode = 'PROCESS';
}
@@ -124,6 +118,9 @@ export class UserInfoComponent implements OnInit, OnDestroy {
}
get isLoggedIn(): boolean {
if (this.authService.isKerberosEnabled()) {
return true;
}
return this.authService.isLoggedIn();
}
@@ -139,6 +136,18 @@ export class UserInfoComponent implements OnInit, OnDestroy {
this.identityUser$ = of(this.identityUserService.getCurrentUserInfo());
}
private isAllLoggedIn() {
return (this.authService.isEcmLoggedIn() && this.authService.isBpmLoggedIn()) || (this.authService.isALLProvider() && this.authService.isKerberosEnabled());
}
private isBpmLoggedIn() {
return this.authService.isBpmLoggedIn() || (this.authService.isECMProvider() && this.authService.isKerberosEnabled());
}
private isEcmLoggedIn() {
return this.authService.isEcmLoggedIn() || (this.authService.isECMProvider() && this.authService.isKerberosEnabled());
}
stopClosing(event: Event) {
event.stopPropagation();
}