issue #309

Author: manfredsteyer

README.md

@@ -38,9 +38,9 @@ Successfully tested with **Angular 6** and its Router, PathLocationStrategy as w
 
 # Features 
 - Logging in via OAuth2 and OpenId Connect (OIDC) Implicit Flow (where user is redirected to Identity Provider)
-- "Logging in" via Password Flow (where user enters his/her password into the client)
+- "Logging in" via Password Flow (where user enters their password into the client)
 - Token Refresh for Password Flow by using a Refresh Token
-- Automatically refreshing a token when/ some time before it expires
+- Automatically refreshing a token when/some time before it expires
 - Querying Userinfo Endpoint
 - Querying Discovery Document to ease configuration
 - Validating claims of the id_token regarding the specs
@@ -49,7 +49,7 @@ Successfully tested with **Angular 6** and its Router, PathLocationStrategy as w
 
 ## Sample-Auth-Server
 
-You can use the OIDC-Sample-Server mentioned in the samples for Testing. It assumes, that your Web-App runns on http://localhost:8080.
+You can use the OIDC-Sample-Server mentioned in the samples for Testing. It assumes, that your Web-App runs on http://localhost:8080.
 
 Username/Password: max/geheim
 
@@ -101,7 +101,7 @@ Single Page Application. It sends the user to the Identity Provider's login page
 This also allows for single sign on as well as single sign off.
 
 To configure the library the following sample uses the new configuration API introduced with Version 2.1.
-Hence, The original API is still supported.
+Hence, the original API is still supported.
 
 ```TypeScript
 import { AuthConfig } from 'angular-oauth2-oidc';
@@ -206,7 +206,7 @@ The following snippet contains the template for the login page:
 
 ### Skipping the Login Form
 
-If you don't want to display a login form that tells the user that they are redirected to the identity server, you can use the convenince function ``this.oauthService.loadDiscoveryDocumentAndLogin();`` instead of ``this.oauthService.loadDiscoveryDocumentAndTryLogin();`` when setting up the library. 
+If you don't want to display a login form that tells the user that they are redirected to the identity server, you can use the convenience function ``this.oauthService.loadDiscoveryDocumentAndLogin();`` instead of ``this.oauthService.loadDiscoveryDocumentAndTryLogin();`` when setting up the library. 
 
 This directly redirects the user to the identity server if there are no valid tokens. 
 

projects/lib/src/oauth-service.ts

@@ -249,7 +249,7 @@ export class OAuthService extends AuthConfig {
       return;
     }
 
-    if (this.hasValidIdToken) {
+    if (this.hasValidIdToken()) {
       this.clearAccessTokenTimer();
       this.clearIdTokenTimer();
       this.setupExpirationTimers();
@@ -803,7 +803,7 @@ export class OAuthService extends AuthConfig {
   public silentRefresh(params: object = {}, noPrompt = true): Promise<OAuthEvent> {
     const claims: object = this.getIdentityClaims() || {};
 
-    if (this.useIdTokenHintForSilentRefresh && this.hasValidIdToken) {
+    if (this.useIdTokenHintForSilentRefresh && this.hasValidIdToken()) {
       params['id_token_hint'] = this.getIdToken();
     }
 
@@ -1573,7 +1573,9 @@ export class OAuthService extends AuthConfig {
    * Returns the current id_token.
    */
   public getIdToken(): string {
-    return this._storage.getItem('id_token');
+    return this._storage ?
+            this._storage.getItem('id_token') :
+            null;
   }
 
   private padBase64(base64data): string {