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

48
lib/core/services/auth-guard-base.ts
View File

@@ -50,7 +50,6 @@ export abstract class AuthGuardBase implements CanActivate, CanActivateChild {
private storageService: StorageService
) {
}
ls;
abstract checkLogin(
activeRoute: ActivatedRouteSnapshot,
@@ -63,11 +62,14 @@ ls;
): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
const redirectFragment = this.storageService.getItem('loginFragment');
if (this.authenticationService.isLoggedIn() || this.withCredentials) {
if (redirectFragment) {
if (redirectFragment && this.getLoginRoute() !== redirectFragment) {
this.storageService.removeItem('loginFragment');
return this.router.createUrlTree([redirectFragment]);
this.redirectToUrl(redirectFragment);
}
return true;
}
@@ -86,24 +88,32 @@ ls;
): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
return this.canActivate(route, state);
}
protected redirectToUrl(provider: string, url: string) {
const pathToLogin = `/${this.getLoginRoute()}`;
protected redirectToUrl(url: string) {
let urlToRedirect;
this.dialog.closeAll();
if (!this.authenticationService.isOauth()) {
this.authenticationService.setRedirect({ provider, url });
if (!this.authenticationService.isLoggedIn()) {
const pathToLogin = `/${this.getLoginRoute()}`;
urlToRedirect = `${pathToLogin}?redirectUrl=${url}`;
this.router.navigateByUrl(urlToRedirect);
} else if (this.getOauthConfig().silentLogin && !this.authenticationService.isPublicUrl()) {
this.authenticationService.ssoImplicitLogin();
if (!this.authenticationService.isOauth()) {
this.authenticationService.setRedirect({
provider: this.getProvider(),
url
});
urlToRedirect = `${pathToLogin}?redirectUrl=${url}`;
this.router.navigateByUrl(urlToRedirect);
} else if (this.getOauthConfig().silentLogin && !this.authenticationService.isPublicUrl()) {
this.authenticationService.ssoImplicitLogin();
} else {
urlToRedirect = pathToLogin;
this.router.navigateByUrl(urlToRedirect);
}
} else {
urlToRedirect = pathToLogin;
this.router.navigateByUrl(urlToRedirect);
this.router.navigateByUrl(url);
}
}
protected getOauthConfig(): OauthConfigModel {
@@ -126,6 +136,16 @@ ls;
);
}
protected getProvider(): string {
return (
this.appConfigService &&
this.appConfigService.get<string>(
AppConfigValues.PROVIDERS,
'ALL'
)
);
}
protected isOAuthWithoutSilentLogin(): boolean {
const oauth = this.appConfigService.get<OauthConfigModel>(
AppConfigValues.OAUTHCONFIG,