[AAE-12501] move auth in ADF (#8689)

* remove unneeded JS-API dep move auth in the right place * [AAE-12501] Replace alfresco api client with AdfHttpClient * [AAE-12501] Restore get username methods * [AAE-12501] Get username with authentication service * [AAE-12501] Create a request options interface with the needed props, remove the import from js-api, return the body from request * add emitters * [AAE-12501] Replace Math.random() to fix hospot security issue, fix lint issues * [AAE-12501] Comment temporary setCsrfToken because is not possible to import app config service from core due to circular dependencies * [AAE-12501] Get disableCsrf from app config serviice when app configuration is loaded * [AAE-12501] Remove wrong character * Pass down the requestUrl for request interception bring back check from js-api fixing isLogin issues part1 some fix around emit Narrow access for methods fix sso username issue Switch to dynamic service injection add emitters move auth inside ADF * clean * fix unit test * fix lint * Fix exports * Fix process-services unit tests * Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests * Fix content-services unit tests: getEcmUsername from authentication service Fix content-services unit tests: alfresco api service has been replaced by authentication service * Fix circular dependecies issue importing AppConfigService outside the api entrypoint dir * Import AuthModule even in not only canary mode to let the e2es run * Fix authentication unit tests * Fix unit test '[ECM] should return a ticket undefined after logout' * Remove AlfrescoApiService is not used anymore * Fix unit test '[BPM] should return an BPM ticket after the login done': add Basic suffix to basicAuth * Fix unit tests core * Fix login errors with the BASIC authentication * Fix missing onLogin event * Temporary skip unit tests to check e2es * Fix login component doesn't add the authorization header * Fix prefix is undefined * Fix image is not showed by the alfresco file viewer because alf_ticket is not added to the content url query params, pass ticketEcm to the alfrescoApi configuration used by alfrescoApiClient.ts getAlfTicket() * Fix C280012: set app prefix before calling content api * Revert "Fix image is not showed by the alfresco file viewer because alf_ticket is not added to the content url query params, pass ticketEcm to the alfrescoApi configuration used by alfrescoApiClient.ts getAlfTicket()" This reverts commit afbf086b98d72835aab8b15d4af433efeaac2d3b. * try to change adf core autoamtion service init * go back * grant type password login * fix * remove automatic login in reset try * fix not silent login * lint happy * fix * Update alfresco-api-v2-loader.service.ts * fixint * Revert "Temporary skip unit tests to check e2es" This reverts commit a0adc7e58a001a54442c82952761bff891caa5cd. * fix modules * fix app config stream in storing service fix app config stream for sub property * fix identity test to use the real service * fix unit * fix unit * fix unit * remove test that are probably have never been green * fix * fix PC * fix localstorage * fix * fix * fix * fix * fix storybook move e2e in content for versioning fix lint * fix * fix size * enable log * some fix for usernames * remove log * fix rebase * [AAE-12502] Restore isKerberosEnabled into authentication service * subject onLogin * fix unit * Fix lint issue * fix * Update error message * Revert change did by b79c5d37d6\#diff-ad85723e21276e05e577bab652c6ab0d243bd0ad54d4cc70ef6e60dc5e635c33L38 * Refresh the browser to wait for the user to click process cloud page * Remove e2e, the application list is already tested by the app-list-cloud.component.spec.ts https://github.com/Alfresco/alfresco-ng2-components/blob/dev-eromano-AAE-12501-2/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts\#L147 * [12502] Add getUsername method to the AuthenticationService * [12501] restore mutlipart/form-data header needed by angular http-client to to fix 415 unsupported media type * Revert "[12501] restore mutlipart/form-data header needed by angular http-client to to fix 415 unsupported media type" This reverts commit d8c584b94f649b57859d74157ec0861f2ebddebb. * [12501] fix unsupported upload file on admin-apa, append json content type only calling alfresco api * [12501] fix unsupported upload file on admin-apa [12501] fix unsupported upload file on admin-apa * Revert "[12501] fix unsupported upload file on admin-apa" This reverts commit 53cda21d795588d87244c78c5a5347afd04ea2b1. * Improve getHeaders * Revert change * Set application/json content type if request body is not a FormData * Logout by the authenticationService * Update returned error message * Fix lint issues after rebasing * [12502] Add basic template with data-automation-ad selector to check when is attached to the Dom * Fix issues after rebase --------- Co-authored-by: Amedeo Lepore <amedeo.lepore@hyland.com> Co-authored-by: Andras Popovics <popovics@ndras.hu>
2025-07-24 17:32:15 +00:00 · 2023-11-06 14:25:27 +01:00
parent 057e0bcd7c
commit 08da9ae2c3
111 changed files with 2157 additions and 1417 deletions
--- a/lib/content-services/src/lib/common/services/content.service.spec.ts
+++ b/lib/content-services/src/lib/common/services/content.service.spec.ts
@@ -21,16 +21,11 @@ import { AppConfigService, AuthenticationService, StorageService, CoreTestingMod
 import { Node, PermissionsInfo } from '@alfresco/js-api';
 import { TranslateModule } from '@ngx-translate/core';

-declare let jasmine: any;
-
 describe('ContentService', () => {

    let contentService: ContentService;
    let authService: AuthenticationService;
    let storage: StorageService;
-    let node: any;
-
-    const nodeId = 'fake-node-id';

    beforeEach(() => {
        TestBed.configureTestingModule({
@@ -44,14 +39,6 @@ describe('ContentService', () => {
        storage = TestBed.inject(StorageService);
        storage.clear();

-        node = {
-            entry: {
-                id: nodeId
-            }
-        };
-
-        jasmine.Ajax.install();
-
        const appConfig: AppConfigService = TestBed.inject(AppConfigService);
        appConfig.config = {
            ecmHost: 'http://localhost:9876/ecm',
@@ -59,24 +46,6 @@ describe('ContentService', () => {
        };
    });

-    afterEach(() => {
-        jasmine.Ajax.uninstall();
-    });
-
-    it('should return a valid content URL', (done) => {
-        authService.login('fake-username', 'fake-password').subscribe(() => {
-            expect(contentService.getContentUrl(node)).toContain('/ecm/alfresco/api/' +
-                '-default-/public/alfresco/versions/1/nodes/fake-node-id/content?attachment=false&alf_ticket=fake-post-ticket');
-            done();
-        });
-
-        jasmine.Ajax.requests.mostRecent().respondWith({
-            status: 201,
-            contentType: 'application/json',
-            responseText: JSON.stringify({ entry: { id: 'fake-post-ticket', userId: 'admin' } })
-        });
-    });
-
    describe('AllowableOperations', () => {

        it('should hasAllowableOperations be false if allowableOperation is not present in the node', () => {
--- a/lib/content-services/src/lib/common/services/discovery-api.service.ts
+++ b/lib/content-services/src/lib/common/services/discovery-api.service.ts
@@ -18,16 +18,27 @@
 import { Injectable } from '@angular/core';
 import { from, Observable, throwError, Subject } from 'rxjs';
 import { catchError, map, switchMap, filter, take } from 'rxjs/operators';
-import { RepositoryInfo, SystemPropertiesRepresentation } from '@alfresco/js-api';
+import {
+    RepositoryInfo,
+    SystemPropertiesRepresentation,
+    DiscoveryApi,
+    AboutApi,
+    SystemPropertiesApi
+} from '@alfresco/js-api';

-import { BpmProductVersionModel, AuthenticationService } from '@alfresco/adf-core';
-import { ApiClientsService } from '@alfresco/adf-core/api';
+import { AlfrescoApiService, BpmProductVersionModel, AuthenticationService } from '@alfresco/adf-core';

@Injectable({
    providedIn: 'root'
 })
 export class DiscoveryApiService {

+    private _discoveryApi: DiscoveryApi;
+    get discoveryApi(): DiscoveryApi {
+        this._discoveryApi = this._discoveryApi ?? new DiscoveryApi(this.alfrescoApiService.getInstance());
+        return this._discoveryApi;
+    }
+
    /**
     * Gets product information for Content Services.
     */
@@ -35,15 +46,17 @@ export class DiscoveryApiService {

    constructor(
        private authenticationService: AuthenticationService,
-        private apiClientsService: ApiClientsService
+        private alfrescoApiService: AlfrescoApiService
    ) {
-        this.authenticationService.onLogin
-            .pipe(
+        this.authenticationService.onLogin.subscribe(() => {
+            this.alfrescoApiService.alfrescoApiInitialized.pipe(
                filter(() => this.authenticationService.isEcmLoggedIn()),
                take(1),
                switchMap(() => this.getEcmProductInfo())
            )
-            .subscribe((info) => this.ecmProductInfo$.next(info));
+                .subscribe((info) => this.ecmProductInfo$.next(info));
+
+        });
    }


@@ -53,9 +66,8 @@ export class DiscoveryApiService {
     * @returns ProductVersionModel containing product details
     */
    getEcmProductInfo(): Observable<RepositoryInfo> {
-        const discoveryApi = this.apiClientsService.get('DiscoveryClient.discovery');

-        return from(discoveryApi.getRepositoryInformation())
+        return from(this.discoveryApi.getRepositoryInformation())
            .pipe(
                map((res) => res.entry.repository),
                catchError((err) => throwError(err))
@@ -68,7 +80,7 @@ export class DiscoveryApiService {
     * @returns ProductVersionModel containing product details
     */
    getBpmProductInfo(): Observable<BpmProductVersionModel> {
-        const aboutApi = this.apiClientsService.get('ActivitiClient.about');
+        const aboutApi = new AboutApi(this.alfrescoApiService.getInstance());

        return from(aboutApi.getAppVersion())
            .pipe(
@@ -78,7 +90,7 @@ export class DiscoveryApiService {
    }

    getBPMSystemProperties(): Observable<SystemPropertiesRepresentation> {
-        const systemPropertiesApi = this.apiClientsService.get('ActivitiClient.system-properties');
+        const systemPropertiesApi = new SystemPropertiesApi(this.alfrescoApiService.getInstance());

        return from(systemPropertiesApi.getProperties())
            .pipe(
--- 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
@@ -25,7 +25,6 @@ import {
 import {
    AlfrescoApiService,
    AlfrescoApiServiceMock,
-    AuthenticationService,
    CoreTestingModule
 } from '@alfresco/adf-core';
 import { PeopleContentQueryRequestModel, PeopleContentService } from './people-content.service';
@@ -34,7 +33,6 @@ import { TestBed } from '@angular/core/testing';

 describe('PeopleContentService', () => {
    let peopleContentService: PeopleContentService;
-    let authenticationService: AuthenticationService;

    beforeEach(() => {
        TestBed.configureTestingModule({
@@ -47,7 +45,6 @@ describe('PeopleContentService', () => {
            ]
        });

-        authenticationService = TestBed.inject(AuthenticationService);
        peopleContentService = TestBed.inject(PeopleContentService);
    });

@@ -130,17 +127,6 @@ describe('PeopleContentService', () => {
        expect(getCurrentPersonSpy.calls.count()).toEqual(1);
    });

-    it('should reset the admin cache upon logout', async () => {
-        spyOn(peopleContentService.peopleApi, 'getPerson').and.returnValue(Promise.resolve({ entry: fakeEcmAdminUser } as any));
-
-        const user = await peopleContentService.getCurrentUserInfo().toPromise();
-        expect(user.id).toEqual('fake-id');
-        expect(peopleContentService.isCurrentUserAdmin()).toBe(true);
-
-        authenticationService.onLogout.next(true);
-        expect(peopleContentService.isCurrentUserAdmin()).toBe(false);
-    });
-
    it('should not change current user on every getPerson call', async () => {
        const getCurrentPersonSpy = spyOn(peopleContentService.peopleApi, 'getPerson').and.returnValue(Promise.resolve({entry: fakeEcmAdminUser} as any));
        await peopleContentService.getCurrentUserInfo().toPromise();
--- 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);
--- a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
@@ -18,7 +18,6 @@
 import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, QueryList, Component, ViewChild, SimpleChanges } from '@angular/core';
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import {
-    AlfrescoApiService,
    DataColumnListComponent,
    DataColumnComponent,
    DataColumn,
@@ -27,7 +26,8 @@ import {
    ObjectDataTableAdapter,
    ShowHeaderMode,
    ThumbnailService,
-    AppConfigService
+    AppConfigService,
+    AuthenticationService
 } from '@alfresco/adf-core';
 import { ContentService } from '../../common/services/content.service';
 import { Subject, of, throwError } from 'rxjs';
@@ -70,7 +70,6 @@ const mockDialog = {
 describe('DocumentList', () => {
    let documentList: DocumentListComponent;
    let documentListService: DocumentListService;
-    let apiService: AlfrescoApiService;
    let customResourcesService: CustomResourcesService;
    let thumbnailService: ThumbnailService;
    let contentService: ContentService;
@@ -82,6 +81,7 @@ describe('DocumentList', () => {
    let spyFavorite: any;
    let spyFolder: any;
    let spyFolderNode: any;
+    let authenticationService: AuthenticationService;

    beforeEach(() => {
        TestBed.configureTestingModule({
@@ -99,11 +99,11 @@ describe('DocumentList', () => {
        documentList = fixture.componentInstance;

        documentListService = TestBed.inject(DocumentListService);
-        apiService = TestBed.inject(AlfrescoApiService);
        customResourcesService = TestBed.inject(CustomResourcesService);
        thumbnailService = TestBed.inject(ThumbnailService);
        contentService = TestBed.inject(ContentService);
        appConfigService = TestBed.inject(AppConfigService);
+        authenticationService = TestBed.inject(AuthenticationService);

        spyFolder = spyOn(documentListService, 'getFolder').and.returnValue(of({ list: {} }));
        spyFolderNode = spyOn(documentListService, 'getFolderNode').and.returnValue(of(new NodeEntry({ entry: new Node() })));
@@ -611,7 +611,7 @@ describe('DocumentList', () => {
            title: 'FileAction'
        });

-        spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('lockOwner');
+        spyOn(authenticationService, 'getEcmUsername').and.returnValue('lockOwner');

        documentList.actions = [documentMenu];

@@ -642,7 +642,7 @@ describe('DocumentList', () => {
            title: 'FileAction'
        });

-        spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('jerryTheKillerCow');
+        spyOn(authenticationService, 'getEcmUsername').and.returnValue('jerryTheKillerCow');

        documentList.actions = [documentMenu];

--- a/lib/content-services/src/lib/document-list/services/lock.service.spec.ts
+++ b/lib/content-services/src/lib/document-list/services/lock.service.spec.ts
@@ -17,7 +17,7 @@

 import { TestBed } from '@angular/core/testing';
 import { LockService } from './lock.service';
-import { CoreTestingModule, AlfrescoApiService } from '@alfresco/adf-core';
+import { CoreTestingModule, AuthenticationService } from '@alfresco/adf-core';
 import { Node } from '@alfresco/js-api';
 import { TranslateModule } from '@ngx-translate/core';
 import { addDays, subDays } from 'date-fns';
@@ -25,7 +25,7 @@ import { addDays, subDays } from 'date-fns';
 describe('PeopleProcessService', () => {

    let service: LockService;
-    let apiService: AlfrescoApiService;
+    let authenticationService: AuthenticationService;

    const fakeNodeUnlocked: Node = { name: 'unlocked', isLocked: false, isFile: true } as Node;
    const fakeFolderNode: Node = { name: 'unlocked', isLocked: false, isFile: false, isFolder: true } as Node;
@@ -39,7 +39,7 @@ describe('PeopleProcessService', () => {
            ]
        });
        service = TestBed.inject(LockService);
-        apiService = TestBed.inject(AlfrescoApiService);
+        authenticationService = TestBed.inject(AuthenticationService);
    });

    it('should return false when no lock is configured', () => {
@@ -145,22 +145,22 @@ describe('PeopleProcessService', () => {
        } as Node;

        it('should return false when the user is the lock owner', () => {
-            spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('lock-owner-user');
+            spyOn(authenticationService, 'getEcmUsername').and.returnValue('lock-owner-user');
            expect(service.isLocked(nodeOwnerAllowedLock)).toBeFalsy();
        });

        it('should return true when the user is not the lock owner', () => {
-            spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('banana-user');
+            spyOn(authenticationService, 'getEcmUsername').and.returnValue('banana-user');
            expect(service.isLocked(nodeOwnerAllowedLock)).toBeTruthy();
        });

        it('should return false when the user is not the lock owner but the lock is expired', () => {
-            spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('banana-user');
+            spyOn(authenticationService, 'getEcmUsername').and.returnValue('banana-user');
            expect(service.isLocked(nodeOwnerAllowedLockWithExpiredDate)).toBeFalsy();
        });

        it('should return true when is not the lock owner and the expiration date is valid', () => {
-            spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('banana-user');
+            spyOn(authenticationService, 'getEcmUsername').and.returnValue('banana-user');
            expect(service.isLocked(nodeOwnerAllowedLockWithActiveExpiration)).toBeTruthy();
        });
   });
--- a/lib/content-services/src/lib/testing/content.testing.module.ts
+++ b/lib/content-services/src/lib/testing/content.testing.module.ts
@@ -27,7 +27,8 @@ import {
    AlfrescoApiServiceMock,
    AppConfigServiceMock,
    TranslationMock,
-    CookieServiceMock
+    CookieServiceMock,
+    AuthModule
 } from '@alfresco/adf-core';
 import { ContentModule } from '../content.module';
 import { TranslateModule } from '@ngx-translate/core';
@@ -37,6 +38,7 @@ import { MatIconTestingModule } from '@angular/material/icon/testing';

@NgModule({
    imports: [
+        AuthModule.forRoot({ useHash: true }),
        NoopAnimationsModule,
        RouterTestingModule,
        TranslateModule,