From 58b1274d74da063b3ac8fa39f914159c55d9e5d1 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 7 Dec 2016 23:48:41 +0100 Subject: [PATCH] Small bufix --- .../app/components/auth/logout-page.component.ts | 2 +- .../app/components/layout/profile-menu.component.ts | 2 +- src/Squidex/app/shared/services/auth.service.ts | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Squidex/app/components/auth/logout-page.component.ts b/src/Squidex/app/components/auth/logout-page.component.ts index 344ad62fc..ce8ac8f0d 100644 --- a/src/Squidex/app/components/auth/logout-page.component.ts +++ b/src/Squidex/app/components/auth/logout-page.component.ts @@ -22,7 +22,7 @@ export class LogoutPageComponent implements Ng2.OnInit { } public ngOnInit() { - this.auth.logoutComplete().subscribe( + this.auth.logoutRedirectComplete().subscribe( () => { this.router.navigate(['/'], { replaceUrl: true }); }, diff --git a/src/Squidex/app/components/layout/profile-menu.component.ts b/src/Squidex/app/components/layout/profile-menu.component.ts index 0d734e5f4..ddb8d69d4 100644 --- a/src/Squidex/app/components/layout/profile-menu.component.ts +++ b/src/Squidex/app/components/layout/profile-menu.component.ts @@ -51,6 +51,6 @@ export class ProfileMenuComponent implements Ng2.OnInit, Ng2.OnDestroy { } public logout() { - this.auth.logout(); + this.auth.logoutRedirect(); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/auth.service.ts b/src/Squidex/app/shared/services/auth.service.ts index f707040cd..b3230b599 100644 --- a/src/Squidex/app/shared/services/auth.service.ts +++ b/src/Squidex/app/shared/services/auth.service.ts @@ -108,19 +108,19 @@ export class AuthService { } } - public logout(): Observable { + public logoutRedirect(): Observable { return Observable.fromPromise(this.userManager.signoutRedirect()); } - public logoutComplete(): Observable { + public logoutRedirectComplete(): Observable { return Observable.fromPromise(this.userManager.signoutRedirectCallback()); } - public login(): Observable { + public loginRedirect(): Observable { return Observable.fromPromise(this.userManager.signinRedirect()); } - public loginComplete(): Observable { + public loginRedirectComplete(): Observable { return Observable.fromPromise(this.userManager.signinRedirectCallback()); } @@ -195,7 +195,7 @@ export class AuthService { private checkResponse(response: Observable) { return response.catch((error: Ng2Http.Response) => { if (error.status === 401) { - this.login(); + this.loginRedirect(); } else if (error.status === 403) { this.router.navigate(['/404']); }