Improve client creation (#1196)

* improve client creation

* fix

* skipLibCheck

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

scripts/test-build.sh

@@ -13,3 +13,5 @@ mkdir -p ./node_modules/@alfresco/js-api
 mkdir -p ../alfresco-ng2-components/node_modules/@alfresco/js-api
 cp -R ./dist/* ./node_modules/@alfresco/js-api
 cp -R ./dist/* ../alfresco-ng2-components/node_modules/@alfresco/js-api
+cp -R ./dist/* ../content-app/node_modules/@alfresco/js-api
+cp -R ./dist/* ../digital-workspace/node_modules/@alfresco/js-api

src/api-legacy/activiti-rest-api/src/api/AboutApi.ts

@@ -23,6 +23,6 @@ import { AboutApi as NewAboutApi } from '../../../../api/activiti-rest-api/api/a
 export class AboutApi extends NewAboutApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/AdminEndpointsApi.ts

@@ -24,7 +24,7 @@ import { AdminEndpointsApi as NewAdminEndpointsApi } from '../../../../api/activ
 export class AdminEndpointsApi extends NewAdminEndpointsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 
     removeBasicAuthonfiguration(basicAuthId: number, tenantId: number): Promise<any> {

src/api-legacy/activiti-rest-api/src/api/AdminGroupsApi.ts

@@ -24,6 +24,6 @@ import { AdminGroupsApi as NewAdminGroupsApi } from '../../../../api/activiti-re
 export class AdminGroupsApi extends NewAdminGroupsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/AdminTenantsApi.ts

@@ -24,6 +24,6 @@ import { AdminTenantsApi as NewAdminTenantsApi } from '../../../../api/activiti-
 export class AdminTenantsApi extends NewAdminTenantsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/AdminUsersApi.ts

@@ -24,6 +24,6 @@ import { AdminUsersApi as NewAdminUsersApi } from '../../../../api/activiti-rest
 export class AdminUsersApi extends NewAdminUsersApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/CommentsApi.ts

@@ -23,6 +23,6 @@ import { ActivitiCommentsApi as NewCommentsApi } from '../../../../api/activiti-
  */
 export class CommentsApi  extends NewCommentsApi {
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/GroupsApi.ts

@@ -24,6 +24,6 @@ import { ActivitiGroupsApi as NewGroupsApi } from '../../../../api/activiti-rest
 export class GroupsApi extends NewGroupsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/IDMSyncApi.ts

@@ -24,6 +24,6 @@ import { IDMSyncApi as NewIDMSyncApi } from '../../../../api/activiti-rest-api/a
 export class IDMSyncApi extends NewIDMSyncApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/IntegrationAccountApi.ts

@@ -24,6 +24,6 @@ import { AccountIntegrationApi } from '../../../../api/activiti-rest-api/api/acc
 export class IntegrationAccountApi extends AccountIntegrationApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/IntegrationAlfrescoCloudApi.ts

@@ -24,6 +24,6 @@ import { IntegrationAlfrescoCloudApi as NewIntegrationAlfrescoCloudApi } from '.
 export class IntegrationAlfrescoCloudApi extends NewIntegrationAlfrescoCloudApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/IntegrationAlfrescoOnPremiseApi.ts

@@ -24,6 +24,6 @@ import { IntegrationAlfrescoOnPremiseApi as NewIntegrationAlfrescoOnPremiseApi }
 export class IntegrationAlfrescoOnPremiseApi extends NewIntegrationAlfrescoOnPremiseApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/IntegrationBoxApi.ts

@@ -24,6 +24,6 @@ import { IntegrationBoxApi as NewIntegrationBoxApi } from '../../../../api/activ
 export class IntegrationBoxApi extends NewIntegrationBoxApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/IntegrationDriveApi.ts

@@ -24,6 +24,6 @@ import { IntegrationDriveApi as NewIntegrationDriveApi } from '../../../../api/a
 export class IntegrationDriveApi extends NewIntegrationDriveApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ModelBpmnApi.ts

@@ -24,6 +24,6 @@ import { ModelsBpmnApi as NewModelsBpmnApi } from '../../../../api/activiti-rest
 export class ModelBpmnApi extends NewModelsBpmnApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ModelJsonBpmnApi.ts

@@ -24,6 +24,6 @@ import { ModelJsonBpmnApi as NewModelJsonBpmnApi } from '../../../../api/activit
 export class ModelJsonBpmnApi extends NewModelJsonBpmnApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ModelsApi.ts

@@ -24,6 +24,6 @@ import { ModelsApi as NewModelsApi } from '../../../../api/activiti-rest-api/api
 export class ModelsApi extends NewModelsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ModelsHistoryApi.ts

@@ -24,6 +24,6 @@ import { ModelsHistoryApi as NewModelsHistoryApi } from '../../../../api/activit
 export class ModelsHistoryApi extends NewModelsHistoryApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ProcessDefinitionsApi.ts

@@ -24,6 +24,6 @@ import { ProcessDefinitionsApi as NewProcessDefinitionsApi } from '../../../../a
 export class ProcessDefinitionsApi extends NewProcessDefinitionsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ProcessInstanceVariablesApi.ts

@@ -24,6 +24,6 @@ import { ProcessInstanceVariablesApi as NewProcessInstanceVariablesApi } from '.
 export class ProcessInstanceVariablesApi extends NewProcessInstanceVariablesApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ProcessScopeApi.ts

@@ -24,6 +24,6 @@ import { ProcessScopesApi as NewProcessScopeApi } from '../../../../api/activiti
 export class ProcessScopeApi extends NewProcessScopeApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ProfileApi.ts

@@ -24,6 +24,6 @@ import { UserProfileApi } from '../../../../api/activiti-rest-api/api/userProfil
 export class ProfileApi extends UserProfileApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ReportApi.ts

@@ -24,6 +24,6 @@ import { ReportApi as  NewReportApi } from '../../../../api/activiti-rest-api/ap
 export class ReportApi extends NewReportApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/ScriptFileApi.ts

@@ -24,6 +24,6 @@ import { ScriptFilesApi as NewScriptFileApi } from '../../../../api/activiti-res
 export class ScriptFileApi extends NewScriptFileApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/SystemPropertiesApi.ts

@@ -24,6 +24,6 @@ import { SystemPropertiesApi as NewSystemPropertiesApi } from '../../../../api/a
 export class SystemPropertiesApi extends NewSystemPropertiesApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/TaskActionsApi.ts

@@ -24,6 +24,6 @@ import { TaskActionsApi as NewTaskActionsApi } from '../../../../api/activiti-re
 export class TaskActionsApi extends NewTaskActionsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/TaskCheckListApi.ts

@@ -24,6 +24,6 @@ import { ChecklistsApi as NewChecklistsApi } from '../../../../api/activiti-rest
 export class TaskCheckListApi  extends NewChecklistsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/TaskFormsApi.ts

@@ -24,6 +24,6 @@ import { TaskFormsApi as NewTaskFormsApi } from '../../../../api/activiti-rest-a
 export class TaskFormsApi extends NewTaskFormsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/TemporaryApi.ts

@@ -24,6 +24,6 @@ import { TemporaryApi as NewTemporaryApi } from '../../../../api/activiti-rest-a
 export class TemporaryApi extends NewTemporaryApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/UserApi.ts

@@ -24,6 +24,6 @@ import { UsersApi as NewUserApi } from '../../../../api/activiti-rest-api/api/us
 export class UserApi extends NewUserApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/activiti-rest-api/src/api/UserFiltersApi.ts

@@ -24,6 +24,6 @@ import { UserFiltersApi as NewUserfiltersApi } from '../../../../api/activiti-re
 export class UserFiltersApi extends NewUserfiltersApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.processClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/alfrescoUpload.ts

@@ -24,6 +24,6 @@ import { UploadApi } from '../api/content-custom-api/api/upload.api';
 export class AlfrescoUpload extends UploadApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.contentClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/content-rest-api/src/api/classesApi.ts

@@ -24,6 +24,6 @@ import { AlfrescoApi } from '../../../../alfrescoApi';
 export class ClassesApi extends NewClassesApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.contentPrivateClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/content-rest-api/src/api/customModelApi.ts

@@ -24,6 +24,6 @@ import { CustomModelApi as NewCustomModelApi } from '../../../../api/content-cus
 export class CustomModelApi extends NewCustomModelApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.contentPrivateClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/content-rest-api/src/api/downloadsApi.ts

@@ -24,6 +24,6 @@ import { DownloadsApi as NewDownloadsApi } from '../../../../api/content-rest-ap
 export class DownloadsApi extends NewDownloadsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.contentClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/content-rest-api/src/api/queriesApi.ts

@@ -24,6 +24,6 @@ import { AlfrescoApi } from '../../../../alfrescoApi';
 export class QueriesApi extends NewQueriesApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.contentClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/content-rest-api/src/api/versionsApi.ts

@@ -24,6 +24,6 @@ import { AlfrescoApi } from '../../../../alfrescoApi';
 export class VersionsApi extends NewVersionsApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.contentClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api-legacy/content-rest-api/src/api/webscriptApi.ts

@@ -24,6 +24,6 @@ import { AlfrescoApi } from '../../../../alfrescoApi';
 export class WebscriptApi  extends NewWebscriptApi {
 
     public init(alfrescoApi?: AlfrescoApi) {
-        this.apiClient = alfrescoApi.contentClient;
+        this.alfrescoApi = alfrescoApi;
     }
 }

src/api/activiti-rest-api/api/base.api.ts

@@ -20,12 +20,14 @@ import { AlfrescoApiClient } from '../../../alfrescoApiClient';
 
 export class BaseApi {
 
-    apiClient: AlfrescoApiClient;
+    protected alfrescoApi: AlfrescoApi;
+
+    get apiClient(): AlfrescoApiClient {
+        return this.alfrescoApi.processClient;
+    }
 
     constructor(alfrescoApi?: AlfrescoApi) {
-        if (alfrescoApi) {
-            this.apiClient = alfrescoApi.processClient;
-        }
+        this.alfrescoApi = alfrescoApi;
     }
 
     errorMessage(param: string, methodName: string) {

src/api/auth-rest-api/api/base.api.ts

@@ -20,12 +20,14 @@ import { AlfrescoApiClient, RequestOptions } from '../../../alfrescoApiClient';
 
 export class BaseApi {
 
-    apiClient: AlfrescoApiClient;
+    protected alfrescoApi: AlfrescoApi;
+
+    get apiClient(): AlfrescoApiClient {
+        return this.alfrescoApi.authClient;
+    }
 
     constructor(alfrescoApi?: AlfrescoApi) {
-        if (alfrescoApi) {
-            this.apiClient = alfrescoApi.authClient;
-        }
+        this.alfrescoApi = alfrescoApi;
     }
 
     post<T = any>(options: RequestOptions): Promise<T> {

src/api/content-custom-api/api/base.api.ts

@@ -20,28 +20,33 @@ import { AlfrescoApiClient, RequestOptions } from '../../../alfrescoApiClient';
 
 export class BaseApi {
 
-    apiClient: AlfrescoApiClient;
+    protected alfrescoApi: AlfrescoApi;
+
+    get apiClientPrivate(): AlfrescoApiClient {
+        return this.alfrescoApi.contentPrivateClient;
+    }
+    get apiClient(): AlfrescoApiClient {
+        return this.alfrescoApi.contentClient;
+    }
 
     constructor(alfrescoApi?: AlfrescoApi) {
-        if (alfrescoApi) {
-            this.apiClient = alfrescoApi.contentClient;
-        }
+        this.alfrescoApi = alfrescoApi;
     }
 
     post<T = any>(options: RequestOptions): Promise<T> {
-        return this.apiClient.post<T>(options);
+        return this.apiClientPrivate.post<T>(options);
     }
 
     put<T = any>(options: RequestOptions): Promise<T> {
-        return this.apiClient.put<T>(options);
+        return this.apiClientPrivate.put<T>(options);
     }
 
     get<T = any>(options: RequestOptions): Promise<T> {
-        return this.apiClient.get<T>(options);
+        return this.apiClientPrivate.get<T>(options);
     }
 
     delete<T = void>(options: RequestOptions): Promise<T> {
-        return this.apiClient.delete(options);
+        return this.apiClientPrivate.delete(options);
     }
 
     errorMessage(param: string, methodName: string) {