From c67120c5f82d8faa59c44115d537ce247ace454f Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 18 Oct 2018 09:19:46 -0400 Subject: [PATCH] remove index.ts barrels --- .../src/lib/effects/oidc.effect.ts | 8 +++-- .../src/lib/facades/oidc.facade.ts | 29 ++++++++++++------- .../src/lib/ng-oidc-client.module.ts | 14 +++++---- .../ng-oidc-client/src/lib/reducers/index.ts | 1 - .../ng-oidc-client/src/lib/services/index.ts | 1 - .../src/lib/services/oidc.service.ts | 3 +- 6 files changed, 35 insertions(+), 21 deletions(-) delete mode 100644 projects/ng-oidc-client/src/lib/reducers/index.ts delete mode 100644 projects/ng-oidc-client/src/lib/services/index.ts diff --git a/projects/ng-oidc-client/src/lib/effects/oidc.effect.ts b/projects/ng-oidc-client/src/lib/effects/oidc.effect.ts index 6b10758..9a3cfc3 100644 --- a/projects/ng-oidc-client/src/lib/effects/oidc.effect.ts +++ b/projects/ng-oidc-client/src/lib/effects/oidc.effect.ts @@ -5,9 +5,9 @@ import { User as OidcUser } from 'oidc-client'; import { Observable, of } from 'rxjs'; import { catchError, concatMap, map, switchMap, tap } from 'rxjs/operators'; import { OidcActions } from '../actions'; - +import { Config, OIDC_CONFIG } from '../models/config.model'; +import { ACTION_NO_ACTION } from '../models/constants'; import { OidcService } from '../services/oidc.service'; -import { ACTION_NO_ACTION, OIDC_CONFIG, Config } from '../models'; @Injectable() export class OidcEffects { @@ -27,7 +27,9 @@ export class OidcEffects { tap(userData => console.log('Effect getOidcUser - Got User', userData)), concatMap((userData: OidcUser) => { const r: Action[] = [new OidcActions.UserFound(userData)]; - const automaticSilentRenew = this.config != null && this.config.oidc_config.automaticSilentRenew; + const automaticSilentRenew = + this.config.oidc_config.automaticSilentRenew != null && + this.config.oidc_config.automaticSilentRenew; // user expired, initiate silent sign-in if configured to automatic if (userData != null && userData.expired === true && automaticSilentRenew === true) { r.push(new OidcActions.SigninSilent(args)); diff --git a/projects/ng-oidc-client/src/lib/facades/oidc.facade.ts b/projects/ng-oidc-client/src/lib/facades/oidc.facade.ts index 3ae19fe..067b0ea 100644 --- a/projects/ng-oidc-client/src/lib/facades/oidc.facade.ts +++ b/projects/ng-oidc-client/src/lib/facades/oidc.facade.ts @@ -1,27 +1,36 @@ -import { Injectable } from '@angular/core'; +import { Injectable, Inject } from '@angular/core'; import { Store } from '@ngrx/store'; import { OidcClient, SigninRequest, SignoutRequest, User as OidcUser, UserManager } from 'oidc-client'; import { Observable } from 'rxjs'; import { filter, take } from 'rxjs/operators'; import { OidcActions } from '../actions'; import { OidcEvent, RequestArugments } from '../models'; -import * as fromOidc from '../reducers/oidc.reducer'; -import { OidcService } from '../services'; +import { + OidcState, + getOidcLoading, + isIdentityExpiring, + isIdentityExpired, + isLoggedIn, + getOidcIdentity, + ErrorState, + selectOidcErrorState +} from '../reducers/oidc.reducer'; +import { OidcService } from '../services/oidc.service'; @Injectable({ providedIn: 'root' }) export class OidcFacade { - constructor(private store: Store, private oidcService: OidcService) { + constructor(private store: Store, @Inject(OidcService) private oidcService: OidcService) { this.registerDefaultEvents(); } - loading$: Observable = this.store.select(fromOidc.getOidcLoading); - expiring$: Observable = this.store.select(fromOidc.isIdentityExpiring); - expired$: Observable = this.store.select(fromOidc.isIdentityExpired); - loggedIn$: Observable = this.store.select(fromOidc.isLoggedIn); - identity$: Observable = this.store.select(fromOidc.getOidcIdentity); - errors$: Observable = this.store.select(fromOidc.selectOidcErrorState); + loading$: Observable = this.store.select(getOidcLoading); + expiring$: Observable = this.store.select(isIdentityExpiring); + expired$: Observable = this.store.select(isIdentityExpired); + loggedIn$: Observable = this.store.select(isLoggedIn); + identity$: Observable = this.store.select(getOidcIdentity); + errors$: Observable = this.store.select(selectOidcErrorState); // default bindings to events private addUserUnLoaded = function() { diff --git a/projects/ng-oidc-client/src/lib/ng-oidc-client.module.ts b/projects/ng-oidc-client/src/lib/ng-oidc-client.module.ts index 4843262..33d58eb 100644 --- a/projects/ng-oidc-client/src/lib/ng-oidc-client.module.ts +++ b/projects/ng-oidc-client/src/lib/ng-oidc-client.module.ts @@ -4,20 +4,24 @@ import { EffectsModule } from '@ngrx/effects'; import { StoreModule } from '@ngrx/store'; import { OidcEffects } from './effects/oidc.effect'; import { OidcFacade } from './facades/oidc.facade'; -import { Config, OIDC_CONFIG } from './models'; -import { oidcReducer } from './reducers'; -import { OidcService } from './services'; +import { Config, OIDC_CONFIG } from './models/config.model'; +import { oidcReducer } from './reducers/oidc.reducer'; +import { OidcService } from './services/oidc.service'; @NgModule({ imports: [CommonModule, StoreModule.forFeature('oidc', oidcReducer), EffectsModule.forFeature([OidcEffects])], declarations: [], - providers: [OidcEffects, OidcFacade, OidcService] + providers: [OidcEffects] }) export class NgOidcClientModule { static forRoot(config: Config): ModuleWithProviders { return { ngModule: NgOidcClientModule, - providers: [{ provide: OIDC_CONFIG, useValue: config }] + providers: [ + { provide: OIDC_CONFIG, useValue: config }, + { provide: OidcService, useClass: OidcService, deps: [OIDC_CONFIG] }, + { provide: OidcFacade, useClass: OidcFacade, deps: [OidcService] } + ] }; } } diff --git a/projects/ng-oidc-client/src/lib/reducers/index.ts b/projects/ng-oidc-client/src/lib/reducers/index.ts deleted file mode 100644 index c303282..0000000 --- a/projects/ng-oidc-client/src/lib/reducers/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './oidc.reducer'; diff --git a/projects/ng-oidc-client/src/lib/services/index.ts b/projects/ng-oidc-client/src/lib/services/index.ts deleted file mode 100644 index fea103c..0000000 --- a/projects/ng-oidc-client/src/lib/services/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './oidc.service'; diff --git a/projects/ng-oidc-client/src/lib/services/oidc.service.ts b/projects/ng-oidc-client/src/lib/services/oidc.service.ts index 8613d81..ecfc5a6 100644 --- a/projects/ng-oidc-client/src/lib/services/oidc.service.ts +++ b/projects/ng-oidc-client/src/lib/services/oidc.service.ts @@ -2,7 +2,8 @@ import { isPlatformBrowser } from '@angular/common'; import { Inject, Injectable, PLATFORM_ID } from '@angular/core'; import { Log, OidcClient, SigninRequest, SignoutRequest, User as OidcUser, UserManager } from 'oidc-client'; import { from, Observable } from 'rxjs'; -import { Config, OidcEvent, OIDC_CONFIG, StorageKeys } from '../models'; +import { Config, OIDC_CONFIG } from '../models/config.model'; +import { OidcEvent, StorageKeys } from '../models'; @Injectable({ providedIn: 'root'