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-22334] ADW - User information not displayed when Kerberos is in use (#7172)

Browse Source 
* [MNT-22334] ADW - User information not displayed when Kerberos is in use

* * enable kerberos

* * added test

* Revert "* enable kerberos"
This commit is contained in:
Dharan
2021-08-02 15:00:09 +05:30
committed by GitHub
parent 94d908e51a
commit 4befb779f8
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/core/services/authentication.service.spec.ts
View File

@@ -65,6 +65,7 @@ describe('AuthenticationService', () => {
beforeEach(() => { beforeEach(() => {
appConfigService.config.providers = 'ECM'; appConfigService.config.providers = 'ECM';
appConfigService.config.auth = { withCredentials: false };
appConfigService.load(); appConfigService.load();
apiService.reset(); apiService.reset();
}); });
@@ -186,12 +187,20 @@ describe('AuthenticationService', () => {
it('[ECM] should return isBpmLoggedIn false', () => { it('[ECM] should return isBpmLoggedIn false', () => {
expect(authService.isBpmLoggedIn()).toBe(false); expect(authService.isBpmLoggedIn()).toBe(false);
}); });
it('[ECM] should return true if kerberos configured', () => {
appConfigService.config.auth.withCredentials = true ;
expect(authService.isLoggedInWith('ECM')).toBe(true);
expect(authService.isLoggedIn()).toBe(true);
});
}); });
describe('when the setting is BPM', () => { describe('when the setting is BPM', () => {
beforeEach(() => { beforeEach(() => {
appConfigService.config.providers = 'BPM'; appConfigService.config.providers = 'BPM';
appConfigService.config.auth = { withCredentials: false };
appConfigService.load(); appConfigService.load();
apiService.reset(); apiService.reset();
}); });
@@ -321,6 +330,7 @@ describe('AuthenticationService', () => {
beforeEach(() => { beforeEach(() => {
appConfigService.config.providers = 'ECM'; appConfigService.config.providers = 'ECM';
appConfigService.config.auth = { withCredentials: false };
appConfigService.load(); appConfigService.load();
apiService.reset(); apiService.reset();
}); });
@@ -385,6 +395,7 @@ describe('AuthenticationService', () => {
beforeEach(() => { beforeEach(() => {
appConfigService.config.providers = 'ALL'; appConfigService.config.providers = 'ALL';
appConfigService.config.auth = { withCredentials: false };
appConfigService.load(); appConfigService.load();
apiService.reset(); apiService.reset();
}); });

12
lib/core/services/authentication.service.ts
View File

@@ -64,6 +64,10 @@ export class AuthenticationService {
* @returns True if logged in, false otherwise * @returns True if logged in, false otherwise
*/ */
isLoggedIn(): boolean { isLoggedIn(): boolean {
if (this.isKerberosConfigured()) {
return true;
}
if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) { if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) {
return false; return false;
} }
@@ -224,6 +228,10 @@ export class AuthenticationService {
* @returns True if logged in, false otherwise * @returns True if logged in, false otherwise
*/ */
isEcmLoggedIn(): boolean { isEcmLoggedIn(): boolean {
if (this.isKerberosConfigured()) {
return true;
}
if (this.isECMProvider() || this.isALLProvider()) { if (this.isECMProvider() || this.isALLProvider()) {
if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) { if (!this.isOauth() && this.cookie.isEnabled() && !this.isRememberMeSet()) {
return false; return false;
@@ -247,6 +255,10 @@ export class AuthenticationService {
return false; return false;
} }
isKerberosConfigured(): boolean {
return this.appConfig.get<boolean>(AppConfigValues.AUTH_WITH_CREDENTIALS, false);
}
/** /**
* Gets the ECM username. * Gets the ECM username.
* @returns The ECM username * @returns The ECM username