diff --git a/npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts index e0074e936f..07dfc84d67 100644 --- a/npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts +++ b/npm/ng-packs/packages/core/src/lib/tests/initial-utils.spec.ts @@ -6,9 +6,8 @@ import { of } from 'rxjs'; import { GetAppConfiguration } from '../actions'; import { CORE_OPTIONS } from '../tokens/options.token'; import { checkAccessToken, getInitialData, localeInitializer } from '../utils'; -import * as multiTenancyUtils from '../utils/multi-tenancy-utils'; import * as environmentUtils from '../utils/environment-utils'; -import { OAUTH_STRATEGY } from '../strategies/oauth.strategy'; +import * as multiTenancyUtils from '../utils/multi-tenancy-utils'; @Component({ selector: 'abp-dummy', @@ -36,15 +35,14 @@ describe('InitialUtils', () => { const dispatchSpy = jest.spyOn(store, 'dispatch'); const parseTenantFromUrlSpy = jest.spyOn(multiTenancyUtils, 'parseTenantFromUrl'); const getRemoteEnvSpy = jest.spyOn(environmentUtils, 'getRemoteEnv'); - const initOAuthSpy = jest.spyOn(OAUTH_STRATEGY, 'Init'); parseTenantFromUrlSpy.mockReturnValue(Promise.resolve()); getRemoteEnvSpy.mockReturnValue(Promise.resolve()); injectorSpy.mockReturnValueOnce(store); injectorSpy.mockReturnValueOnce({ skipGetAppConfiguration: false }); + injectorSpy.mockReturnValueOnce({ init: () => null }); injectorSpy.mockReturnValueOnce({ hasValidAccessToken: () => false }); dispatchSpy.mockReturnValue(of('test')); - initOAuthSpy.mockReturnValue(Promise.resolve()); expect(typeof getInitialData(injector)).toBe('function'); expect(await getInitialData(injector)()).toBe('test'); 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 73e986493c..36e2c22bca 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 @@ -5,11 +5,11 @@ import { OAuthService } from 'angular-oauth2-oidc'; import { tap } from 'rxjs/operators'; import { GetAppConfiguration } from '../actions/config.actions'; import { ABP } from '../models/common'; +import { AuthService } from '../services/auth.service'; import { ConfigState } from '../states/config.state'; import { CORE_OPTIONS } from '../tokens/options.token'; import { getRemoteEnv } from './environment-utils'; import { parseTenantFromUrl } from './multi-tenancy-utils'; -import { AuthService } from '../services/auth.service'; export function getInitialData(injector: Injector) { const fn = async () => {