mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
Fix OidcAuthenticationService export (#9711)
* fix import * fix service location and exports
This commit is contained in:
@@ -23,7 +23,7 @@ import { MatDialog } from '@angular/material/dialog';
|
|||||||
import { StorageService } from '../../common/services/storage.service';
|
import { StorageService } from '../../common/services/storage.service';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
import { OidcAuthenticationService } from '../services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
|
|
||||||
export abstract class AuthGuardBase implements CanActivate, CanActivateChild {
|
export abstract class AuthGuardBase implements CanActivate, CanActivateChild {
|
||||||
protected get withCredentials(): boolean {
|
protected get withCredentials(): boolean {
|
||||||
|
@@ -23,7 +23,7 @@ import { RouterStateSnapshot, Router } from '@angular/router';
|
|||||||
import { CoreTestingModule } from '../../testing/core.testing.module';
|
import { CoreTestingModule } from '../../testing/core.testing.module';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
import { OidcAuthenticationService } from '../services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
|
|
||||||
describe('AuthGuardService BPM', () => {
|
describe('AuthGuardService BPM', () => {
|
||||||
let authGuard: AuthGuardBpm;
|
let authGuard: AuthGuardBpm;
|
||||||
|
@@ -23,21 +23,22 @@ import { AuthGuardBase } from './auth-guard-base';
|
|||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { StorageService } from '../../common/services/storage.service';
|
import { StorageService } from '../../common/services/storage.service';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
import { OidcAuthenticationService } from '../services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class AuthGuardBpm extends AuthGuardBase {
|
export class AuthGuardBpm extends AuthGuardBase {
|
||||||
|
constructor(
|
||||||
constructor(authenticationService: AuthenticationService,
|
authenticationService: AuthenticationService,
|
||||||
basicAlfrescoAuthService: BasicAlfrescoAuthService,
|
basicAlfrescoAuthService: BasicAlfrescoAuthService,
|
||||||
oidcAuthenticationService: OidcAuthenticationService,
|
oidcAuthenticationService: OidcAuthenticationService,
|
||||||
router: Router,
|
router: Router,
|
||||||
appConfigService: AppConfigService,
|
appConfigService: AppConfigService,
|
||||||
dialog: MatDialog,
|
dialog: MatDialog,
|
||||||
storageService: StorageService) {
|
storageService: StorageService
|
||||||
super(authenticationService,basicAlfrescoAuthService, oidcAuthenticationService,router, appConfigService, dialog, storageService);
|
) {
|
||||||
|
super(authenticationService, basicAlfrescoAuthService, oidcAuthenticationService, router, appConfigService, dialog, storageService);
|
||||||
}
|
}
|
||||||
|
|
||||||
async checkLogin(_: ActivatedRouteSnapshot, redirectUrl: string): Promise<boolean | UrlTree> {
|
async checkLogin(_: ActivatedRouteSnapshot, redirectUrl: string): Promise<boolean | UrlTree> {
|
||||||
|
@@ -22,7 +22,7 @@ import { AuthenticationService } from '../services/authentication.service';
|
|||||||
import { RouterStateSnapshot, Router } from '@angular/router';
|
import { RouterStateSnapshot, Router } from '@angular/router';
|
||||||
import { CoreTestingModule } from '../../testing/core.testing.module';
|
import { CoreTestingModule } from '../../testing/core.testing.module';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { OidcAuthenticationService } from '../services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
|
|
||||||
describe('AuthGuardService ECM', () => {
|
describe('AuthGuardService ECM', () => {
|
||||||
|
@@ -16,30 +16,28 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { Injectable } from '@angular/core';
|
import { Injectable } from '@angular/core';
|
||||||
import {
|
import { ActivatedRouteSnapshot, Router, UrlTree } from '@angular/router';
|
||||||
ActivatedRouteSnapshot, Router, UrlTree
|
|
||||||
} from '@angular/router';
|
|
||||||
import { AuthenticationService } from '../services/authentication.service';
|
import { AuthenticationService } from '../services/authentication.service';
|
||||||
import { AppConfigService } from '../../app-config/app-config.service';
|
import { AppConfigService } from '../../app-config/app-config.service';
|
||||||
import { AuthGuardBase } from './auth-guard-base';
|
import { AuthGuardBase } from './auth-guard-base';
|
||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { StorageService } from '../../common/services/storage.service';
|
import { StorageService } from '../../common/services/storage.service';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
import { OidcAuthenticationService } from '../services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class AuthGuardEcm extends AuthGuardBase {
|
export class AuthGuardEcm extends AuthGuardBase {
|
||||||
|
constructor(
|
||||||
constructor(authenticationService: AuthenticationService,
|
authenticationService: AuthenticationService,
|
||||||
basicAlfrescoAuthService: BasicAlfrescoAuthService,
|
basicAlfrescoAuthService: BasicAlfrescoAuthService,
|
||||||
oidcAuthenticationService: OidcAuthenticationService,
|
oidcAuthenticationService: OidcAuthenticationService,
|
||||||
router: Router,
|
router: Router,
|
||||||
appConfigService: AppConfigService,
|
appConfigService: AppConfigService,
|
||||||
dialog: MatDialog,
|
dialog: MatDialog,
|
||||||
storageService: StorageService) {
|
storageService: StorageService
|
||||||
|
) {
|
||||||
super(authenticationService, basicAlfrescoAuthService, oidcAuthenticationService, router, appConfigService, dialog, storageService);
|
super(authenticationService, basicAlfrescoAuthService, oidcAuthenticationService, router, appConfigService, dialog, storageService);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -22,7 +22,7 @@ import { AuthGuard } from './auth-guard.service';
|
|||||||
import { AuthenticationService } from '../services/authentication.service';
|
import { AuthenticationService } from '../services/authentication.service';
|
||||||
import { CoreTestingModule } from '../../testing/core.testing.module';
|
import { CoreTestingModule } from '../../testing/core.testing.module';
|
||||||
import { StorageService } from '../../common/services/storage.service';
|
import { StorageService } from '../../common/services/storage.service';
|
||||||
import { OidcAuthenticationService } from '../services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
|
|
||||||
describe('AuthGuardService', () => {
|
describe('AuthGuardService', () => {
|
||||||
|
@@ -24,24 +24,24 @@ import { JwtHelperService } from '../services/jwt-helper.service';
|
|||||||
import { MatDialog } from '@angular/material/dialog';
|
import { MatDialog } from '@angular/material/dialog';
|
||||||
import { StorageService } from '../../common/services/storage.service';
|
import { StorageService } from '../../common/services/storage.service';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
import { OidcAuthenticationService } from '../services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class AuthGuard extends AuthGuardBase {
|
export class AuthGuard extends AuthGuardBase {
|
||||||
|
|
||||||
ticketChangeBind: any;
|
ticketChangeBind: any;
|
||||||
|
|
||||||
constructor(private jwtHelperService: JwtHelperService,
|
constructor(
|
||||||
authenticationService: AuthenticationService,
|
private jwtHelperService: JwtHelperService,
|
||||||
basicAlfrescoAuthService: BasicAlfrescoAuthService,
|
authenticationService: AuthenticationService,
|
||||||
oidcAuthenticationService: OidcAuthenticationService,
|
basicAlfrescoAuthService: BasicAlfrescoAuthService,
|
||||||
router: Router,
|
oidcAuthenticationService: OidcAuthenticationService,
|
||||||
appConfigService: AppConfigService,
|
router: Router,
|
||||||
dialog: MatDialog,
|
appConfigService: AppConfigService,
|
||||||
storageService: StorageService) {
|
dialog: MatDialog,
|
||||||
|
storageService: StorageService
|
||||||
|
) {
|
||||||
super(authenticationService, basicAlfrescoAuthService, oidcAuthenticationService, router, appConfigService, dialog, storageService);
|
super(authenticationService, basicAlfrescoAuthService, oidcAuthenticationService, router, appConfigService, dialog, storageService);
|
||||||
this.ticketChangeBind = this.ticketChange.bind(this);
|
this.ticketChangeBind = this.ticketChange.bind(this);
|
||||||
|
|
||||||
@@ -57,9 +57,11 @@ export class AuthGuard extends AuthGuardBase {
|
|||||||
this.ticketChangeRedirect(event);
|
this.ticketChangeRedirect(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.key.endsWith(JwtHelperService.USER_ACCESS_TOKEN) &&
|
if (
|
||||||
|
event.key.endsWith(JwtHelperService.USER_ACCESS_TOKEN) &&
|
||||||
this.jwtHelperService.getValueFromToken(event.newValue, JwtHelperService.USER_PREFERRED_USERNAME) !==
|
this.jwtHelperService.getValueFromToken(event.newValue, JwtHelperService.USER_PREFERRED_USERNAME) !==
|
||||||
this.jwtHelperService.getValueFromToken(event.oldValue, JwtHelperService.USER_PREFERRED_USERNAME)) {
|
this.jwtHelperService.getValueFromToken(event.oldValue, JwtHelperService.USER_PREFERRED_USERNAME)
|
||||||
|
) {
|
||||||
this.ticketChangeRedirect(event);
|
this.ticketChangeRedirect(event);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -16,4 +16,3 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
export * from './public-api';
|
export * from './public-api';
|
||||||
export * from './oidc/public-api';
|
|
||||||
|
@@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing';
|
|||||||
import { OidcAuthenticationService } from './oidc-authentication.service';
|
import { OidcAuthenticationService } from './oidc-authentication.service';
|
||||||
import { OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
|
import { OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
|
||||||
import { AppConfigService, AuthService } from '@alfresco/adf-core';
|
import { AppConfigService, AuthService } from '@alfresco/adf-core';
|
||||||
import { AUTH_MODULE_CONFIG } from '../oidc/auth-config';
|
import { AUTH_MODULE_CONFIG } from './auth-config';
|
||||||
|
|
||||||
interface MockAppConfigOAuth2 {
|
interface MockAppConfigOAuth2 {
|
||||||
oauth2: {
|
oauth2: {
|
||||||
@@ -46,7 +46,6 @@ class MockAppConfigService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class MockOAuthService {
|
class MockOAuthService {
|
||||||
clientId = 'testClientId';
|
clientId = 'testClientId';
|
||||||
redirectUri = 'testRedirectUri';
|
redirectUri = 'testRedirectUri';
|
@@ -21,11 +21,11 @@ import { Observable, defer, EMPTY } from 'rxjs';
|
|||||||
import { catchError, map } from 'rxjs/operators';
|
import { catchError, map } from 'rxjs/operators';
|
||||||
import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service';
|
import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service';
|
||||||
import { OauthConfigModel } from '../models/oauth-config.model';
|
import { OauthConfigModel } from '../models/oauth-config.model';
|
||||||
import { BaseAuthenticationService } from './base-authentication.service';
|
import { BaseAuthenticationService } from '../services/base-authentication.service';
|
||||||
import { CookieService } from '../../common/services/cookie.service';
|
import { CookieService } from '../../common/services/cookie.service';
|
||||||
import { JwtHelperService } from './jwt-helper.service';
|
import { JwtHelperService } from '../services/jwt-helper.service';
|
||||||
import { AuthConfigService } from '../oidc/auth-config.service';
|
import { AuthConfigService } from './auth-config.service';
|
||||||
import { AuthService } from '../oidc/auth.service';
|
import { AuthService } from './auth.service';
|
||||||
import { Minimatch } from 'minimatch';
|
import { Minimatch } from 'minimatch';
|
||||||
import { HttpHeaders } from '@angular/common/http';
|
import { HttpHeaders } from '@angular/common/http';
|
||||||
|
|
@@ -21,3 +21,4 @@ export * from './auth.service';
|
|||||||
export * from './oidc-auth.guard';
|
export * from './oidc-auth.guard';
|
||||||
export * from './redirect-auth.service';
|
export * from './redirect-auth.service';
|
||||||
export * from './view/authentication-confirmation/authentication-confirmation.component';
|
export * from './view/authentication-confirmation/authentication-confirmation.component';
|
||||||
|
export * from './oidc-authentication.service';
|
||||||
|
@@ -30,7 +30,6 @@ export * from './services/identity-group.service';
|
|||||||
export * from './services/jwt-helper.service';
|
export * from './services/jwt-helper.service';
|
||||||
export * from './services/oauth2.service';
|
export * from './services/oauth2.service';
|
||||||
export * from './services/user-access.service';
|
export * from './services/user-access.service';
|
||||||
export * from './services/oidc-authentication.service';
|
|
||||||
|
|
||||||
export * from './basic-auth/basic-alfresco-auth.service';
|
export * from './basic-auth/basic-alfresco-auth.service';
|
||||||
export * from './basic-auth/process-auth';
|
export * from './basic-auth/process-auth';
|
||||||
@@ -49,3 +48,5 @@ export * from './models/identity-role.model';
|
|||||||
|
|
||||||
export * from './models/user-access.model';
|
export * from './models/user-access.model';
|
||||||
export * from './models/application-access.model';
|
export * from './models/application-access.model';
|
||||||
|
|
||||||
|
export * from './oidc/public-api';
|
||||||
|
@@ -22,7 +22,7 @@ import { AppConfigService } from '../../app-config/app-config.service';
|
|||||||
import { setupTestBed } from '../../testing/setup-test-bed';
|
import { setupTestBed } from '../../testing/setup-test-bed';
|
||||||
import { CoreTestingModule } from '../../testing/core.testing.module';
|
import { CoreTestingModule } from '../../testing/core.testing.module';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
import { OidcAuthenticationService } from './oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
|
|
||||||
declare let jasmine: any;
|
declare let jasmine: any;
|
||||||
|
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { Injectable, Injector } from '@angular/core';
|
import { Injectable, Injector } from '@angular/core';
|
||||||
import { OidcAuthenticationService } from './oidc-authentication.service';
|
import { OidcAuthenticationService } from '../oidc/oidc-authentication.service';
|
||||||
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service';
|
||||||
import { Observable, Subject, from } from 'rxjs';
|
import { Observable, Subject, from } from 'rxjs';
|
||||||
import { HttpHeaders } from '@angular/common/http';
|
import { HttpHeaders } from '@angular/common/http';
|
||||||
@@ -28,30 +28,18 @@ import { RedirectAuthService } from '../oidc/redirect-auth.service';
|
|||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
export class AuthenticationService implements AuthenticationServiceInterface, ee.Emitter {
|
export class AuthenticationService implements AuthenticationServiceInterface, ee.Emitter {
|
||||||
|
|
||||||
onLogin: Subject<any> = new Subject<any>();
|
onLogin: Subject<any> = new Subject<any>();
|
||||||
onLogout: Subject<any> = new Subject<any>();
|
onLogout: Subject<any> = new Subject<any>();
|
||||||
|
|
||||||
constructor(
|
constructor(private injector: Injector, private redirectAuthService: RedirectAuthService) {
|
||||||
private injector: Injector,
|
this.redirectAuthService.onLogin.subscribe((value) => this.onLogin.next(value));
|
||||||
private redirectAuthService: RedirectAuthService
|
|
||||||
) {
|
|
||||||
this.redirectAuthService.onLogin.subscribe(
|
|
||||||
(value) => this.onLogin.next(value)
|
|
||||||
);
|
|
||||||
|
|
||||||
this.basicAlfrescoAuthService.onLogin.subscribe(
|
this.basicAlfrescoAuthService.onLogin.subscribe((value) => this.onLogin.next(value));
|
||||||
(value) => this.onLogin.next(value)
|
|
||||||
);
|
|
||||||
|
|
||||||
if (this.isOauth()) {
|
if (this.isOauth()) {
|
||||||
this.oidcAuthenticationService.onLogout.subscribe(
|
this.oidcAuthenticationService.onLogout.subscribe((value) => this.onLogout.next(value));
|
||||||
(value) => this.onLogout.next(value)
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
this.basicAlfrescoAuthService.onLogout.subscribe(
|
this.basicAlfrescoAuthService.onLogout.subscribe((value) => this.onLogout.next(value));
|
||||||
(value) => this.onLogout.next(value)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,7 +64,9 @@ export class AuthenticationService implements AuthenticationServiceInterface, ee
|
|||||||
}
|
}
|
||||||
|
|
||||||
addTokenToHeader(requestUrl: string, headersArg?: HttpHeaders): Observable<HttpHeaders> {
|
addTokenToHeader(requestUrl: string, headersArg?: HttpHeaders): Observable<HttpHeaders> {
|
||||||
return this.isOauth() ? this.oidcAuthenticationService.addTokenToHeader(requestUrl, headersArg) : this.basicAlfrescoAuthService.addTokenToHeader(requestUrl, headersArg);
|
return this.isOauth()
|
||||||
|
? this.oidcAuthenticationService.addTokenToHeader(requestUrl, headersArg)
|
||||||
|
: this.basicAlfrescoAuthService.addTokenToHeader(requestUrl, headersArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
isECMProvider(): boolean {
|
isECMProvider(): boolean {
|
||||||
@@ -205,5 +195,4 @@ export class AuthenticationService implements AuthenticationServiceInterface, ee
|
|||||||
isKerberosEnabled(): boolean {
|
isKerberosEnabled(): boolean {
|
||||||
return !this.isOauth() ? this.basicAlfrescoAuthService.isKerberosEnabled() : false;
|
return !this.isOauth() ? this.basicAlfrescoAuthService.isKerberosEnabled() : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
import { BasicAlfrescoAuthService, CoreTestingModule, LoginDialogPanelComponent } from '@alfresco/adf-core';
|
import { BasicAlfrescoAuthService, CoreTestingModule, LoginDialogPanelComponent } from '@alfresco/adf-core';
|
||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
import { of } from 'rxjs';
|
import { of } from 'rxjs';
|
||||||
import { OidcAuthenticationService } from '../../../auth/services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../../../auth/oidc/oidc-authentication.service';
|
||||||
|
|
||||||
describe('LoginDialogPanelComponent', () => {
|
describe('LoginDialogPanelComponent', () => {
|
||||||
let component: LoginDialogPanelComponent;
|
let component: LoginDialogPanelComponent;
|
||||||
|
@@ -29,7 +29,7 @@ import { Validators } from '@angular/forms';
|
|||||||
|
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { EMPTY, of, throwError } from 'rxjs';
|
import { EMPTY, of, throwError } from 'rxjs';
|
||||||
import { OidcAuthenticationService } from '../../../auth/services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../../../auth/oidc/oidc-authentication.service';
|
||||||
import { LoginComponent } from './login.component';
|
import { LoginComponent } from './login.component';
|
||||||
|
|
||||||
describe('LoginComponent', () => {
|
describe('LoginComponent', () => {
|
||||||
|
@@ -31,7 +31,7 @@ import { Subject } from 'rxjs';
|
|||||||
import { takeUntil } from 'rxjs/operators';
|
import { takeUntil } from 'rxjs/operators';
|
||||||
import { AppConfigService, AppConfigValues } from '../../../app-config';
|
import { AppConfigService, AppConfigValues } from '../../../app-config';
|
||||||
import { AuthenticationService, BasicAlfrescoAuthService } from '../../../auth';
|
import { AuthenticationService, BasicAlfrescoAuthService } from '../../../auth';
|
||||||
import { OidcAuthenticationService } from '../../../auth/services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../../../auth/oidc/oidc-authentication.service';
|
||||||
import { UserPreferencesService } from '../../../common';
|
import { UserPreferencesService } from '../../../common';
|
||||||
import { TranslationService } from '../../../translation';
|
import { TranslationService } from '../../../translation';
|
||||||
|
|
||||||
|
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
import { CoreTestingModule, LoginComponent, LoginFooterDirective } from '@alfresco/adf-core';
|
import { CoreTestingModule, LoginComponent, LoginFooterDirective } from '@alfresco/adf-core';
|
||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
import { OidcAuthenticationService } from '../../auth/services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../../auth/oidc/oidc-authentication.service';
|
||||||
|
|
||||||
describe('LoginFooterDirective', () => {
|
describe('LoginFooterDirective', () => {
|
||||||
let fixture: ComponentFixture<LoginComponent>;
|
let fixture: ComponentFixture<LoginComponent>;
|
||||||
|
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
import { CoreTestingModule, LoginComponent, LoginHeaderDirective } from '@alfresco/adf-core';
|
import { CoreTestingModule, LoginComponent, LoginHeaderDirective } from '@alfresco/adf-core';
|
||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
import { OidcAuthenticationService } from '../../auth/services/oidc-authentication.service';
|
import { OidcAuthenticationService } from '../../auth/oidc/oidc-authentication.service';
|
||||||
|
|
||||||
describe('LoginHeaderDirective', () => {
|
describe('LoginHeaderDirective', () => {
|
||||||
let fixture: ComponentFixture<LoginComponent>;
|
let fixture: ComponentFixture<LoginComponent>;
|
||||||
|
@@ -59,4 +59,3 @@ export * from './lib/common';
|
|||||||
|
|
||||||
export * from './lib/material.module';
|
export * from './lib/material.module';
|
||||||
export * from './lib/core.module';
|
export * from './lib/core.module';
|
||||||
export { AuthModule } from './lib/auth/oidc/auth.module';
|
|
||||||
|
@@ -21,12 +21,11 @@ import { ContentModule, ContentNodeSelectorPanelComponent, DocumentListService,
|
|||||||
import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
|
import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
|
||||||
import { ProcessTestingModule } from '../../../testing/process.testing.module';
|
import { ProcessTestingModule } from '../../../testing/process.testing.module';
|
||||||
import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.component';
|
import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.component';
|
||||||
import { AlfrescoApiService, BasicAlfrescoAuthService } from '@alfresco/adf-core';
|
import { AlfrescoApiService, BasicAlfrescoAuthService, OidcAuthenticationService } from '@alfresco/adf-core';
|
||||||
import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface';
|
import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface';
|
||||||
import { of, throwError } from 'rxjs';
|
import { of, throwError } from 'rxjs';
|
||||||
import { By } from '@angular/platform-browser';
|
import { By } from '@angular/platform-browser';
|
||||||
import { Node, SiteEntry, NodeEntry, SitePaging, SitePagingList } from '@alfresco/js-api';
|
import { Node, SiteEntry, NodeEntry, SitePaging, SitePagingList } from '@alfresco/js-api';
|
||||||
import { OidcAuthenticationService } from 'lib/core/src/lib/auth/services/oidc-authentication.service';
|
|
||||||
|
|
||||||
describe('AttachFileWidgetDialogComponent', () => {
|
describe('AttachFileWidgetDialogComponent', () => {
|
||||||
let widget: AttachFileWidgetDialogComponent;
|
let widget: AttachFileWidgetDialogComponent;
|
||||||
|
Reference in New Issue
Block a user