Fix interval service injection and use of setInterval

damienbod · Mar 21, 2024 · d2da01e · d2da01e
1 parent f2ceaef
commit d2da01e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/projects/angular-auth-oidc-client/src/lib/callback/code-flow-callback.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/callback/code-flow-callback.service.spec.ts
@@ -23,7 +23,7 @@ describe('CodeFlowCallbackService ', () => {
         CodeFlowCallbackService,
         mockProvider(FlowsService),
         mockProvider(FlowsDataService),
-        IntervalService,
+        mockProvider(IntervalService),
       ],
     });
   });

diff --git a/projects/angular-auth-oidc-client/src/lib/callback/implicit-flow-callback.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/callback/implicit-flow-callback.service.spec.ts
@@ -20,10 +20,9 @@ describe('ImplicitFlowCallbackService ', () => {
     TestBed.configureTestingModule({
       imports: [RouterTestingModule],
       providers: [
-        ImplicitFlowCallbackService,
         mockProvider(FlowsService),
         mockProvider(FlowsDataService),
-        IntervalService,
+        mockProvider(IntervalService),
       ],
     });
   });

diff --git a/projects/angular-auth-oidc-client/src/lib/callback/interval.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/callback/interval.service.spec.ts
@@ -7,7 +7,16 @@ describe('IntervalService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [IntervalService],
+      providers: [
+        {
+          provide: Document,
+          useValue: {
+            defaultView: {
+              setInterval: window.setInterval,
+            },
+          },
+        },
+      ],
     });
   });
 

diff --git a/projects/angular-auth-oidc-client/src/lib/callback/interval.service.ts b/projects/angular-auth-oidc-client/src/lib/callback/interval.service.ts
@@ -1,11 +1,13 @@
-import { Injectable, NgZone } from '@angular/core';
+import { Injectable, NgZone, inject } from '@angular/core';
 import { Observable, Subscription } from 'rxjs';
 
 @Injectable({ providedIn: 'root' })
 export class IntervalService {
-  runTokenValidationRunning: Subscription | null = null;
+  private readonly zone = inject(NgZone);
+
+  private readonly document = inject<Document>(Document);
 
-  constructor(private readonly zone: NgZone) {}
+  runTokenValidationRunning: Subscription | null = null;
 
   isTokenValidationRunning(): boolean {
     return Boolean(this.runTokenValidationRunning);
@@ -22,10 +24,10 @@ export class IntervalService {
     const millisecondsDelayBetweenTokenCheck = repeatAfterSeconds * 1000;
 
     return new Observable((subscriber) => {
-      let intervalId?: number;
+      let intervalId: number | undefined;
 
       this.zone.runOutsideAngular(() => {
-        intervalId = setInterval(
+        intervalId = this.document?.defaultView?.setInterval(
           () => this.zone.run(() => subscriber.next()),
           millisecondsDelayBetweenTokenCheck
         );

diff --git a/projects/angular-auth-oidc-client/src/lib/callback/periodically-token-check.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/callback/periodically-token-check.service.spec.ts
@@ -43,7 +43,7 @@ describe('PeriodicallyTokenCheckService', () => {
         mockProvider(AuthStateService),
         mockProvider(RefreshSessionIframeService),
         mockProvider(RefreshSessionRefreshTokenService),
-        IntervalService,
+        mockProvider(IntervalService),
         mockProvider(StoragePersistenceService),
         mockProvider(PublicEventsService),
         mockProvider(ConfigurationService),
@@ -67,6 +67,8 @@ describe('PeriodicallyTokenCheckService', () => {
     resetAuthDataService = TestBed.inject(ResetAuthDataService);
     publicEventsService = TestBed.inject(PublicEventsService);
     configurationService = TestBed.inject(ConfigurationService);
+
+    spyOn(intervalService, 'startPeriodicTokenCheck').and.returnValue(of(null));
   });
 
   afterEach(() => {
@@ -154,9 +156,6 @@ describe('PeriodicallyTokenCheckService', () => {
         { silentRenew: true, configId: 'configId1', tokenRefreshInSeconds: 1 },
       ];
 
-      spyOn(intervalService, 'startPeriodicTokenCheck').and.returnValue(
-        of(null)
-      );
       spyOn(
         periodicallyTokenCheckService as any,
         'shouldStartPeriodicallyCheckForConfig'
@@ -196,9 +195,6 @@ describe('PeriodicallyTokenCheckService', () => {
         { silentRenew: true, configId: 'configId1', tokenRefreshInSeconds: 1 },
       ];
 
-      spyOn(intervalService, 'startPeriodicTokenCheck').and.returnValue(
-        of(null)
-      );
       spyOn(
         periodicallyTokenCheckService as any,
         'shouldStartPeriodicallyCheckForConfig'

diff --git a/...s/angular-auth-oidc-client/src/lib/callback/refresh-session-refresh-token.service.spec.ts b/...s/angular-auth-oidc-client/src/lib/callback/refresh-session-refresh-token.service.spec.ts
@@ -22,7 +22,7 @@ describe('RefreshSessionRefreshTokenService', () => {
         mockProvider(LoggerService),
         mockProvider(FlowsService),
         mockProvider(ResetAuthDataService),
-        IntervalService,
+        mockProvider(IntervalService),
       ],
     });
   });

diff --git a/projects/angular-auth-oidc-client/src/lib/iframe/silent-renew.service.spec.ts b/projects/angular-auth-oidc-client/src/lib/iframe/silent-renew.service.spec.ts
@@ -37,8 +37,8 @@ describe('SilentRenewService  ', () => {
         mockProvider(AuthStateService),
         mockProvider(LoggerService),
         mockProvider(ImplicitFlowCallbackService),
+        mockProvider(IntervalService),
         FlowHelper,
-        IntervalService,
       ],
     });
   });