diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts index c15d123783..5d55e15adc 100644 --- a/src/app/core/auth/auth.service.spec.ts +++ b/src/app/core/auth/auth.service.spec.ts @@ -140,8 +140,7 @@ describe('AuthService test', () => { { provide: AuthRequestService, useValue: authRequest }, { provide: REQUEST, useValue: {} }, { provide: Router, useValue: routerStub }, - - CookieService, + CookieService, AuthService, ] }).compileComponents(); @@ -153,7 +152,7 @@ describe('AuthService test', () => { (state as any).core = Object.create({}); (state as any).core.auth = authenticatedState; }); - authService = new AuthService( {}, window, undefined, authReqService, router, cookieService, store, rdbService); + authService = new AuthService(undefined, {}, window, undefined, authReqService, router, cookieService, store, rdbService); })); it('should return true when user is logged in', () => { @@ -214,7 +213,7 @@ describe('AuthService test', () => { (state as any).core = Object.create({}); (state as any).core.auth = authenticatedState; }); - authService = new AuthService({}, window, undefined, authReqService, router, cookieService, store, rdbService); + authService = new AuthService(undefined, {}, window, undefined, authReqService, router, cookieService, store, rdbService); storage = (authService as any).storage; spyOn(storage, 'get'); spyOn(storage, 'remove'); diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index ab1d38b79e..9742141b7a 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -43,7 +43,7 @@ export class AuthService { protected _authenticated: boolean; constructor( - // @Inject(GLOBAL_CONFIG) public config: GlobalConfig, + @Inject(GLOBAL_CONFIG) public config: GlobalConfig, @Inject(REQUEST) protected req: any, @Inject(NativeWindowService) protected _window: NativeWindowRef, protected authRequestService: AuthRequestService, @@ -216,7 +216,7 @@ export class AuthService { ) } -/* private parseSSOLocation(url: string): string { + private parseSSOLocation(url: string): string { console.log('auth.service parseSSOLocation was called'); const parseUrl = decodeURIComponent(url); // const urlTree: UrlTree = this.router.parseUrl(url); @@ -229,7 +229,7 @@ export class AuthService { // console.log(url); const target = `?target=${this.config.auth.target.host}${this.config.auth.target.page}`; return parseUrl.replace(/\?target=http.+/g, target); - }*/ + } /** * Create a new user