From b6c4500e9e7bd13c8c3cd695c50cca485cd0c854 Mon Sep 17 00:00:00 2001
From: Mehmet Erim <bilgi@mehmeterim.com>
Date: Thu, 16 Sep 2021 15:27:30 +0300
Subject: [PATCH] add return of(null) to catcherrors

---
 .../packages/core/src/lib/strategies/auth-flow.strategy.ts | 7 +++++--
 .../packages/core/src/lib/utils/environment-utils.ts       | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts
index f2b806576d..b70434a3bc 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts
@@ -6,7 +6,7 @@ import {
   OAuthErrorEvent,
   OAuthInfoEvent,
   OAuthService,
-  OAuthStorage,
+  OAuthStorage
 } from 'angular-oauth2-oidc';
 import { from, Observable, of, pipe } from 'rxjs';
 import { filter, switchMap, tap } from 'rxjs/operators';
@@ -37,7 +37,10 @@ export abstract class AuthFlowStrategy {
   abstract logout(queryParams?: Params): Observable<any>;
   abstract login(params?: LoginParams | Params): Observable<any>;
 
-  private catchError = err => this.httpErrorReporter.reportError(err);
+  private catchError = err => {
+    this.httpErrorReporter.reportError(err);
+    return of(null);
+  };
 
   constructor(protected injector: Injector) {
     this.httpErrorReporter = injector.get(HttpErrorReporterService);
diff --git a/npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts
index 2ef55da455..e66e16d901 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts
@@ -1,5 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injector } from '@angular/core';
+import { of } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
 import { Environment, RemoteEnv } from '../models/environment';
 import { EnvironmentService } from '../services/environment.service';
@@ -19,7 +20,10 @@ export function getRemoteEnv(injector: Injector, environment: Partial<Environmen
   return http
     .request<Environment>(method, url, { headers })
     .pipe(
-      catchError(err => httpErrorReporter.reportError(err)), // TODO: Condiser get handle function from a provider
+      catchError(err => {
+        httpErrorReporter.reportError(err);
+        return of(null);
+      }), // TODO: Condiser get handle function from a provider
       tap(env => environmentService.setState(mergeEnvironments(environment, env, remoteEnv))),
     )
     .toPromise();