fix

Author: manfredsteyer

angular-oauth2-oidc/src/auth.config.ts

@@ -200,5 +200,12 @@ export class AuthConfig {
      * Normally, the discovey document's url starts with the url of the issuer.
      */
     public skipIssuerCheck? = false;
+
+    /**
+     * According to rfc6749 it is recommended (but not required) that the auth 
+     * server exposes the access_token's life time in seconds. 
+     * This is a fallback value for the case this value is not exposed.
+     */
+    public fallbackAccessTokenExpirationTimeInSec?: number;
 
 }

angular-oauth2-oidc/src/interceptors/default-oauth.interceptor.ts

@@ -3,11 +3,12 @@ import { OAuthService } from '../oauth-service';
 import { OAuthStorage } from '../types';
 import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse, HttpErrorResponse } from '@angular/common/http';
 import {Observable} from 'rxjs/Observable';
-import { map, catchError } from 'rxjs/operators';
-import { of } from 'rxjs/observable/of';
+import { catchError } from 'rxjs/operators';
 import { OAuthResourceServerErrorHandler } from "./resource-server-error-handler";
 import { OAuthModuleConfig } from "../oauth-module.config";
 
+import 'rxjs/add/operator/catch';
+
 @Injectable()
 export class DefaultOAuthInterceptor implements HttpInterceptor {
 
@@ -45,9 +46,7 @@ export class DefaultOAuthInterceptor implements HttpInterceptor {
             req = req.clone({ headers });
         }
 
-        return next.handle(req).pipe(
-            catchError(err => this.errorHandler.handleError(err))
-        );
+        return next.handle(req).catch(err => this.errorHandler.handleError(err));
 
     }
 

angular-oauth2-oidc/src/interceptors/resource-server-error-handler.ts

@@ -1,6 +1,6 @@
 import {HttpResponse} from '@angular/common/http';
 import { Observable,  } from 'rxjs/Observable';
-import {  _throw } from 'rxjs/observable/throw';
+import 'rxjs/add/observable/throw';
 
 export abstract class OAuthResourceServerErrorHandler {
     abstract handleError(err: HttpResponse<any>): Observable<any>;
@@ -9,7 +9,7 @@ export abstract class OAuthResourceServerErrorHandler {
 export class OAuthNoopResourceServerErrorHandler implements OAuthResourceServerErrorHandler {
 
     handleError(err: HttpResponse<any>): Observable<any> {
-        return _throw(err);
+        return Observable.throw(err);
     }
 
 }

angular-oauth2-oidc/src/oauth-service.ts

@@ -1149,7 +1149,7 @@ export class OAuthService
         }
 
         if (this.requestAccessToken) {
-            this.storeAccessTokenResponse(accessToken, null, parts['expires_in']);
+            this.storeAccessTokenResponse(accessToken, null, parts['expires_in'] | this.fallbackAccessTokenExpirationTimeInSec);
         }
 
         if (!this.oidc) {
@@ -1175,9 +1175,10 @@ export class OAuthService
                         this.storeIdToken(result);
                         this.storeSessionState(sessionState);
                         this.eventsSubject.next(new OAuthSuccessEvent('token_received'));
+                        if (this.clearHashAfterLogin) location.hash = '';
                         this.callOnTokenReceivedIfExists(options);
                         this.inImplicitFlow = false;
-                        if (this.clearHashAfterLogin) location.hash = '';
+                        
                     })
                 .catch(reason => {
                     this.eventsSubject.next(new OAuthErrorEvent('token_validation_error', reason));

angular-oauth2-oidc/src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-oauth2-oidc",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/manfredsteyer/angular-oauth2-oidc"