Refactor e2e's ApiService (#7101)

* Refactor e2e's ApiService

* Fix bits here and there

* [ci:force] Remove unused imports

* [ci:force] Extract shared part from adf-testing

* [ci:force] Extract StringUtils as well

* Make protractor's Logger not have duplicated code

* [ci:force]

e2e/content-services/directives/create-folder-directive.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     LoginPage,
     NotificationHistoryPage,
     StringUtil,
@@ -38,7 +37,7 @@ describe('Create folder directive', () => {
     const metadataViewPage = new MetadataViewPage();
     let acsUser: UserModel;
     const navigationBarPage = new NavigationBarPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {

e2e/content-services/directives/create-library-directive.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ApiService, BrowserActions, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
+import { createApiService, BrowserActions, LoginPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { CreateLibraryDialogPage } from '../../core/pages/dialog/create-library-dialog.page';
 import { CustomSourcesPage } from '../../core/pages/custom-sources.page';
@@ -29,7 +29,7 @@ describe('Create library directive', () => {
     const createLibraryDialog = new CreateLibraryDialogPage();
     const customSourcesPage = new CustomSourcesPage();
     const navigationBarPage = new NavigationBarPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const visibility = {

e2e/content-services/directives/delete-directive.e2e.ts

@@ -17,8 +17,7 @@
 
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
-import {
-    ApiService,
+import { createApiService,
     BrowserActions,
     LoginPage,
     PaginationPage,
@@ -46,7 +45,7 @@ describe('Delete Directive', () => {
     const acsUser = new UserModel();
     const secondAcsUser = new UserModel();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const permissionActions = new PermissionActions(apiService);
     const usersActions = new UsersActions(apiService);

e2e/content-services/directives/download-directive.e2e.ts

@@ -17,8 +17,7 @@
 
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
-import {
-    ApiService,
+import { createApiService,
     BrowserVisibility,
     FileBrowserUtil,
     LoginPage,
@@ -64,7 +63,7 @@ describe('Version component actions', () => {
         location: browser.params.resources.Files.ADF_DOCUMENTS.TEXT_FOLDER.folder_location
     });
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const uploadActions = new UploadActions(apiService);
     const usersActions = new UsersActions(apiService);
 

e2e/content-services/directives/edit-folder-directive.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     BrowserActions,
     LoginPage,
     NotificationHistoryPage,
@@ -42,7 +41,7 @@ describe('Edit folder directive', () => {
     const navigationBarPage = new NavigationBarPage();
     const notificationHistoryPage = new NotificationHistoryPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const nodesApi = new NodesApi(apiService.getInstance());
 

e2e/content-services/directives/favorite-directive.e2e.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import {
-    ApiService,
+import { createApiService,
     ContentNodeSelectorDialogPage,
     LoginPage,
     StringUtil,
@@ -42,7 +41,7 @@ describe('Favorite directive', () => {
     const trashcanPage = new TrashcanPage();
     const contentListPage = contentServicesPage.getDocumentList();
     const contentNodeSelector = new ContentNodeSelectorDialogPage();
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
 
     const pdfFile = new FileModel({

e2e/content-services/directives/restore-content-directive.e2e.ts

@@ -21,8 +21,7 @@ import { NodeEntry } from '@alfresco/js-api';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { TrashcanPage } from '../../core/pages/trashcan.page';
-import {
-    ApiService,
+import { createApiService,
     BreadcrumbPage,
     LoginPage,
     NotificationHistoryPage,
@@ -44,7 +43,7 @@ describe('Restore content directive', () => {
     const breadCrumbPage = new BreadcrumbPage();
     const notificationHistoryPage = new NotificationHistoryPage();
 
-    const apiService = new ApiService();
+    const apiService = createApiService();
     const usersActions = new UsersActions(apiService);
     const waitActions = new WaitActions(apiService);
 

e2e/content-services/directives/sso-download-directive-component.e2e.ts

@@ -18,8 +18,7 @@
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { browser } from 'protractor';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
-import {
-    ApiService,
+import { createApiService,
     FileBrowserUtil,
     IdentityService,
     LoginPage,
@@ -40,7 +39,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
     const loginSsoPage = new LoginPage();
     const viewerPage = new ViewerPage();
 
-    const apiService = new ApiService({ authType: 'OAUTH' });
+    const apiService = createApiService({ authType: 'OAUTH' });
     const uploadActions = new UploadActions(apiService);
     const identityService = new IdentityService(apiService);
     const usersActions = new UsersActions(apiService);