Skip to content

Unsubscribe from 'token_received' events before re-subscribing #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 2, 2020
Merged

Unsubscribe from 'token_received' events before re-subscribing #630

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28fc83e
Unsubscribe from 'token_received' events before re-subscribing
Sep 18, 2019
3214937
Merge branch 'master' into setupRefreshTimer
l1b3r Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion projects/lib/src/oauth-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export class OAuthService extends AuthConfig implements OnDestroy {
protected _storage: OAuthStorage;
protected accessTokenTimeoutSubscription: Subscription;
protected idTokenTimeoutSubscription: Subscription;
protected tokenReceivedSubscription: Subscription;
protected sessionCheckEventListener: EventListener;
protected jwksUri: string;
protected sessionCheckTimer: any;
Expand Down Expand Up @@ -304,7 +305,10 @@ export class OAuthService extends AuthConfig implements OnDestroy {
this.setupExpirationTimers();
}

this.events.pipe(filter(e => e.type === 'token_received')).subscribe(_ => {
if (this.tokenReceivedSubscription)
this.tokenReceivedSubscription.unsubscribe();

this.tokenReceivedSubscription = this.events.pipe(filter(e => e.type === 'token_received')).subscribe(_ => {
this.clearAccessTokenTimer();
this.clearIdTokenTimer();
this.setupExpirationTimers();
Expand Down