Merge pull request #811 from damienbod/fabiangosebrink/fixing-missing…

…-catch-error

checkAuthIncludingServer cannot complete without credentials

CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Angular Lib for OpenID Connect/OAuth2 Changelog
 
+### 2020-07-04 Version 11.1.4
+
+-   checkAuthIncludingServer cannot complete without credentials
+    -   [PR](https://github.com/damienbod/angular-auth-oidc-client/pull/811) // Fixes [#756](https://github.com/damienbod/angular-auth-oidc-client/issues/779)
+
 ### 2020-06-04 Version 11.1.3
 
 -   Refresh checksession iframe regularly
@@ -8,8 +13,8 @@
     -   [PR](https://github.com/damienbod/angular-auth-oidc-client/pull/766) // fixes [#750](https://github.com/damienbod/angular-auth-oidc-client/issues/750)
 -   Not throwing an exception if interceptor is set and config is loaded from http
     -   [PR](https://github.com/damienbod/angular-auth-oidc-client/pull/774) // fixes [#772](https://github.com/damienbod/angular-auth-oidc-client/issues/772)
-- Bug fix: forceRefreshSession prematurely completes its observable [#767](https://github.com/damienbod/angular-auth-oidc-client/issues/767)
-- Bug fix: Returns tokens but doesn't apply them [#759](https://github.com/damienbod/angular-auth-oidc-client/issues/759)
+-   Bug fix: forceRefreshSession prematurely completes its observable [#767](https://github.com/damienbod/angular-auth-oidc-client/issues/767)
+-   Bug fix: Returns tokens but doesn't apply them [#759](https://github.com/damienbod/angular-auth-oidc-client/issues/759)
 
 ### 2020-05-24 Version 11.1.2
 

package.json

@@ -8,7 +8,7 @@
     "bugs": {
         "url": "https://github.com/damienbod/angular-auth-oidc-client/issues"
     },
-    "version": "11.1.3",
+    "version": "11.1.4",
     "scripts": {
         "ng": "ng",
         "build": "npm run build-lib",

projects/angular-auth-oidc-client/package.json

@@ -36,6 +36,6 @@
         "authorization"
     ],
     "license": "MIT",
-    "version": "11.1.3",
+    "version": "11.1.4",
     "description": "Angular Lib for OpenID Connect & OAuth2"
 }

projects/angular-auth-oidc-client/src/lib/callback/callback.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable, Subject } from 'rxjs';
 import { tap } from 'rxjs/operators';
+import { CallbackContext } from '../flows/callback-context';
 import { FlowHelper } from '../utils/flowHelper/flow-helper.service';
 import { UrlService } from '../utils/url/url.service';
 import { CodeFlowCallbackService } from './code-flow-callback.service';
@@ -25,7 +26,7 @@ export class CallbackService {
         return this.urlService.isCallbackFromSts();
     }
 
-    handleCallbackAndFireEvents(currentCallbackUrl: string) {
+    handleCallbackAndFireEvents(currentCallbackUrl: string): Observable<CallbackContext> {
         let callback$: Observable<any>;
 
         if (this.flowHelper.isCurrentFlowCodeFlow()) {

projects/angular-auth-oidc-client/src/lib/callback/refresh-session.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { of } from 'rxjs';
+import { forkJoin, of } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
 import { AuthStateService } from '../authState/auth-state.service';
 import { AuthWellKnownService } from '../config/auth-well-known.service';
@@ -42,10 +42,8 @@ export class RefreshSessionService {
             );
         }
 
-        return this.startRefreshSession().pipe(
-            switchMap(() => this.silentRenewService.refreshSessionWithIFrameCompleted$),
-            take(1),
-            map((callbackContext) => {
+        return forkJoin([this.startRefreshSession(), this.silentRenewService.refreshSessionWithIFrameCompleted$.pipe(take(1))]).pipe(
+            map(([_, callbackContext]) => {
                 const isAuthenticated = this.authStateService.areAuthStorageTokensValid();
                 if (isAuthenticated) {
                     return {

projects/angular-auth-oidc-client/src/lib/oidc.security.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Observable, of } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { catchError, map, switchMap } from 'rxjs/operators';
 import { AuthStateService } from './authState/auth-state.service';
 import { CallbackService } from './callback/callback.service';
 import { PeriodicallyTokenCheckService } from './callback/periodically-token-check.service';
@@ -90,7 +90,8 @@ export class OidcSecurityService {
                 this.loggerService.logDebug('checkAuth completed fire events, auth: ' + isAuthenticated);
 
                 return isAuthenticated;
-            })
+            }),
+            catchError(() => of(false))
         );
     }
 

projects/sample-code-flow/src/app/app.component.ts

@@ -11,6 +11,8 @@ export class AppComponent implements OnInit {
     ngOnInit() {
         this.oidcSecurityService.checkAuthIncludingServer().subscribe((isAuthenticated) => {
             console.warn('app authenticated', isAuthenticated);
+            const at = this.oidcSecurityService.getToken();
+            console.warn(at);
         });
     }
 }

projects/sample-code-flow/src/app/home/home.component.html

@@ -2,6 +2,7 @@
 
 <div *ngIf="isAuthenticated$ | async as isAuthenticated; else noAuth">
     <button (click)="logout()">Logout</button>
+    <button (click)="forceRefreshSession()">RefreshSession</button>
     <hr />
 
     <br />

projects/sample-code-flow/src/app/home/home.component.ts

@@ -24,6 +24,9 @@ export class HomeComponent implements OnInit {
         this.oidcSecurityService.authorize();
     }
 
+    forceRefreshSession() {
+        this.oidcSecurityService.forceRefreshSession().subscribe((result) => console.warn(result));
+    }
     logout() {
         this.oidcSecurityService.logoff();
     }