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-3938] withCredentials TRUE the authguard should be skipped (#4259)

Browse Source 
* should skip authguard if withCredentials is true

* missing comma

* common auth guard fix
This commit is contained in:
Eugenio Romano
2019-02-05 00:31:32 +00:00
committed by GitHub
parent bf718d905f
commit da379eefd7
7 changed files with 80 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,9 +27,10 @@ import { OauthConfigModel } from '../models/oauth-config.model';
providedIn: 'root'
})
export class AuthGuardEcm implements CanActivate {
constructor(private authService: AuthenticationService,
private router: Router,
private appConfig: AppConfigService) {
private appConfigService: AppConfigService) {
}
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
@@ -41,7 +42,9 @@ export class AuthGuardEcm implements CanActivate {
}
checkLogin(redirectUrl: string): boolean {
if (this.authService.isEcmLoggedIn()) {
let withCredentialsMode = this.appConfigService.get<boolean>('auth.withCredentials', false);
if (this.authService.isEcmLoggedIn() || withCredentialsMode) {
return true;
}
@@ -55,13 +58,13 @@ export class AuthGuardEcm implements CanActivate {
}
isOAuthWithoutSilentLogin() {
let oauth: OauthConfigModel = this.appConfig.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null);
let oauth: OauthConfigModel = this.appConfigService.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null);
return this.authService.isOauth() && oauth.silentLogin === false;
}
private getRouteDestinationForLogin(): string {
return this.appConfig &&
this.appConfig.get<string>(AppConfigValues.LOGIN_ROUTE) ?
this.appConfig.get<string>(AppConfigValues.LOGIN_ROUTE) : 'login';
return this.appConfigService &&
this.appConfigService.get<string>(AppConfigValues.LOGIN_ROUTE) ?
this.appConfigService.get<string>(AppConfigValues.LOGIN_ROUTE) : 'login';
}
}