Browse Source

Small bufix

pull/1/head
Sebastian 9 years ago
parent
commit
58b1274d74
  1. 2
      src/Squidex/app/components/auth/logout-page.component.ts
  2. 2
      src/Squidex/app/components/layout/profile-menu.component.ts
  3. 10
      src/Squidex/app/shared/services/auth.service.ts

2
src/Squidex/app/components/auth/logout-page.component.ts

@ -22,7 +22,7 @@ export class LogoutPageComponent implements Ng2.OnInit {
} }
public ngOnInit() { public ngOnInit() {
this.auth.logoutComplete().subscribe( this.auth.logoutRedirectComplete().subscribe(
() => { () => {
this.router.navigate(['/'], { replaceUrl: true }); this.router.navigate(['/'], { replaceUrl: true });
}, },

2
src/Squidex/app/components/layout/profile-menu.component.ts

@ -51,6 +51,6 @@ export class ProfileMenuComponent implements Ng2.OnInit, Ng2.OnDestroy {
} }
public logout() { public logout() {
this.auth.logout(); this.auth.logoutRedirect();
} }
} }

10
src/Squidex/app/shared/services/auth.service.ts

@ -108,19 +108,19 @@ export class AuthService {
} }
} }
public logout(): Observable<any> { public logoutRedirect(): Observable<any> {
return Observable.fromPromise(this.userManager.signoutRedirect()); return Observable.fromPromise(this.userManager.signoutRedirect());
} }
public logoutComplete(): Observable<any> { public logoutRedirectComplete(): Observable<any> {
return Observable.fromPromise(this.userManager.signoutRedirectCallback()); return Observable.fromPromise(this.userManager.signoutRedirectCallback());
} }
public login(): Observable<any> { public loginRedirect(): Observable<any> {
return Observable.fromPromise(this.userManager.signinRedirect()); return Observable.fromPromise(this.userManager.signinRedirect());
} }
public loginComplete(): Observable<any> { public loginRedirectComplete(): Observable<any> {
return Observable.fromPromise(this.userManager.signinRedirectCallback()); return Observable.fromPromise(this.userManager.signinRedirectCallback());
} }
@ -195,7 +195,7 @@ export class AuthService {
private checkResponse(response: Observable<Ng2Http.Response>) { private checkResponse(response: Observable<Ng2Http.Response>) {
return response.catch((error: Ng2Http.Response) => { return response.catch((error: Ng2Http.Response) => {
if (error.status === 401) { if (error.status === 401) {
this.login(); this.loginRedirect();
} else if (error.status === 403) { } else if (error.status === 403) {
this.router.navigate(['/404']); this.router.navigate(['/404']);
} }

Loading…
Cancel
Save