[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/core/api/src/index.ts
+++ b/lib/core/api/src/index.ts
@@ -15,9 +15,6 @@
 * limitations under the License.
 */

-export * from './lib/api-client.factory';
-export * from './lib/api-clients.service';
-export * from './lib/clients';
 export * from './lib/types';
 export * from './lib/adf-http-client.service';
 export * from './lib/interfaces';
--- a/lib/core/api/src/lib/adf-http-client.service.spec.ts
+++ b/lib/core/api/src/lib/adf-http-client.service.spec.ts
@@ -321,4 +321,86 @@ describe('AdfHttpClient', () => {
        req.flush(null, { status: 200, statusText: 'Ok' });
    });

+    it('should set Content-type to multipart/form-data if contentTypes array contains only multipart/form-data element', () => {
+        const options: RequestOptions = {
+            path: '',
+            httpMethod: 'POST',
+            contentTypes: ['multipart/form-data'],
+            queryParams: {
+                lastModifiedFrom: new Date('2022-08-17T00:00:00.000Z')
+            }
+        };
+
+        angularHttpClient.request('http://example.com', options, securityOptions, emitters).catch(error =>
+            fail(error)
+        );
+
+        const req = controller.expectOne('http://example.com?lastModifiedFrom=2022-08-17T00%3A00%3A00.000Z');
+
+        expect(req.request.headers.get('Content-Type')).toEqual('multipart/form-data');
+
+        req.flush(null, { status: 200, statusText: 'Ok' });
+    });
+
+    it('should set Content-type header to application/json if contentTypes array contains application/json', () => {
+        const options: RequestOptions = {
+            path: '',
+            httpMethod: 'POST',
+            contentTypes: ['multipart/form-data', 'application/json'],
+            queryParams: {
+                lastModifiedFrom: new Date('2022-08-17T00:00:00.000Z')
+            }
+        };
+
+        angularHttpClient.request('http://example.com', options, securityOptions, emitters).catch(error =>
+            fail(error)
+        );
+
+        const req = controller.expectOne('http://example.com?lastModifiedFrom=2022-08-17T00%3A00%3A00.000Z');
+
+        expect(req.request.headers.get('Content-Type')).toEqual('application/json');
+
+        req.flush(null, { status: 200, statusText: 'Ok' });
+    });
+
+    it('should set Content-type to application/json if contentTypes is not passed to the request options', () => {
+        const options: RequestOptions = {
+            path: '',
+            httpMethod: 'POST',
+            queryParams: {
+                lastModifiedFrom: new Date('2022-08-17T00:00:00.000Z')
+            }
+        };
+
+        angularHttpClient.request('http://example.com', options, securityOptions, emitters).catch(error =>
+            fail(error)
+        );
+
+        const req = controller.expectOne('http://example.com?lastModifiedFrom=2022-08-17T00%3A00%3A00.000Z');
+
+        expect(req.request.headers.get('Content-Type')).toEqual('application/json');
+
+        req.flush(null, { status: 200, statusText: 'Ok' });
+    });
+
+    it('should set Accept header to application/json if accepts is not passed to the request options', () => {
+        const options: RequestOptions = {
+            path: '',
+            httpMethod: 'POST',
+            queryParams: {
+                lastModifiedFrom: new Date('2022-08-17T00:00:00.000Z')
+            }
+        };
+
+        angularHttpClient.request('http://example.com', options, securityOptions, emitters).catch(error =>
+            fail(error)
+        );
+
+        const req = controller.expectOne('http://example.com?lastModifiedFrom=2022-08-17T00%3A00%3A00.000Z');
+
+        expect(req.request.headers.get('Accept')).toEqual('application/json');
+
+        req.flush(null, { status: 200, statusText: 'Ok' });
+    });
+
 });
--- a/lib/core/api/src/lib/adf-http-client.service.ts
+++ b/lib/core/api/src/lib/adf-http-client.service.ts
@@ -57,17 +57,10 @@ export class AdfHttpClient implements ee.Emitter,JsApiHttpClient {
    on: ee.EmitterMethod;
    off: ee.EmitterMethod;
    once: ee.EmitterMethod;
+    _disableCsrf: boolean;
+
    emit: (type: string, ...args: any[]) => void;

-    private _disableCsrf = false;
-
-    private defaultSecurityOptions = {
-        withCredentials: true,
-        isBpmRequest: false,
-        authentications: {},
-        defaultHeaders: {}
-    };
-
    get disableCsrf(): boolean {
        return this._disableCsrf;
    }
@@ -76,8 +69,14 @@ export class AdfHttpClient implements ee.Emitter,JsApiHttpClient {
        this._disableCsrf = disableCsrf;
    }

-    constructor(private httpClient: HttpClient
-        ) {
+    private defaultSecurityOptions = {
+        withCredentials: true,
+        isBpmRequest: false,
+        authentications: {},
+        defaultHeaders: {}
+    };
+
+    constructor(private httpClient: HttpClient) {
        ee(this);
    }

@@ -217,7 +216,7 @@ export class AdfHttpClient implements ee.Emitter,JsApiHttpClient {
                }

                eventEmitter.emit('error', err);
-                apiClientEmitter.emit('error', err);
+                apiClientEmitter.emit('error', { ...err, response: { req: err } });

                if (err.status === 401) {
                    eventEmitter.emit('unauthorized');
@@ -232,10 +231,10 @@ export class AdfHttpClient implements ee.Emitter,JsApiHttpClient {
                // for backwards compatibility to handle cases in code where we try read response.error.response.body;

                const error = {
-                    response: {...err, body: err.error}
+                    ...err, body: err.error
                };

-                const alfrescoApiError = new AlfrescoApiResponseError(msg, err.status, error.response);
+                const alfrescoApiError = new AlfrescoApiResponseError(msg, err.status, error);
                return throwError(alfrescoApiError);
            }),
            takeUntil(abort$)
@@ -252,7 +251,7 @@ export class AdfHttpClient implements ee.Emitter,JsApiHttpClient {
    }

    private static getBody(options: RequestOptions): any {
-        const contentType = options.contentType;
+        const contentType = options.contentType ? options.contentType : AdfHttpClient.jsonPreferredMime(options.contentTypes);
        const isFormData = contentType === 'multipart/form-data';
        const isFormUrlEncoded = contentType === 'application/x-www-form-urlencoded';
        const body = options.bodyParam;
@@ -269,20 +268,58 @@ export class AdfHttpClient implements ee.Emitter,JsApiHttpClient {
    }

    private getHeaders(options: RequestOptions): HttpHeaders {
+        const contentType = options.contentType || AdfHttpClient.jsonPreferredMime(options.contentTypes);
+        const accept = options.accept || AdfHttpClient.jsonPreferredMime(options.accepts);
+
        const optionsHeaders = {
            ...options.headerParams,
-            ...(options.accept && {Accept: options.accept}),
-            ...((options.contentType) && {'Content-Type': options.contentType})
+            ...(accept && {Accept: accept}),
+            ...((contentType) && {'Content-Type': contentType})
        };

        if (!this.disableCsrf) {
            this.setCsrfToken(optionsHeaders);
-
        }

        return new HttpHeaders(optionsHeaders);
    }

+    /**
+     * Chooses a content type from the given array, with JSON preferred; i.e. return JSON if included, otherwise return the first.
+     *
+     * @param contentTypes a contentType array
+     * @returns  The chosen content type, preferring JSON.
+     */
+    private static jsonPreferredMime(contentTypes: readonly string[]): string {
+        if (!contentTypes?.length) {
+            return 'application/json';
+        }
+
+        for (let i = 0; i < contentTypes.length; i++) {
+            if (AdfHttpClient.isJsonMime(contentTypes[i])) {
+                return contentTypes[i];
+            }
+        }
+        return contentTypes[0];
+    }
+
+    /**
+     * Checks whether the given content type represents JSON.<br>
+     * JSON content type examples:<br>
+     * <ul>
+     * <li>application/json</li>
+     * <li>application/json; charset=UTF8</li>
+     * <li>APPLICATION/JSON</li>
+     * </ul>
+     *
+     * @param contentType The MIME content type to check.
+     * @returns <code>true</code> if <code>contentType</code> represents JSON, otherwise <code>false</code>.
+     */
+    private static isJsonMime(contentType: string): boolean {
+        return Boolean(contentType?.match(/^application\/json(;.*)?$/i));
+    }
+
+
    private setCsrfToken(optionsHeaders: any) {
        const token = this.createCSRFToken();
        optionsHeaders['X-CSRF-TOKEN'] = token;
--- a/lib/core/api/src/lib/api-client.factory.ts
+++ b/lib/core/api/src/lib/api-client.factory.ts
@@ -1,25 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { InjectionToken } from '@angular/core';
-import { Constructor } from './types';
-
-export interface ApiClientFactory {
-    create<T>(apiClass: Constructor<T>): T;
-}
-
-export const API_CLIENT_FACTORY_TOKEN = new InjectionToken<ApiClientFactory>('api-client-factory');
--- a/lib/core/api/src/lib/api-clients.service.spec.ts
+++ b/lib/core/api/src/lib/api-clients.service.spec.ts
@@ -1,66 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { AboutApi } from '@alfresco/js-api';
-import { TestBed } from '@angular/core/testing';
-import { ApiClientFactory, API_CLIENT_FACTORY_TOKEN } from './api-client.factory';
-import { ApiClientsService } from './api-clients.service';
-import { Constructor } from './types';
-
-class MockApiClientFactory implements ApiClientFactory {
-    create<T>(apiClass: Constructor<T>): T {
-        return new apiClass();
-    }
-}
-
-describe('ApiService', () => {
-    let apiService: ApiClientsService;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            providers: [
-                ApiClientsService,
-                { provide: API_CLIENT_FACTORY_TOKEN, useClass: MockApiClientFactory }
-            ]
-        });
-        apiService = TestBed.inject(ApiClientsService);
-    });
-
-    it('should add api to registry', () => {
-        apiService.register('ActivitiClient.about', AboutApi);
-
-        expect(apiService.get('ActivitiClient.about') instanceof AboutApi).toBeTruthy();
-    });
-
-    it('should throw error if we try to get unregisterd API', () => {
-        expect(() => apiService.get('ActivitiClient.about')).toThrowError();
-
-        apiService.register('ActivitiClient.about', AboutApi);
-
-        expect(() => apiService.get('ActivitiClient.about')).not.toThrowError();
-    });
-
-    it('should create only single instance of API', () => {
-        apiService.register('ActivitiClient.about', AboutApi);
-
-        const a = apiService.get('ActivitiClient.about');
-        const b = apiService.get('ActivitiClient.about');
-
-        expect(a).toBe(b);
-    });
-
-});
--- a/lib/core/api/src/lib/api-clients.service.ts
+++ b/lib/core/api/src/lib/api-clients.service.ts
@@ -1,66 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Inject, Injectable } from '@angular/core';
-import { ApiClientFactory, API_CLIENT_FACTORY_TOKEN } from './api-client.factory';
-import { Constructor, Dictionary } from './types';
-
-/* eslint-disable */
-
-declare global {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
-    namespace AlfrescoCore {
-        interface ApiRegistry {
-        }
-    }
-}
-/* eslint-enable */
-
-@Injectable()
-export class ApiClientsService {
-
-    constructor(@Inject(API_CLIENT_FACTORY_TOKEN) private apiCreateFactory: ApiClientFactory) {
-    }
-
-    private registry: Dictionary<Constructor<any>> = {};
-    private instances: Partial<AlfrescoCore.ApiRegistry> = {};
-
-    get<T extends keyof AlfrescoCore.ApiRegistry>(apiName: T): AlfrescoCore.ApiRegistry[T] {
-
-        const apiClass = this.registry[apiName];
-
-        if (!apiClass) {
-            throw new Error(`Api not registred: ${apiName}`);
-        }
-
-        return this.instances[apiName] as AlfrescoCore.ApiRegistry[T] ?? this.instantiateApi(apiName);
-    }
-
-
-    register<T extends keyof AlfrescoCore.ApiRegistry>(apiName: T, api: Constructor<AlfrescoCore.ApiRegistry[T]>): void {
-        this.registry[apiName] = api;
-    }
-
-    private instantiateApi<T extends keyof AlfrescoCore.ApiRegistry>(apiName: T): AlfrescoCore.ApiRegistry[T] {
-        const apiClass = this.registry[apiName];
-        const instance = this.apiCreateFactory.create<AlfrescoCore.ApiRegistry[T]>(apiClass);
-        this.instances[apiName] = instance;
-
-        return instance;
-    }
-}
-
--- a/lib/core/api/src/lib/clients/activiti/activiti-client.module.ts
+++ b/lib/core/api/src/lib/clients/activiti/activiti-client.module.ts
@@ -1,28 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { AboutApi, SystemPropertiesApi } from '@alfresco/js-api';
-import { NgModule } from '@angular/core';
-import { ApiClientsService } from '../../api-clients.service';
-
-@NgModule()
-export class ActivitiClientModule {
-    constructor(private apiClientsService: ApiClientsService) {
-        this.apiClientsService.register('ActivitiClient.about', AboutApi);
-        this.apiClientsService.register('ActivitiClient.system-properties', SystemPropertiesApi);
-    }
-}
--- a/lib/core/api/src/lib/clients/activiti/activiti-client.types.ts
+++ b/lib/core/api/src/lib/clients/activiti/activiti-client.types.ts
@@ -1,29 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { AboutApi, SystemPropertiesApi } from '@alfresco/js-api';
-
-declare global {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
-    namespace AlfrescoCore {
-        interface ApiRegistry {
-            ['ActivitiClient.about']: AboutApi;
-            ['ActivitiClient.system-properties']: SystemPropertiesApi;
-        }
-    }
-}
-
--- a/lib/core/api/src/lib/clients/alfresco-js-clients.module.ts
+++ b/lib/core/api/src/lib/clients/alfresco-js-clients.module.ts
@@ -1,38 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { HttpClientModule, HttpClientXsrfModule } from '@angular/common/http';
-import { NgModule } from '@angular/core';
-import { ApiClientsService } from '../api-clients.service';
-import { ActivitiClientModule } from './activiti/activiti-client.module';
-import { DiscoveryClientModule } from './discovery/discovery-client.module';
-
-@NgModule({
-    imports: [
-        HttpClientModule,
-        HttpClientXsrfModule.withOptions({
-            cookieName: 'CSRF-TOKEN',
-            headerName: 'X-CSRF-TOKEN'
-        }),
-        ActivitiClientModule,
-        DiscoveryClientModule
-    ],
-    providers: [
-        ApiClientsService
-    ]
-})
-export class AlfrescoJsClientsModule { }
--- a/lib/core/api/src/lib/clients/discovery/discovery-client.module.ts
+++ b/lib/core/api/src/lib/clients/discovery/discovery-client.module.ts
@@ -1,27 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { DiscoveryApi } from '@alfresco/js-api';
-import { NgModule } from '@angular/core';
-import { ApiClientsService } from '../../api-clients.service';
-
-@NgModule()
-export class DiscoveryClientModule {
-    constructor(private apiClientsService: ApiClientsService) {
-        this.apiClientsService.register('DiscoveryClient.discovery', DiscoveryApi);
-    }
-}
--- a/lib/core/api/src/lib/clients/discovery/discovery-client.types.ts
+++ b/lib/core/api/src/lib/clients/discovery/discovery-client.types.ts
@@ -1,27 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { DiscoveryApi } from '@alfresco/js-api';
-
-declare global {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
-    namespace AlfrescoCore {
-        interface ApiRegistry {
-            ['DiscoveryClient.discovery']: DiscoveryApi;
-        }
-    }
-}
--- a/lib/core/api/src/lib/clients/index.ts
+++ b/lib/core/api/src/lib/clients/index.ts
@@ -1,20 +0,0 @@
-/*!
- * @license
- * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export * from './activiti/activiti-client.types';
-export * from './alfresco-js-clients.module';
-export * from './discovery/discovery-client.types';
--- a/lib/core/api/src/lib/interfaces.ts
+++ b/lib/core/api/src/lib/interfaces.ts
@@ -15,22 +15,41 @@
 * limitations under the License.
 */

+export interface SecurityOptions {
+    readonly withCredentials?: boolean;
+    readonly authentications?: Authentication;
+    readonly defaultHeaders?: Record<string, string>;
+}
+
+export interface Oauth2 {
+    refreshToken?: string;
+    accessToken?: string;
+}
+
+export interface BasicAuth {
+    username?: string;
+    password?: string;
+    ticket?: string;
+}
+
+export interface Authentication {
+    basicAuth?: BasicAuth;
+    oauth2?: Oauth2;
+    cookie?: string;
+    type?: string;
+}
+
 export interface RequestOptions {
    httpMethod?: string;
+    pathParams?: any;
    queryParams?: any;
    headerParams?: any;
    formParams?: any;
    bodyParam?: any;
    returnType?: any;
    responseType?: string;
+    accepts?: string[];
+    contentTypes?: string[];
    readonly accept?: string;
    readonly contentType?: string;
 }
-
-export interface SecurityOptions {
-    readonly isBpmRequest: boolean;
-    readonly enableCsrf?: boolean;
-    readonly withCredentials?: boolean;
-    readonly authentications: any;
-    readonly defaultHeaders: Record<string, string>;
-}