From d238bd2cbb978e636a1bf87d310b82e966fbe293 Mon Sep 17 00:00:00 2001 From: Ahmad Almunajjed Date: Sat, 13 Apr 2024 17:32:14 +0800 Subject: [PATCH 1/3] add skipiInitAuthService to ABP.Root in ng core package --- npm/ng-packs/packages/core/src/lib/models/common.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/npm/ng-packs/packages/core/src/lib/models/common.ts b/npm/ng-packs/packages/core/src/lib/models/common.ts index 6d30a6ec74..ffc7d21dcf 100644 --- a/npm/ng-packs/packages/core/src/lib/models/common.ts +++ b/npm/ng-packs/packages/core/src/lib/models/common.ts @@ -9,6 +9,7 @@ export namespace ABP { environment: Partial; registerLocaleFn: (locale: string) => Promise; skipGetAppConfiguration?: boolean; + skipiInitAuthService?: boolean; sendNullsAsQueryParam?: boolean; tenantKey?: string; localizations?: Localization[]; From a8fb824da8a1bd9437c8181004741c7b58e3fac0 Mon Sep 17 00:00:00 2001 From: Ahmad Almunajjed Date: Sat, 13 Apr 2024 17:37:25 +0800 Subject: [PATCH 2/3] make calling authService.init() optional based on option --- npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts index 782af0899d..24dde2e3a4 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts @@ -29,7 +29,7 @@ export function getInitialData(injector: Injector) { const checkAuthenticationState = injector.get(CHECK_AUTHENTICATION_STATE_FN_KEY, noop, { optional: true, }); - if (authService) { + if (!options.skipiInitAuthService && authService) { await authService.init(); } if (options.skipGetAppConfiguration) return; From d4f35648f9f535014dfbd3d07aec4e1456d425cb Mon Sep 17 00:00:00 2001 From: Ahmad Almunajjed Date: Sat, 13 Apr 2024 10:09:58 +0000 Subject: [PATCH 3/3] fix typo --- npm/ng-packs/packages/core/src/lib/models/common.ts | 2 +- npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/models/common.ts b/npm/ng-packs/packages/core/src/lib/models/common.ts index ffc7d21dcf..714f2422c2 100644 --- a/npm/ng-packs/packages/core/src/lib/models/common.ts +++ b/npm/ng-packs/packages/core/src/lib/models/common.ts @@ -9,7 +9,7 @@ export namespace ABP { environment: Partial; registerLocaleFn: (locale: string) => Promise; skipGetAppConfiguration?: boolean; - skipiInitAuthService?: boolean; + skipInitAuthService?: boolean; sendNullsAsQueryParam?: boolean; tenantKey?: string; localizations?: Localization[]; diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts index 24dde2e3a4..4173bd96c6 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts @@ -29,7 +29,7 @@ export function getInitialData(injector: Injector) { const checkAuthenticationState = injector.get(CHECK_AUTHENTICATION_STATE_FN_KEY, noop, { optional: true, }); - if (!options.skipiInitAuthService && authService) { + if (!options.skipInitAuthService && authService) { await authService.init(); } if (options.skipGetAppConfiguration) return;