Browse Source

Login problems fixed (I hope): #71

pull/65/merge
Sebastian Stehle 9 years ago
parent
commit
6cb48028ea
  1. 2
      src/Squidex/app/shared/services/apps-store.service.ts
  2. 12
      src/Squidex/app/shared/services/auth.service.ts

2
src/Squidex/app/shared/services/apps-store.service.ts

@ -18,7 +18,7 @@ import {
@Injectable() @Injectable()
export class AppsStoreService { export class AppsStoreService {
private readonly apps$ = new ReplaySubject<AppDto[]>(); private readonly apps$ = new ReplaySubject<AppDto[]>(1);
private readonly app$ = new BehaviorSubject<AppDto | null>(null); private readonly app$ = new BehaviorSubject<AppDto | null>(null);
public get apps(): Observable<AppDto[]> { public get apps(): Observable<AppDto[]> {

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

@ -54,7 +54,7 @@ export class Profile {
@Injectable() @Injectable()
export class AuthService { export class AuthService {
private readonly userManager: UserManager; private readonly userManager: UserManager;
private readonly user$ = new ReplaySubject<Profile | null>(); private readonly user$ = new ReplaySubject<Profile | null>(1);
private currentUser: Profile = null; private currentUser: Profile = null;
public get user(): Profile | null { public get user(): Profile | null {
@ -96,7 +96,7 @@ export class AuthService {
this.currentUser = user; this.currentUser = user;
}); });
this.userManager.signinSilent(); this.checkState(this.userManager.signinSilent());
} }
public logoutRedirect(): Observable<any> { public logoutRedirect(): Observable<any> {
@ -118,4 +118,12 @@ export class AuthService {
public loginRedirectComplete(): Observable<any> { public loginRedirectComplete(): Observable<any> {
return Observable.fromPromise(this.userManager.signinRedirectCallback()); return Observable.fromPromise(this.userManager.signinRedirectCallback());
} }
private checkState(promise: Promise<User>) {
promise.catch((err) => {
this.user$.next(null);
return false;
});
}
} }
Loading…
Cancel
Save