feat: introduce DateTimeProvider

manfredsteyer · Jul 3, 2020 · 0c0a4a7 · 0c0a4a7
1 parent 8d152c2
commit 0c0a4a7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/projects/lib/src/angular-oauth-oidc.module.ts b/projects/lib/src/angular-oauth-oidc.module.ts
@@ -1,3 +1,4 @@
+import { DateTimeProvider, SystemDateTimeProvider } from './date-time-provider';
 import { OAuthStorage, OAuthLogger } from './types';
 import { NgModule, ModuleWithProviders } from '@angular/core';
 import { CommonModule } from '@angular/common';
@@ -48,7 +49,8 @@ export class OAuthModule {
           provide: HTTP_INTERCEPTORS,
           useClass: DefaultOAuthInterceptor,
           multi: true
-        }
+        },
+        { provide: DateTimeProvider, useClass: SystemDateTimeProvider }
       ]
     };
   }

diff --git a/projects/lib/src/date-time-provider.ts b/projects/lib/src/date-time-provider.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+
+export abstract class DateTimeProvider {
+  abstract now(): number;
+  abstract new(): Date;
+}
+
+@Injectable()
+export class SystemDateTimeProvider extends DateTimeProvider {
+  now(): number {
+    return Date.now();
+  }
+
+  new(): Date {
+    return new Date();
+  }
+}
diff --git a/projects/lib/src/oauth-service.ts b/projects/lib/src/oauth-service.ts
@@ -26,6 +26,7 @@ import {
   catchError
 } from 'rxjs/operators';
 import { DOCUMENT } from '@angular/common';
+import { DateTimeProvider } from './date-time-provider';
 
 import {
   ValidationHandler,
@@ -120,7 +121,8 @@ export class OAuthService extends AuthConfig implements OnDestroy {
     protected urlHelper: UrlHelperService,
     protected logger: OAuthLogger,
     @Optional() protected crypto: HashHandler,
-    @Inject(DOCUMENT) document: any
+    @Inject(DOCUMENT) document: any,
+    protected dateTimeService: DateTimeProvider,
   ) {
     super();
 
@@ -463,7 +465,7 @@ export class OAuthService extends AuthConfig implements OnDestroy {
   }
 
   protected calcTimeout(storedAt: number, expiration: number): number {
-    const now = Date.now();
+    const now = this.dateTimeService.now();
     const delta =
       (expiration - storedAt) * this.timeoutFactor - (now - storedAt);
     return Math.max(0, delta);
@@ -1572,10 +1574,10 @@ export class OAuthService extends AuthConfig implements OnDestroy {
       this._storage.setItem('granted_scopes', JSON.stringify(grantedScopes));
     }
 
-    this._storage.setItem('access_token_stored_at', '' + Date.now());
+    this._storage.setItem('access_token_stored_at', '' + this.dateTimeService.now());
     if (expiresIn) {
       const expiresInMilliSeconds = expiresIn * 1000;
-      const now = new Date();
+      const now = this.dateTimeService.new();
       const expiresAt = now.getTime() + expiresInMilliSeconds;
       this._storage.setItem('expires_at', '' + expiresAt);
     }
@@ -1973,7 +1975,7 @@ export class OAuthService extends AuthConfig implements OnDestroy {
     this._storage.setItem('id_token', idToken.idToken);
     this._storage.setItem('id_token_claims_obj', idToken.idTokenClaimsJson);
     this._storage.setItem('id_token_expires_at', '' + idToken.idTokenExpiresAt);
-    this._storage.setItem('id_token_stored_at', '' + Date.now());
+    this._storage.setItem('id_token_stored_at', '' + this.dateTimeService.now());
   }
 
   protected storeSessionState(sessionState: string): void {
@@ -2094,7 +2096,7 @@ export class OAuthService extends AuthConfig implements OnDestroy {
       return Promise.reject(err);
     }
 
-    const now = Date.now();
+    const now = this.dateTimeService.now();
     const issuedAtMSec = claims.iat * 1000;
     const expiresAtMSec = claims.exp * 1000;
     const clockSkewInMSec = (this.clockSkewInSec || 600) * 1000;
@@ -2254,7 +2256,7 @@ export class OAuthService extends AuthConfig implements OnDestroy {
   public hasValidAccessToken(): boolean {
     if (this.getAccessToken()) {
       const expiresAt = this._storage.getItem('expires_at');
-      const now = new Date();
+      const now = this.dateTimeService.new();
       if (expiresAt && parseInt(expiresAt, 10) < now.getTime()) {
         return false;
       }
@@ -2271,7 +2273,7 @@ export class OAuthService extends AuthConfig implements OnDestroy {
   public hasValidIdToken(): boolean {
     if (this.getIdToken()) {
       const expiresAt = this._storage.getItem('id_token_expires_at');
-      const now = new Date();
+      const now = this.dateTimeService.new();
       if (expiresAt && parseInt(expiresAt, 10) < now.getTime()) {
         return false;
       }

diff --git a/projects/lib/src/public_api.ts b/projects/lib/src/public_api.ts
@@ -12,3 +12,4 @@ export * from './events';
 export * from './interceptors/default-oauth.interceptor';
 export * from './interceptors/resource-server-error-handler';
 export * from './oauth-module.config';
+export * from './date-time-provider';