Fix problems around legacyAlfrescoApi (#1403)

index.ts

@@ -18,7 +18,6 @@
 export * from './src/api-legacy/legacy';
 export * from './src/api-legacy/content-rest-api/src/index';
 export * from './src/api-legacy/activiti-rest-api/src/index';
-export * from './src/api-legacy/legacy-alfresco-api';
 export * from './src/api/content-rest-api/index';
 export * from './src/api/content-custom-api/index';
 export * from './src/api/discovery-rest-api/index';

src/alfrescoApi.ts

@@ -24,10 +24,10 @@ import { ProcessClient } from './processClient';
 import { Storage } from './storage';
 import { AlfrescoApiConfig } from './alfrescoApiConfig';
 import { Authentication } from './authentication/authentication';
-import { LegacyAlfrescoApi } from './api-legacy/legacy-alfresco-api';
 import { AlfrescoApiType } from './to-deprecate/alfresco-api-type';
 
-export class AlfrescoApi extends LegacyAlfrescoApi implements Emitter, AlfrescoApiType {
+export class AlfrescoApi implements Emitter, AlfrescoApiType {
+    __type = 'legacy-client';
     storage: Storage;
     config: AlfrescoApiConfig;
     contentClient: ContentClient;
@@ -52,7 +52,6 @@ export class AlfrescoApi extends LegacyAlfrescoApi implements Emitter, AlfrescoA
     username: string;
 
     constructor(config?: AlfrescoApiConfig) {
-        super();
         ee(this);
 
         if (config) {

src/api-clients/api-client.ts

@@ -16,7 +16,6 @@
 */
 
 import { AlfrescoApiType } from "../to-deprecate/alfresco-api-type";
-import { LegacyAlfrescoApi } from "../api-legacy/legacy-alfresco-api";
 import { HttpClient, RequestOptions } from "./http-client.interface";
 
 export abstract class ApiClient {
@@ -30,13 +29,12 @@ export abstract class ApiClient {
 
     constructor(legacyApi?: AlfrescoApiType);
     constructor(httpClient: HttpClient);
-    constructor(httpClient?: AlfrescoApiType | HttpClient) {
-        if (!(httpClient instanceof LegacyAlfrescoApi)) {
-            this.httpClient = httpClient as HttpClient;
-        } else {
+    constructor(httpClient?: AlfrescoApiType & HttpClient) {
+        if (httpClient?.__type === 'legacy-client') {
             // TODO: remove legacyApi?: AlfrescoApi option and clean up this code. BREAKING CHANGE!
-            this.alfrescoApi = httpClient as AlfrescoApiType;
-
+            this.alfrescoApi = httpClient;
+        } else {
+            this.httpClient = httpClient;
         }
     }
 

src/to-deprecate/alfresco-api-type.ts

@@ -24,6 +24,7 @@ export interface LegacyTicketApi {
 
 // Extracted from existing AlfrescoApi:
 export interface AlfrescoApiType {
+    __type: string;
     config: AlfrescoApiConfig;
     contentClient: HttpClient & LegacyTicketApi;
     contentPrivateClient: HttpClient & LegacyTicketApi;