From d96f4d3e2060fcc78d50b7294ebbf6d7118518d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 16 Sep 2021 12:15:44 +0300 Subject: [PATCH 1/4] Fix feature-management: added json package dependency. --- .../Volo.Abp.FeatureManagement.Application.Contracts.csproj | 1 + .../AbpFeatureManagementApplicationContractsModule.cs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.csproj index 451f9e0291..63fcdae1f4 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo.Abp.FeatureManagement.Application.Contracts.csproj @@ -11,6 +11,7 @@ + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs index 854a9f7ff6..18661e742a 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/AbpFeatureManagementApplicationContractsModule.cs @@ -2,6 +2,7 @@ using Volo.Abp.Application; using Volo.Abp.Authorization; using Volo.Abp.FeatureManagement.JsonConverters; +using Volo.Abp.Json; using Volo.Abp.Json.Newtonsoft; using Volo.Abp.Json.SystemTextJson; using Volo.Abp.Modularity; @@ -12,7 +13,8 @@ namespace Volo.Abp.FeatureManagement [DependsOn( typeof(AbpFeatureManagementDomainSharedModule), typeof(AbpDddApplicationContractsModule), - typeof(AbpAuthorizationAbstractionsModule) + typeof(AbpAuthorizationAbstractionsModule), + typeof(AbpJsonModule) )] public class AbpFeatureManagementApplicationContractsModule : AbpModule { From 75a270a48f46ac665477124a53501a93f4ecc0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 16 Sep 2021 14:29:17 +0300 Subject: [PATCH 2/4] Move EntityChangeType to contracts --- .../Volo/Abp/Auditing/EntityChangeType.cs | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename framework/src/{Volo.Abp.Auditing => Volo.Abp.Auditing.Contracts}/Volo/Abp/Auditing/EntityChangeType.cs (100%) diff --git a/framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/EntityChangeType.cs b/framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/EntityChangeType.cs similarity index 100% rename from framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/EntityChangeType.cs rename to framework/src/Volo.Abp.Auditing.Contracts/Volo/Abp/Auditing/EntityChangeType.cs From b6c4500e9e7bd13c8c3cd695c50cca485cd0c854 Mon Sep 17 00:00:00 2001 From: Mehmet Erim Date: Thu, 16 Sep 2021 15:27:30 +0300 Subject: [PATCH 3/4] 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; abstract login(params?: LoginParams | Params): Observable; - 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(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(); From c511dd3b669a1ffc754b3c7c78b73d05c359f9a5 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Thu, 16 Sep 2021 15:56:25 +0300 Subject: [PATCH 4/4] Update npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts Co-authored-by: Bunyamin Coskuner --- npm/ng-packs/packages/core/src/lib/utils/environment-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e66e16d901..9958c97165 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 @@ -23,7 +23,7 @@ export function getRemoteEnv(injector: Injector, environment: Partial { httpErrorReporter.reportError(err); return of(null); - }), // TODO: Condiser get handle function from a provider + }), // TODO: Consider get handle function from a provider tap(env => environmentService.setState(mergeEnvironments(environment, env, remoteEnv))), ) .toPromise();