Browse Source

resolved a merge conflict

pull/5060/head
mehmet-erim 6 years ago
parent
commit
76deb8ad35
  1. 4
      npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts

4
npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts

@ -25,9 +25,9 @@ export abstract class AuthFlowStrategy {
}; };
constructor(protected injector: Injector) { constructor(protected injector: Injector) {
this.oAuthService = injector.get(OAuthService);
this.store = injector.get(Store); this.store = injector.get(Store);
this.oAuthConfig = this.store.selectSnapshot(ConfigState.getDeep('environment.oAuthConfig')); this.oAuthService = injector.get(OAuthService);
this.oAuthConfig = injector.get(Store).selectSnapshot(ConfigState.getDeep('environment.oAuthConfig'));
} }
async init(): Promise<any> { async init(): Promise<any> {

Loading…
Cancel
Save