From 4d18a29a53f404fb7c06dd2a7c0239a8a87948c2 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Fri, 10 Jun 2022 15:35:17 +0300 Subject: [PATCH] Add OAuth providers only forRoot --- .../packages/core/src/lib/core.module.ts | 120 +++++++++--------- 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/core.module.ts b/npm/ng-packs/packages/core/src/lib/core.module.ts index 238ed9bb02..58c128ac32 100644 --- a/npm/ng-packs/packages/core/src/lib/core.module.ts +++ b/npm/ng-packs/packages/core/src/lib/core.module.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { HttpClientModule, HttpClientXsrfModule, HTTP_INTERCEPTORS } from '@angular/common/http'; +import { HTTP_INTERCEPTORS, HttpClientModule, HttpClientXsrfModule } from '@angular/common/http'; import { APP_INITIALIZER, Injector, ModuleWithProviders, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; @@ -29,7 +29,7 @@ import { LocaleProvider } from './providers/locale.provider'; import { LocalizationService } from './services/localization.service'; import { oAuthStorage } from './strategies/auth-flow.strategy'; import { localizationContributor, LOCALIZATIONS } from './tokens/localization.token'; -import { coreOptionsFactory, CORE_OPTIONS } from './tokens/options.token'; +import { CORE_OPTIONS, coreOptionsFactory } from './tokens/options.token'; import { TENANT_KEY } from './tokens/tenant-key.token'; import { noop } from './utils/common-utils'; import './utils/date-extensions'; @@ -49,61 +49,60 @@ export function storageFactory(): OAuthStorage { * This module will be imported and exported by all others. */ @NgModule({ - exports: [ - CommonModule, - HttpClientModule, - FormsModule, - ReactiveFormsModule, - RouterModule, - LocalizationModule, - AbstractNgModelComponent, - AutofocusDirective, - DynamicLayoutComponent, - ForDirective, - FormSubmitDirective, - InitDirective, - InputEventDebounceDirective, - PermissionDirective, - ReplaceableRouteContainerComponent, - ReplaceableTemplateDirective, - RouterOutletComponent, - SortPipe, - StopPropagationDirective, - ToInjectorPipe, - ShortDateTimePipe, - ShortTimePipe, - ShortDatePipe - ], - imports: [ - OAuthModule, - CommonModule, - HttpClientModule, - FormsModule, - ReactiveFormsModule, - RouterModule, - LocalizationModule, - ], - declarations: [ - AbstractNgModelComponent, - AutofocusDirective, - DynamicLayoutComponent, - ForDirective, - FormSubmitDirective, - InitDirective, - InputEventDebounceDirective, - PermissionDirective, - ReplaceableRouteContainerComponent, - ReplaceableTemplateDirective, - RouterOutletComponent, - SortPipe, - StopPropagationDirective, - ToInjectorPipe, - ShortDateTimePipe, - ShortTimePipe, - ShortDatePipe - - ], - providers: [LocalizationPipe] + exports: [ + CommonModule, + HttpClientModule, + FormsModule, + ReactiveFormsModule, + RouterModule, + LocalizationModule, + AbstractNgModelComponent, + AutofocusDirective, + DynamicLayoutComponent, + ForDirective, + FormSubmitDirective, + InitDirective, + InputEventDebounceDirective, + PermissionDirective, + ReplaceableRouteContainerComponent, + ReplaceableTemplateDirective, + RouterOutletComponent, + SortPipe, + StopPropagationDirective, + ToInjectorPipe, + ShortDateTimePipe, + ShortTimePipe, + ShortDatePipe, + ], + imports: [ + OAuthModule, + CommonModule, + HttpClientModule, + FormsModule, + ReactiveFormsModule, + RouterModule, + LocalizationModule, + ], + declarations: [ + AbstractNgModelComponent, + AutofocusDirective, + DynamicLayoutComponent, + ForDirective, + FormSubmitDirective, + InitDirective, + InputEventDebounceDirective, + PermissionDirective, + ReplaceableRouteContainerComponent, + ReplaceableTemplateDirective, + RouterOutletComponent, + SortPipe, + StopPropagationDirective, + ToInjectorPipe, + ShortDateTimePipe, + ShortTimePipe, + ShortDatePipe, + ], + providers: [LocalizationPipe], }) export class BaseCoreModule {} @@ -116,7 +115,7 @@ export class BaseCoreModule {} imports: [ BaseCoreModule, LocalizationModule, - OAuthModule.forRoot(), + OAuthModule, HttpClientXsrfModule.withOptions({ cookieName: 'XSRF-TOKEN', headerName: 'RequestVerificationToken', @@ -191,6 +190,7 @@ export class CoreModule { useValue: localizationContributor(options.localizations), deps: [LocalizationService], }, + OAuthModule.forRoot().providers, ], }; } @@ -209,7 +209,3 @@ export class CoreModule { }; } } - -export function ngxsStoragePluginSerialize(data) { - return data; -}