create auth-flow-initializer.service

npm/ng-packs/packages/account/src/lib/services/authentication.service.ts

@@ -48,7 +48,7 @@ export class AuthenticationService {
 
         this.router.navigate([redirectUrl]);
 
-        const strategy = this.authService.activeAuthFlowStrategy;
+        const strategy = this.authService.strategy;
         if (strategy instanceof AuthPasswordFlowStrategy) strategy.setRememberMe(remember);
       }),
     );

npm/ng-packs/packages/core/src/lib/core.module.ts

@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { HTTP_INTERCEPTORS, HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
+import { HttpClientModule, HttpClientXsrfModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { APP_INITIALIZER, Injector, ModuleWithProviders, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -26,10 +26,11 @@ import { ABP } from './models/common';
 import { LocalizationPipe } from './pipes/localization.pipe';
 import { SortPipe } from './pipes/sort.pipe';
 import { LocaleProvider } from './providers/locale.provider';
+import { AuthFlowInitializerService } from './services/auth-flow-initializer.service';
 import { LocalizationService } from './services/localization.service';
 import { ProfileState } from './states/profile.state';
 import { oAuthStorage } from './strategies/auth-flow.strategy';
-import { CORE_OPTIONS, coreOptionsFactory } from './tokens/options.token';
+import { coreOptionsFactory, CORE_OPTIONS } from './tokens/options.token';
 import { noop } from './utils/common-utils';
 import './utils/date-extensions';
 import { getInitialData, localeInitializer } from './utils/initial-utils';
@@ -178,6 +179,7 @@ export class CoreModule {
           useFactory: noop,
         },
         { provide: OAuthStorage, useFactory: storageFactory },
+        AuthFlowInitializerService,
       ],
     };
   }

npm/ng-packs/packages/core/src/lib/services/auth-flow-initializer.service.ts

@@ -0,0 +1,33 @@
+import { Injectable, Injector } from '@angular/core';
+import { from } from 'rxjs';
+import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { AUTH_FLOW_STRATEGY } from '../strategies/auth-flow.strategy';
+import { AuthService } from './auth.service';
+import { EnvironmentService } from './environment.service';
+
+@Injectable()
+export class AuthFlowInitializerService {
+  constructor(
+    protected injector: Injector,
+    protected environmentService: EnvironmentService,
+    protected authService: AuthService,
+  ) {}
+
+  init(): Promise<any> {
+    return this.environmentService
+      .getEnvironment$()
+      .pipe(
+        map(env => env?.oAuthConfig),
+        filter(oAuthConfig => !!oAuthConfig),
+        tap(oAuthConfig => {
+          this.authService.strategy =
+            oAuthConfig.responseType === 'code'
+              ? AUTH_FLOW_STRATEGY.Code(this.injector)
+              : AUTH_FLOW_STRATEGY.Password(this.injector);
+        }),
+        switchMap(() => from(this.authService.init())),
+        take(1),
+      )
+      .toPromise();
+  }
+}

npm/ng-packs/packages/core/src/lib/services/auth.service.ts

@@ -12,38 +12,19 @@ import { EnvironmentService } from './environment.service';
   providedIn: 'root',
 })
 export class AuthService {
-  private flow: string;
+  private _strategy: AuthFlowStrategy;
-  private strategy: AuthFlowStrategy;
 
-  get isInternalAuth() {
+  set strategy(strategy: AuthFlowStrategy) {
-    return this.strategy.isInternalAuth;
+    if (this.strategy) this.strategy.destroy();
-  }
+    this._strategy = strategy;
-
-  get activeAuthFlowStrategy() {
-    return this.strategy as AuthCodeFlowStrategy | AuthPasswordFlowStrategy;
   }
 
-  constructor(private environment: EnvironmentService, private injector: Injector) {
+  get strategy() {
-    this.setStrategy();
+    return this._strategy;
-    this.listenToSetEnvironment();
   }
 
-  private setStrategy = () => {
+  get isInternalAuth() {
-    const flow =
+    return this.strategy.isInternalAuth;
-      this.environment.getEnvironment().oAuthConfig.responseType === 'code' ? 'code' : 'password';
-    if (this.flow === flow) return;
-
-    if (this.strategy) this.strategy.destroy();
-
-    this.flow = flow;
-    this.strategy =
-      flow === 'code'
-        ? AUTH_FLOW_STRATEGY.Code(this.injector)
-        : AUTH_FLOW_STRATEGY.Password(this.injector);
-  };
-
-  private listenToSetEnvironment() {
-    this.environment.createOnUpdateStream(state => state.oAuthConfig).subscribe(this.setStrategy);
   }
 
   async init() {

npm/ng-packs/packages/core/src/lib/services/index.ts

@@ -1,5 +1,6 @@
 export * from './application-configuration.service';
 export * from './auth.service';
+export * from './auth-flow-initializer.service';
 export * from './config-state.service';
 export * from './content-projection.service';
 export * from './dom-insertion.service';

npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts

@@ -1,14 +1,12 @@
 import { registerLocaleData } from '@angular/common';
 import { Injector } from '@angular/core';
-import { Store } from '@ngxs/store';
 import { OAuthService } from 'angular-oauth2-oidc';
 import { tap } from 'rxjs/operators';
-import { ApplicationConfiguration } from '../models/application-configuration';
 import { ABP } from '../models/common';
 import { Environment } from '../models/environment';
 import { AbpApplicationConfigurationService } from '../proxy/volo/abp/asp-net-core/mvc/application-configurations/abp-application-configuration.service';
 import { CurrentTenantDto } from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models';
-import { AuthService } from '../services/auth.service';
+import { AuthFlowInitializerService } from '../services/auth-flow-initializer.service';
 import { ConfigStateService } from '../services/config-state.service';
 import { EnvironmentService } from '../services/environment.service';
 import { SessionStateService } from '../services/session-state.service';
@@ -27,7 +25,7 @@ export function getInitialData(injector: Injector) {
     environmentService.setState(options.environment as Environment);
     await getRemoteEnv(injector, options.environment);
     await parseTenantFromUrl(injector);
-    await injector.get(AuthService).init();
+    await injector.get(AuthFlowInitializerService).init();
 
     if (options.skipGetAppConfiguration) return;