diff --git a/lib/content-services/src/lib/common/services/people-content.service.spec.ts b/lib/content-services/src/lib/common/services/people-content.service.spec.ts index 29b58c96d5..fc8758663c 100644 --- a/lib/content-services/src/lib/common/services/people-content.service.spec.ts +++ b/lib/content-services/src/lib/common/services/people-content.service.spec.ts @@ -15,20 +15,8 @@ * limitations under the License. */ -import { - createNewPersonMock, - fakeEcmAdminUser, - fakeEcmUser, - fakeEcmUser2, - fakeEcmUserList -} from '../mocks/ecm-user.service.mock'; -import { - AlfrescoApiService, - AlfrescoApiServiceMock, - AuthenticationService, - CoreTestingModule, - LogService -} from '@alfresco/adf-core'; +import { fakeEcmUserList, createNewPersonMock, fakeEcmUser, fakeEcmUser2, fakeEcmAdminUser, fakeEcmUserList } from '../mocks/ecm-user.service.mock'; +import { AlfrescoApiService, AlfrescoApiServiceMock, AuthenticationService, CoreTestingModule, LogService } from '@alfresco/adf-core'; import { PeopleContentQueryRequestModel, PeopleContentService } from './people-content.service'; import { TranslateModule } from '@ngx-translate/core'; import { TestBed } from '@angular/core/testing'; @@ -37,7 +25,6 @@ describe('PeopleContentService', () => { let peopleContentService: PeopleContentService; let logService: LogService; - let authenticationService: AuthenticationService; beforeEach(() => { TestBed.configureTestingModule({ @@ -50,7 +37,6 @@ describe('PeopleContentService', () => { ] }); - authenticationService = TestBed.inject(AuthenticationService); peopleContentService = TestBed.inject(PeopleContentService); logService = TestBed.inject(LogService); }); @@ -133,7 +119,7 @@ describe('PeopleContentService', () => { await peopleContentService.getCurrentUserInfo().toPromise(); - expect(await peopleContentService.isCurrentUserAdmin()).toBe(true); + expect(peopleContentService.isCurrentUserAdmin()).toBe(true); expect(getCurrentPersonSpy.calls.count()).toEqual(1); }); diff --git a/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts b/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts index 06a6553d75..b88c2dfd7e 100644 --- a/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts +++ b/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts @@ -18,8 +18,7 @@ import { Component, ViewChild } from '@angular/core'; import { LibraryFavoriteDirective } from './library-favorite.directive'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { TranslateModule } from '@ngx-translate/core'; -import { AlfrescoApiServiceMock, CoreModule, AlfrescoApiService } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { LibraryEntity } from '../interfaces/library-entity.interface'; @Component({ @@ -40,10 +39,7 @@ describe('LibraryFavoriteDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), CoreModule.forRoot()], - providers: [ - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock } - ], + imports: [CoreTestingModule], declarations: [TestComponent, LibraryFavoriteDirective] }); fixture = TestBed.createComponent(TestComponent); diff --git a/lib/core/api/src/lib/adf-http-client.service.ts b/lib/core/api/src/lib/adf-http-client.service.ts index 77fd0c4ea9..9808c8c6fe 100644 --- a/lib/core/api/src/lib/adf-http-client.service.ts +++ b/lib/core/api/src/lib/adf-http-client.service.ts @@ -289,7 +289,8 @@ export class AdfHttpClient implements ee.Emitter,JsApiHttpClient { } private createCSRFToken(a?: any): string { - return a ? (a ^ ((Math.random() * 16) >> (a / 4))).toString(16) : ([1e16] + (1e16).toString()).replace(/[01]/g, this.createCSRFToken); + const randomValue = window.crypto.getRandomValues(new Uint32Array(1))[0]; + return a ? (a ^ ((randomValue * 16) >> (a / 4))).toString(16) : ([1e16] + (1e16).toString()).replace(/[01]/g, this.createCSRFToken); } private static getResponseType(options: RequestOptions): 'blob' | 'json' | 'text' { diff --git a/lib/core/src/lib/app-config/app-config.loader.ts b/lib/core/src/lib/app-config/app-config.loader.ts index 10c17ebb48..402b50c172 100644 --- a/lib/core/src/lib/app-config/app-config.loader.ts +++ b/lib/core/src/lib/app-config/app-config.loader.ts @@ -26,7 +26,7 @@ export function loadAppConfig(appConfigService: AppConfigService, storageService storageService.prefix = appConfigService.get(AppConfigValues.STORAGE_PREFIX, ''); appConfigService.select(AppConfigValues.STORAGE_PREFIX).subscribe((property) => { - storageService.prefix = property + storageService.prefix = property; }); }; return () => appConfigService.load(init); diff --git a/lib/core/src/lib/app-config/app-config.service.ts b/lib/core/src/lib/app-config/app-config.service.ts index 8ccbcc0b4f..667a3de83c 100644 --- a/lib/core/src/lib/app-config/app-config.service.ts +++ b/lib/core/src/lib/app-config/app-config.service.ts @@ -78,7 +78,7 @@ export class AppConfigService { onLoad: Observable; get isLoaded() { - return this.status = Status.LOADED; + return this.status === Status.LOADED; } constructor(protected http: HttpClient, protected extensionService: ExtensionService) { diff --git a/lib/core/src/lib/auth/basic-auth/content-auth.ts b/lib/core/src/lib/auth/basic-auth/content-auth.ts index e74d912f24..d5edd4bd36 100644 --- a/lib/core/src/lib/auth/basic-auth/content-auth.ts +++ b/lib/core/src/lib/auth/basic-auth/content-auth.ts @@ -196,7 +196,7 @@ export class ContentAuth { if (ticketBodyCreate === null || ticketBodyCreate === undefined) { this.onError.next((`Missing param ticketBodyCreate`)); - throw new Error(`Missing param '${name}'`); + throw new Error(`Missing param ticketBodyCreate`); } return this.adfHttpClient.post(this.basePath + '/tickets', {bodyParam: ticketBodyCreate}); diff --git a/lib/core/src/lib/auth/services/base-authentication.service.ts b/lib/core/src/lib/auth/services/base-authentication.service.ts index 591950ae88..fa135b0e13 100644 --- a/lib/core/src/lib/auth/services/base-authentication.service.ts +++ b/lib/core/src/lib/auth/services/base-authentication.service.ts @@ -100,7 +100,7 @@ export abstract class BaseAuthenticationService implements AuthenticationService isBPMProvider(): boolean { const provider = this.appConfig.get('providers'); if (provider && (typeof provider === 'string' || provider instanceof String)) { - return provider && provider.toUpperCase() === 'BPM'; + return provider.toUpperCase() === 'BPM'; } else { return false; } diff --git a/lib/core/src/lib/testing/core.testing.module.ts b/lib/core/src/lib/testing/core.testing.module.ts index 1b27aebb4a..6226ae618a 100644 --- a/lib/core/src/lib/testing/core.testing.module.ts +++ b/lib/core/src/lib/testing/core.testing.module.ts @@ -32,7 +32,7 @@ import { CookieServiceMock } from '../mock/cookie.service.mock'; import { HttpClientModule } from '@angular/common/http'; import { directionalityConfigFactory } from '../common/services/directionality-config-factory'; import { DirectionalityConfigService } from '../common/services/directionality-config.service'; -import { AuthModule } from "../auth"; +import { AuthModule } from '../auth'; @NgModule({ imports: [ diff --git a/lib/core/src/lib/translation/translate-loader.spec.ts b/lib/core/src/lib/translation/translate-loader.spec.ts index a02da25253..8325d45692 100644 --- a/lib/core/src/lib/translation/translate-loader.spec.ts +++ b/lib/core/src/lib/translation/translate-loader.spec.ts @@ -20,6 +20,7 @@ import { TranslateLoaderService } from './translate-loader.service'; import { TranslationService } from './translation.service'; import { TranslateModule } from '@ngx-translate/core'; import { CoreModule } from '../core.module'; +import { AuthModule } from '../auth'; declare let jasmine: any; @@ -30,6 +31,7 @@ describe('TranslateLoader', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ + AuthModule.forRoot({ useHash: true }), TranslateModule.forRoot(), CoreModule.forRoot() ], diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts index 27f03b530d..d6c721b232 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts @@ -1227,10 +1227,11 @@ describe('retrieve metadata on submit', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ + AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), CoreModule.forRoot(), - FormCloudModule + FormCloudModule, ], providers: [ provideTranslations('app', 'resources'), diff --git a/lib/testing/src/lib/protractor/core/actions/identity/identity.service.ts b/lib/testing/src/lib/protractor/core/actions/identity/identity.service.ts index 85d54b430c..beebe29f2b 100644 --- a/lib/testing/src/lib/protractor/core/actions/identity/identity.service.ts +++ b/lib/testing/src/lib/protractor/core/actions/identity/identity.service.ts @@ -82,7 +82,6 @@ export class IdentityService { const method = 'DELETE'; const queryParams = {}; const postBody = {}; - return this.api.performIdentityOperation(path, method, queryParams, postBody); const deletePromise = this.api.performIdentityOperation(path, method, queryParams, postBody);