improved e2e login api (#6248)

* improved e2e login api

* throw error on missing profile

e2e/content-services/about-content-services.component.e2e.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 import { AboutPage, ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
-import { browser } from 'protractor';
 import { NavigationBarPage } from '../core/pages/navigation-bar.page';
 
 describe('About Content Services', () => {
@@ -28,9 +27,9 @@ describe('About Content Services', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async() => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         await loginPage.login(acsUser.email, acsUser.password);
         await navigationBarPage.clickAboutButton();
     });

e2e/content-services/comments/comment-component.e2e.ts

@@ -64,7 +64,7 @@ describe('Comment Component', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
     });
 
@@ -73,7 +73,7 @@ describe('Comment Component', () => {
     });
 
     beforeEach(async () => {
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const pngUploadedFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-');
 
@@ -88,7 +88,7 @@ describe('Comment Component', () => {
     });
 
     afterEach(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await uploadActions.deleteFileOrFolder(nodeId);
     });
 
@@ -168,7 +168,7 @@ describe('Comment Component', () => {
         let site, pngUploadedFile;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             site = await apiService.getInstance().core.sitesApi.createSite({
                 title: StringUtil.generateRandomString(8),

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

@@ -42,7 +42,7 @@ describe('Create folder directive', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser();
 

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

@@ -19,7 +19,6 @@ import { ApiService, BrowserActions, LoginPage, StringUtil, UserModel, UsersActi
 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';
-import { browser } from 'protractor';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
 describe('Create library directive', () => {
@@ -43,7 +42,7 @@ describe('Create library directive', () => {
     let acsUser: UserModel;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser();
         createSite = await apiService.getInstance().core.sitesApi.createSite({

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

@@ -91,10 +91,10 @@ describe('Delete Directive', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
         await usersActions.createUser(secondAcsUser);
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
     });
 
     beforeEach(async () => {

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

@@ -69,9 +69,9 @@ describe('Version component actions', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         await uploadActions.uploadFile( txtFileModel.location, txtFileModel.name, '-my-');
         await uploadActions.uploadFile(file0BytesModel.location, file0BytesModel.name, '-my-');

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

@@ -53,10 +53,10 @@ describe('Edit folder directive', () => {
     let editFolder, anotherFolder, filePdfNode, subFolder;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
         await usersActions.createUser(anotherAcsUser);
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         editFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
         anotherFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
@@ -80,7 +80,7 @@ describe('Edit folder directive', () => {
 
     afterAll(async () => {
         await navigationBarPage.clickLogoutButton();
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await uploadActions.deleteFileOrFolder(editFolder.entry.id);
         await uploadActions.deleteFileOrFolder(anotherFolder.entry.id);
         await uploadActions.deleteFileOrFolder(filePdfNode.entry.id);

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

@@ -54,9 +54,9 @@ describe('Favorite directive', () => {
     let testFolder1, testFolder2, testFolder3, testFolder4, testFile;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         testFolder1 = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
         testFolder2 = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
@@ -72,7 +72,7 @@ describe('Favorite directive', () => {
 
     afterAll(async () => {
         await navigationBarPage.clickLogoutButton();
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await uploadActions.deleteFileOrFolder(testFolder1.entry.id);
         await uploadActions.deleteFileOrFolder(testFolder2.entry.id);
         await uploadActions.deleteFileOrFolder(testFolder3.entry.id);

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

@@ -68,10 +68,10 @@ describe('Restore content directive', () => {
         siteFile;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
         await usersActions.createUser(anotherAcsUser);
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         await uploadActions.createFolder(folderName, '-my-');
         folderWithContent = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
@@ -85,7 +85,7 @@ describe('Restore content directive', () => {
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await uploadActions.deleteFileOrFolder(folderWithContent.entry.id);
         await uploadActions.deleteFileOrFolder(folderWithFolder.entry.id);
     });
@@ -237,7 +237,7 @@ describe('Restore content directive', () => {
 
     describe('Restore deleted library', () => {
         beforeAll(async () => {
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             const publicSiteName = `00${StringUtil.generateRandomString(5)}`;
             const publicSiteBody = { visibility: 'PUBLIC', title: publicSiteName };
             publicSite = await apiService.getInstance().core.sitesApi.createSite(publicSiteBody);
@@ -276,7 +276,7 @@ describe('Restore content directive', () => {
         let parentFolder, folderWithin, pdfFile, pngFile, mainFile, mainFolder;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(anotherAcsUser.email, anotherAcsUser.password);
+            await apiService.login(anotherAcsUser.email, anotherAcsUser.password);
             await uploadActions.createFolder(folderName, '-my-');
             parentFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
             folderWithin = await uploadActions.createFolder(StringUtil.generateRandomString(5), parentFolder.entry.id);
@@ -290,7 +290,7 @@ describe('Restore content directive', () => {
         });
 
         afterAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             await uploadActions.deleteFileOrFolder(parentFolder.entry.id);
             await uploadActions.deleteFileOrFolder(mainFolder.entry.id);
             await uploadActions.deleteFileOrFolder(mainFile.entry.id);

e2e/content-services/document-list/document-list-actions.e2e.ts

@@ -66,9 +66,9 @@ describe('Document List Component - Actions', () => {
 
         beforeAll(async () => {
             folderName = `TATSUMAKY_${StringUtil.generateRandomString(5)}_SENPOUKYAKU`;
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             acsUser = await usersActions.createUser();
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             pdfUploadedNode = await uploadActions.uploadFile(pdfFileModel.location, pdfFileModel.name, '-my-');
             await uploadActions.uploadFile(testFileModel.location, testFileModel.name, '-my-');
             uploadedFolder = await uploadActions.createFolder(folderName, '-my-');

e2e/content-services/document-list/document-list-component.e2e.ts

@@ -34,7 +34,7 @@ describe('Document List Component', () => {
     let testFileNode, pdfBFileNode;
 
     afterEach(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         if (uploadedFolder) {
             await uploadActions.deleteFileOrFolder(uploadedFolder.entry.id);
             uploadedFolder = null;
@@ -78,18 +78,18 @@ describe('Document List Component', () => {
             /* cspell:disable-next-line */
             folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
 
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             acsUser = await usersActions.createUser();
 
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             uploadedFolder = await uploadActions.createFolder(folderName, '-my-');
             pdfUploadedNode = await uploadActions.uploadFile(pdfFileModel.location, pdfFileModel.name, '-my-');
             docxUploadedNode = await uploadActions.uploadFile(docxFileModel.location, docxFileModel.name, '-my-');
         });
 
         afterAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             if (pdfUploadedNode) {
                 await uploadActions.deleteFileOrFolder(pdfUploadedNode.entry.id);
@@ -126,7 +126,7 @@ describe('Document List Component', () => {
         });
 
         it('[C279928] Should be able to display date with timeAgo', async () => {
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             timeAgoUploadedNode = await uploadActions.uploadFile(timeAgoFileModel.location, timeAgoFileModel.name, '-my-');
             await contentServicesPage.goToDocumentList();
             const dateValue = await contentServicesPage.getColumnValueForRow(timeAgoFileModel.name, 'Created');
@@ -134,7 +134,7 @@ describe('Document List Component', () => {
         });
 
         it('[C279929] Should be able to display the date with date type', async () => {
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             mediumDateUploadedNode = await uploadActions.uploadFile(mediumFileModel.location, mediumFileModel.name, '-my-');
             const createdDate = moment(mediumDateUploadedNode.createdAt).format('ll');
             await contentServicesPage.goToDocumentList();
@@ -163,10 +163,10 @@ describe('Document List Component', () => {
         let fileANode, fileBNode, fileCNode;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             const user = await usersActions.createUser();
-            await apiService.getInstance().login(user.email, user.password);
+            await apiService.login(user.email, user.password);
 
             fileANode = await uploadActions.uploadFile(fakeFileA.location, fakeFileA.name, '-my-');
             fileBNode = await uploadActions.uploadFile(fakeFileB.location, fakeFileB.name, '-my-');
@@ -178,7 +178,7 @@ describe('Document List Component', () => {
         });
 
         afterAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             if (fileANode) {
                 await uploadActions.deleteFileOrFolder(fileANode.entry.id);
             }
@@ -217,7 +217,7 @@ describe('Document List Component', () => {
 
     it('[C279959] Should display empty folder state for new folders', async () => {
         const folderName = 'BANANA';
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
         await loginPage.login(acsUser.email, acsUser.password);
         await contentServicesPage.goToDocumentList();
@@ -234,9 +234,9 @@ describe('Document List Component', () => {
         });
         /* cspell:disable-next-line */
         const folderName = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         uploadedFolder = await uploadActions.createFolder(folderName, '-my-');
         await loginPage.login(acsUser.email, acsUser.password);
         await contentServicesPage.goToDocumentList();
@@ -247,7 +247,7 @@ describe('Document List Component', () => {
     });
 
     it('[C261997] Should be able to clean Recent Files history', async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         const cleanUser = await usersActions.createUser();
         await loginPage.login(cleanUser.email, cleanUser.password);
         await contentServicesPage.clickOnContentServices();
@@ -262,9 +262,9 @@ describe('Document List Component', () => {
     it('[C279970] Should display Islocked field for folders', async () => {
         const folderNameA = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
         const folderNameB = `MEESEEKS_${StringUtil.generateRandomString(5)}_LOOK_AT_ME`;
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         uploadedFolder = await uploadActions.createFolder(folderNameA, '-my-');
         uploadedFolderExtra = await uploadActions.createFolder(folderNameB, '-my-');
         await loginPage.login(acsUser.email, acsUser.password);
@@ -284,9 +284,9 @@ describe('Document List Component', () => {
             name: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_name,
             location: browser.params.resources.Files.ADF_DOCUMENTS.PDF_B.file_path
         });
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         testFileNode = await uploadActions.uploadFile(testFileA.location, testFileA.name, '-my-');
         pdfBFileNode = await uploadActions.uploadFile(testFileB.location, testFileB.name, '-my-');
         await loginPage.login(acsUser.email, acsUser.password);
@@ -302,9 +302,9 @@ describe('Document List Component', () => {
 
         beforeAll(async () => {
             folderCreated = [];
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             acsUser = await usersActions.createUser();
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             let folderName = '';
             let folder = null;
 
@@ -338,9 +338,9 @@ describe('Document List Component', () => {
         const viewer = new ViewerPage();
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             acsUser = await usersActions.createUser();
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             file = await uploadActions.uploadFile(file0BytesModel.location, file0BytesModel.name, '-my-');
 
             await loginPage.login(acsUser.email, acsUser.password);

e2e/content-services/document-list/document-list-copy-move-actions.e2e.ts

@@ -63,7 +63,7 @@ describe('Document List Component', () => {
     beforeAll(async () => {
         folderName = StringUtil.generateRandomString(5);
         sameNameFolder = StringUtil.generateRandomString(5);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
         await usersActions.createUser(anotherAcsUser);
         site = await apiService.getInstance().core.sitesApi.createSite({
@@ -74,7 +74,7 @@ describe('Document List Component', () => {
             id: anotherAcsUser.email,
             role: CONSTANTS.CS_USER_ROLES.COLLABORATOR
         });
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         uploadedFolder = await uploadActions.createFolder(folderName, '-my-');
         destinationFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
         sourceFolder = await uploadActions.createFolder(StringUtil.generateRandomString(5), '-my-');
@@ -103,7 +103,7 @@ describe('Document List Component', () => {
     afterAll(async () => {
         await navigationBarPage.clickLogoutButton();
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await uploadActions.deleteFileOrFolder(uploadedFolder.entry.id);
         await uploadActions.deleteFileOrFolder(uploadedFile.entry.id);
         await uploadActions.deleteFileOrFolder(sourceFolder.entry.id);

e2e/content-services/document-list/document-list-folder-actions.e2e.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { browser, by, element } from 'protractor';
+import { by, element } from 'protractor';
 import {
     ApiService,
     BreadcrumbPage,
@@ -61,9 +61,9 @@ describe('Document List Component - Actions', () => {
         const contentServicesUser = new UserModel();
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             await usersActions.createUser(contentServicesUser);
-            await apiService.getInstance().login(contentServicesUser.email, contentServicesUser.password);
+            await apiService.login(contentServicesUser.email, contentServicesUser.password);
             folder1 = await uploadActions.createFolder('A' + folderModel1.name, '-my-');
             folder2 = await uploadActions.createFolder('B' + folderModel2.name, '-my-');
             folder3 = await uploadActions.createFolder('C' + folderModel3.name, '-my-');
@@ -82,7 +82,7 @@ describe('Document List Component - Actions', () => {
         });
 
         afterAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             for (const folder of folders) {
                 await uploadActions.deleteFileOrFolder(folder.entry.id);
             }

e2e/content-services/document-list/document-list-gallery.e2e.ts

@@ -59,9 +59,9 @@ describe('Document List Component', () => {
         let filePdfNode, fileTestNode, fileDocxNode, folderNode, filePDFSubNode;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             acsUser = await usersActions.createUser();
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             filePdfNode = await uploadActions.uploadFile(pdfFile.location, pdfFile.name, '-my-');
             fileTestNode = await uploadActions.uploadFile(testFile.location, testFile.name, '-my-');
             fileDocxNode = await uploadActions.uploadFile(docxFile.location, docxFile.name, '-my-');
@@ -74,7 +74,7 @@ describe('Document List Component', () => {
         afterAll(async () => {
             await navigationBarPage.clickLogoutButton();
 
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             if (filePdfNode) {
                 await uploadActions.deleteFileOrFolder(filePdfNode.entry.id);
             }

e2e/content-services/document-list/document-list-pagination.e2e.ts

@@ -75,9 +75,9 @@ describe('Document List - Pagination', () => {
         fileNames = StringUtil.generateFilesNames(10, nrOfFiles + 9, pagination.base, pagination.extension);
         secondSetOfFiles = StringUtil.generateFilesNames(10, secondSetNumber + 9, pagination.secondSetBase, pagination.extension);
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const folderThreeUploadedModel = await uploadActions.createFolder(folderThreeModel.name, '-my-');
         const newFolderUploadedModel = await uploadActions.createFolder(newFolderModel.name, '-my-');
@@ -374,7 +374,7 @@ describe('Document List - Pagination', () => {
         await expect(await contentServicesPage.getActiveBreadcrumb()).toEqual(newFolderModel.name);
         await expect(await paginationPage.getCurrentItemsPerPage()).toEqual('5');
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         await contentServicesPage.createNewFolder(folderTwoModel.name);
         const nodeIdSubFolderTwo = await contentServicesPage.getAttributeValueForElement(folderTwoModel.name, 'Node id');
         await contentServicesPage.openFolder(folderTwoModel.name);
@@ -415,7 +415,7 @@ describe('Document List - Pagination', () => {
         const nodeIdSubFolderTwo = await contentServicesPage.getAttributeValueForElement(folderTwoModel.name, 'Node id');
         await contentServicesPage.openFolder(folderTwoModel.name);
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         for (let i = 0; i < numberOfSubFolders; i++) {
             await uploadActions.createFolder('subfolder' + (i + 1), nodeIdSubFolderTwo);
         }

e2e/content-services/document-list/document-list-permissions.e2e.ts

@@ -37,7 +37,7 @@ describe('Document List Component', () => {
             const siteName = `PRIVATE_TEST_SITE_${StringUtil.generateRandomString(5)}`;
             const privateSiteBody = { visibility: 'PRIVATE', title: siteName };
 
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             acsUser = await usersActions.createUser();
 

e2e/content-services/document-list/document-list-properties.e2e.ts

@@ -40,10 +40,10 @@ describe('Document List Component - Properties', () => {
 
     describe('Allow drop files property', () => {
         beforeEach(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             acsUser = await usersActions.createUser();
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
 
             parentFolder = await uploadActions.createFolder('parentFolder', '-my-');
             subFolder = await uploadActions.createFolder('subFolder', parentFolder.entry.id);
@@ -52,7 +52,7 @@ describe('Document List Component - Properties', () => {
         });
 
         afterEach(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             await uploadActions.deleteFileOrFolder(subFolder.entry.id);
             await uploadActions.deleteFileOrFolder(parentFolder.entry.id);
             await navigationBar.clickLogoutButton();

e2e/content-services/document-list/document-list-selection.e2e.ts

@@ -41,9 +41,9 @@ describe('Document List - Selection', () => {
 
     beforeAll(async () => {
         try {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             acsUser = await usersActions.createUser();
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
 
             await loginPage.login(acsUser.email, acsUser.password);
 

e2e/content-services/document-list/document-list-thumbnails-tooltips.e2e.ts

@@ -35,7 +35,7 @@ describe('Document List Component', () => {
     const usersActions = new UsersActions(apiService);
 
     afterEach(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         if (uploadedFolder) {
             await uploadActions.deleteFileOrFolder(uploadedFolder.entry.id);
             uploadedFolder = null;
@@ -73,11 +73,11 @@ describe('Document List Component', () => {
         let filePdfNode, fileTestNode, fileDocxNode, folderNode;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             acsUser = await usersActions.createUser();
 
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             filePdfNode = await uploadActions.uploadFile(pdfFile.location, pdfFile.name, '-my-');
             fileTestNode = await uploadActions.uploadFile(testFile.location, testFile.name, '-my-');
             fileDocxNode = await uploadActions.uploadFile(docxFile.location, docxFile.name, '-my-');
@@ -87,7 +87,7 @@ describe('Document List Component', () => {
         afterAll(async () => {
             await navigationBarPage.clickLogoutButton();
 
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             if (filePdfNode) {
                 await uploadActions.deleteFileOrFolder(filePdfNode.entry.id);
             }

e2e/content-services/lock-file.e2e.ts

@@ -49,12 +49,12 @@ describe('Lock File', () => {
     let nodeId, site, documentLibrary, lockedFileNodeId;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(adminUser);
         await usersActions.createUser(managerUser);
 
-        await apiService.getInstance().login(adminUser.email, adminUser.password);
+        await apiService.login(adminUser.email, adminUser.password);
 
         site = await apiService.getInstance().core.sitesApi.createSite({
             title: StringUtil.generateRandomString(),
@@ -96,7 +96,7 @@ describe('Lock File', () => {
 
         afterEach(async () => {
             try {
-                await apiService.getInstance().login(adminUser.email, adminUser.password);
+                await apiService.login(adminUser.email, adminUser.password);
 
                 await uploadActions.deleteFileOrFolder(nodeId);
 
@@ -106,7 +106,7 @@ describe('Lock File', () => {
 
         afterAll(async () => {
             try {
-                await apiService.getInstance().login(adminUser.email, adminUser.password);
+                await apiService.login(adminUser.email, adminUser.password);
 
                 await apiService.getInstance().core.nodesApi.unlockNode(lockedFileNodeId);
 
@@ -172,7 +172,7 @@ describe('Lock File', () => {
         });
 
         afterEach(async () => {
-            await apiService.getInstance().login(adminUser.email, adminUser.password);
+            await apiService.login(adminUser.email, adminUser.password);
 
             try {
                 await apiService.getInstance().core.nodesApi.unlockNode(nodeId);
@@ -263,7 +263,7 @@ describe('Lock File', () => {
     });
 
         afterEach(async () => {
-            await apiService.getInstance().login(adminUser.email, adminUser.password);
+            await apiService.login(adminUser.email, adminUser.password);
 
             try {
                 await uploadActions.deleteFileOrFolder(nodeId);

e2e/content-services/metadata/aspect-oriented-config.e2e.ts

@@ -54,7 +54,7 @@ describe('Aspect oriented config', () => {
     beforeAll(async () => {
         uploadActions = new UploadActions(apiService);
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         try {
             await apiService.getInstance().core.customModelApi.createCustomModel('ACTIVE', modelOneName, modelOneName, modelOneName, modelOneName);
@@ -68,7 +68,7 @@ describe('Aspect oriented config', () => {
 
         acsUser = await usersActions.createUser();
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const uploadedFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-');
 

e2e/content-services/metadata/metadata-permissions.e2e.ts

@@ -65,7 +65,7 @@ describe('permissions', () => {
     const uploadActions = new UploadActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(consumerUser);
         await usersActions.createUser(collaboratorUser);

e2e/content-services/metadata/metadata-properties.e2e.ts

@@ -62,9 +62,9 @@ describe('CardView Component - properties', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const pdfUploadedFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-');
 

e2e/content-services/metadata/metadata-smoke-tests.e2e.ts

@@ -68,9 +68,9 @@ describe('Metadata component', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         const pngUploadedFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-');
         Object.assign(pngFileModel, pngUploadedFile.entry);
         pngFileModel.update(pngUploadedFile.entry);

e2e/content-services/permissions/permissions-component.e2e.ts

@@ -86,11 +86,11 @@ describe('Permissions Component', () => {
     const duplicateUserPermissionMessage = 'One or more of the permissions you have set is already present : authority -> ' + filePermissionUser.email + ' / role -> Contributor';
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(fileOwnerUser);
         await usersActions.createUser(filePermissionUser);
         await apiService.getInstance().core.groupsApi.createGroup(groupBody);
-        await apiService.getInstance().login(fileOwnerUser.email, fileOwnerUser.password);
+        await apiService.login(fileOwnerUser.email, fileOwnerUser.password);
 
         roleConsumerFolder = await uploadActions.createFolder(roleConsumerFolderModel.name, '-my-');
         roleCoordinatorFolder = await uploadActions.createFolder(roleCoordinatorFolderModel.name, '-my-');
@@ -168,7 +168,7 @@ describe('Permissions Component', () => {
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         for (const folder of folders) {
             await uploadActions.deleteFileOrFolder(folder.entry.id);
         }
@@ -177,7 +177,7 @@ describe('Permissions Component', () => {
     describe('Inherit and assigning permissions', () => {
 
         beforeEach(async () => {
-            await apiService.getInstance().login(fileOwnerUser.email, fileOwnerUser.password);
+            await apiService.login(fileOwnerUser.email, fileOwnerUser.password);
             file = await uploadActions.uploadFile(fileModel.location, fileModel.name, '-my-');
 
             await loginPage.login(fileOwnerUser.email, fileOwnerUser.password);
@@ -249,7 +249,7 @@ describe('Permissions Component', () => {
     describe('Changing and duplicate Permissions', () => {
 
         beforeEach(async () => {
-            await apiService.getInstance().login(fileOwnerUser.email, fileOwnerUser.password);
+            await apiService.login(fileOwnerUser.email, fileOwnerUser.password);
             file = await uploadActions.uploadFile(fileModel.location, fileModel.name, '-my-');
             await loginPage.login(fileOwnerUser.email, fileOwnerUser.password);
             await contentServicesPage.goToDocumentList();

e2e/content-services/permissions/site-permissions.e2e.ts

@@ -86,14 +86,14 @@ describe('Permissions Component', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(folderOwnerUser);
         await usersActions.createUser(siteConsumerUser);
         await usersActions.createUser(consumerUser);
         await usersActions.createUser(contributorUser);
         await usersActions.createUser(collaboratorUser);
         await usersActions.createUser(managerUser);
-        await apiService.getInstance().login(folderOwnerUser.email, folderOwnerUser.password);
+        await apiService.login(folderOwnerUser.email, folderOwnerUser.password);
 
         await browser.sleep(15000);
 
@@ -155,7 +155,7 @@ describe('Permissions Component', () => {
     afterAll(async () => {
         await navigationBarPage.clickLogoutButton();
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(publicSite.entry.id, { permanent: true });
         await apiService.getInstance().core.sitesApi.deleteSite(privateSite.entry.id, { permanent: true });
     });

e2e/content-services/share-file/share-file.e2e.ts

@@ -66,7 +66,7 @@ describe('Share file', () => {
         };
 
         const apiCall = async () => {
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
             return apiService.getInstance().core.sharedlinksApi.findSharedLinks();
         };
 
@@ -74,9 +74,9 @@ describe('Share file', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const pngUploadedFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-');
 
@@ -84,7 +84,7 @@ describe('Share file', () => {
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await uploadActions.deleteFileOrFolder(nodeId);
     });
 

e2e/content-services/share-file/unshare-file.e2e.ts

@@ -59,7 +59,7 @@ describe('Unshare file', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
 
         const site = {
@@ -99,7 +99,7 @@ describe('Unshare file', () => {
             }
         });
         await apiService.getInstance().core.sharedlinksApi.addSharedLink({ nodeId: testFile1Id });
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const pngUploadedFile = await uploadActions.uploadFile(pngFileModel.location, pngFileModel.name, '-my-');
         nodeId = pngUploadedFile.entry.id;
@@ -120,7 +120,7 @@ describe('Unshare file', () => {
 
     describe('with permission', () => {
         afterAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             await uploadActions.deleteFileOrFolder(nodeId);
         });
 
@@ -168,7 +168,7 @@ describe('Unshare file', () => {
 
     describe('without permission', () => {
         afterAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             await apiService.getInstance().core.sitesApi.deleteSite(siteName, { permanent: true });
         });
 

e2e/content-services/social/social.component.e2e.ts

@@ -57,13 +57,13 @@ describe('Social component', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(componentOwner);
         await usersActions.createUser(componentVisitor);
         await usersActions.createUser(secondComponentVisitor);
 
-        await apiService.getInstance().login(componentOwner.email, componentOwner.password);
+        await apiService.login(componentOwner.email, componentOwner.password);
 
         emptyFile = await uploadActions.uploadFile(emptyFileModel.location, emptyFileModel.name, '-my-');
 
@@ -86,7 +86,7 @@ describe('Social component', () => {
 
     afterAll(async () => {
         await navigationBarPage.clickLogoutButton();
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await uploadActions.deleteFileOrFolder(emptyFile.entry.email);
     });
 

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

@@ -64,7 +64,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
 
             acsUser = await usersActions.createUser();
 
-            await apiService.getInstance().login(acsUser.email, acsUser.password);
+            await apiService.login(acsUser.email, acsUser.password);
 
             folder = await uploadActions.createFolder(folderName, '-my-');
 
@@ -85,7 +85,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
 
         afterAll(async () => {
             try {
-                await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+                await apiService.loginWithProfile('admin');
                 await uploadActions.deleteFileOrFolder(folder.entry.id);
                 await identityService.deleteIdentityUser(acsUser.email);
             } catch (error) {

e2e/content-services/tag-component.e2e.ts

@@ -50,11 +50,11 @@ describe('Tag component', () => {
     let pdfUploadedFile, nodeId;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser();
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         pdfUploadedFile = await uploadActions.uploadFile(pdfFileModel.location, pdfFileModel.name, '-my-');
 
@@ -74,7 +74,7 @@ describe('Tag component', () => {
 
     afterAll(async () => {
         await navigationBarPage.clickLogoutButton();
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await uploadActions.deleteFileOrFolder(pdfUploadedFile.entry.id);
     });
 

e2e/content-services/trashcan-pagination.e2e.ts

@@ -61,10 +61,10 @@ describe('Trashcan - Pagination', () => {
     beforeAll(async () => {
         const uploadActions = new UploadActions(apiService);
         const fileNames = StringUtil.generateFilesNames(10, noOfFiles + 9, pagination.base, pagination.extension);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         const folderUploadedModel = await uploadActions.createFolder(newFolderModel.name, '-my-');
         const emptyFiles: any = await uploadActions.createEmptyFiles(fileNames, folderUploadedModel.entry.id);
 

e2e/content-services/tree-view-component.e2e.ts

@@ -18,7 +18,6 @@
 import { ApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../core/pages/navigation-bar.page';
 import { TreeViewPage } from './pages/tree-view.page';
-import { browser } from 'protractor';
 
 describe('Tree View Component', () => {
 
@@ -43,11 +42,11 @@ describe('Tree View Component', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser();
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         treeFolder = await apiService.getInstance().nodes.addNode(nodeNames.parentFolder, {
             name: nodeNames.folder,
@@ -74,7 +73,7 @@ describe('Tree View Component', () => {
     afterAll(async () => {
         await navigationBarPage.clickLogoutButton();
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await uploadActions.deleteFileOrFolder(treeFolder.entry.id);
         await uploadActions.deleteFileOrFolder(secondTreeFolder.entry.id);

e2e/content-services/upload/cancel-upload.e2e.ts

@@ -50,9 +50,9 @@ describe('Upload component', async () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         await loginPage.login(acsUser.email, acsUser.password);
         await contentServicesPage.goToDocumentList();

e2e/content-services/upload/excluded-file.e2e.ts

@@ -74,11 +74,11 @@ describe('Upload component - Excluded Files', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser();
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         await loginPage.login(acsUser.email, acsUser.password);
 

e2e/content-services/upload/upload-dialog.e2e.ts

@@ -68,9 +68,9 @@ describe('Upload component', () => {
     const filesName = [pdfFileModel.name, docxFileModel.name, pngFileModel.name, firstPdfFileModel.name];
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         await loginPage.login(acsUser.email, acsUser.password);
         await contentServicesPage.goToDocumentList();
     });

e2e/content-services/upload/uploader-component.e2e.ts

@@ -72,9 +72,9 @@ describe('Upload component', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         await loginPage.login(acsUser.email, acsUser.password);
         const pdfUploadedFile = await uploadActions.uploadFile(firstPdfFileModel.location, firstPdfFileModel.name, '-my-');
         Object.assign(firstPdfFileModel, pdfUploadedFile.entry);

e2e/content-services/upload/user-permission.e2e.ts

@@ -51,7 +51,7 @@ describe('Upload - User permission', () => {
     let acsUser, acsUserTwo, consumerSite, managerSite;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser(acsUser);
         acsUserTwo = await usersActions.createUser(acsUserTwo);

e2e/content-services/version/version-actions.e2e.ts

@@ -64,9 +64,9 @@ describe('Version component actions', () => {
 
     beforeAll(async () => {
         uploadActions = new UploadActions(apiService);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         acsUser = await usersActions.createUser();
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         const txtUploadedFile = await uploadActions.uploadFile(txtFileModel.location, txtFileModel.name, '-my-');
         Object.assign(txtFileModel, txtUploadedFile.entry);
         txtFileModel.update(txtUploadedFile.entry);

e2e/content-services/version/version-permissions.e2e.ts

@@ -71,7 +71,7 @@ describe('Version component permissions', () => {
     const uploadActions = new UploadActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
         await usersActions.createUser(consumerUser);
         await usersActions.createUser(collaboratorUser);
@@ -117,13 +117,13 @@ describe('Version component permissions', () => {
                 lifetime: 'PERSISTENT'
             });
 
-        await apiService.getInstance().login(fileCreatorUser.email, fileCreatorUser.password);
+        await apiService.login(fileCreatorUser.email, fileCreatorUser.password);
 
         await uploadActions.uploadFile(differentCreatorFile.location, differentCreatorFile.name, site.entry.guid);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
     });
 
@@ -134,7 +134,7 @@ describe('Version component permissions', () => {
         });
 
         beforeAll(async () => {
-            await apiService.getInstance().login(managerUser.email, managerUser.password);
+            await apiService.login(managerUser.email, managerUser.password);
 
             const sameCreatorFileUploaded = await uploadActions.uploadFile(sameCreatorFile.location, sameCreatorFile.name, site.entry.guid);
             Object.assign(sameCreatorFile, sameCreatorFileUploaded.entry);
@@ -206,7 +206,7 @@ describe('Version component permissions', () => {
         });
 
         beforeAll(async () => {
-            await apiService.getInstance().login(contributorUser.email, contributorUser.password);
+            await apiService.login(contributorUser.email, contributorUser.password);
 
             const sameCreatorFileUploaded = await uploadActions.uploadFile(sameCreatorFile.location, sameCreatorFile.name, site.entry.guid);
             Object.assign(sameCreatorFile, sameCreatorFileUploaded.entry);
@@ -261,7 +261,7 @@ describe('Version component permissions', () => {
         });
 
         beforeAll(async () => {
-            await apiService.getInstance().login(collaboratorUser.email, collaboratorUser.password);
+            await apiService.login(collaboratorUser.email, collaboratorUser.password);
 
             const sameCreatorFileUploaded = await uploadActions.uploadFile(sameCreatorFile.location, sameCreatorFile.name, site.entry.guid);
             Object.assign(sameCreatorFile, sameCreatorFileUploaded.entry);

e2e/content-services/version/version-properties.e2e.ts

@@ -56,11 +56,11 @@ describe('Version Properties', () => {
     const uploadActions = new UploadActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser();
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const txtUploadedFile = await uploadActions.uploadFile(txtFileModel.location, txtFileModel.name, '-my-');
 

e2e/content-services/version/version-smoke-tests.e2e.ts

@@ -71,11 +71,11 @@ describe('Version component', () => {
     const uploadActions = new UploadActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser();
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         txtUploadedFile = await uploadActions.uploadFile(txtFileModel.location, txtFileModel.name, '-my-');
         Object.assign(txtFileModel, txtUploadedFile.entry);

e2e/core/datatable/data-table-component-selection.e2e.ts

@@ -16,7 +16,6 @@
  */
 
 import { ApiService, DataTableComponentPage, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
-import { browser } from 'protractor';
 import { DataTablePage } from '../../core/pages/data-table.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 
@@ -32,7 +31,7 @@ describe('Datatable component - selection', () => {
     const dataTableComponent = new DataTableComponentPage();
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(acsUser);
 

e2e/core/datatable/data-table-component.e2e.ts

@@ -46,7 +46,7 @@ describe('Datatable component', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(acsUser);
 

e2e/core/error-component.e2e.ts

@@ -32,7 +32,7 @@ describe('Error Component', () => {
     const contentServicesPage = new ContentServicesPage();
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
         await loginPage.login(acsUser.email, acsUser.password);
         await contentServicesPage.goToDocumentList();

e2e/core/header-component.e2e.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 import { ApiService, HeaderPage, LoginPage, SettingsPage, UserModel, UsersActions } from '@alfresco/adf-testing';
-import { browser } from 'protractor';
 import { NavigationBarPage } from '../core/pages/navigation-bar.page';
 
 describe('Header Component', () => {
@@ -45,7 +44,7 @@ describe('Header Component', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(acsUser);
         await loginPage.login(acsUser.email, acsUser.password);

e2e/core/icons-component.e2e.ts

@@ -18,7 +18,6 @@
 import { ApiService, LoginPage, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../core/pages/navigation-bar.page';
 import { IconsPage } from '../core/pages/icons.page';
-import { browser } from 'protractor';
 
 describe('Universal Icon component', () => {
 
@@ -31,7 +30,7 @@ describe('Universal Icon component', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
         await loginPage.login(acsUser.email, acsUser.password);
    });

e2e/core/infinite-scrolling.e2e.ts

@@ -24,7 +24,6 @@ import {
     UserModel,
     UsersActions
 } from '@alfresco/adf-testing';
-import { browser } from 'protractor';
 import { FolderModel } from '../models/ACS/folder.model';
 import { ContentServicesPage } from '../core/pages/content-services.page';
 import { InfinitePaginationPage } from './pages/infinite-pagination.page';
@@ -59,7 +58,7 @@ describe('Enable infinite scrolling', () => {
     beforeAll(async () => {
         const uploadActions = new UploadActions(apiService);
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(acsUser);
 
@@ -68,7 +67,7 @@ describe('Enable infinite scrolling', () => {
         fileNames = StringUtil.generateFilesNames(1, nrOfFiles, files.base, files.extension);
         deleteFileNames = StringUtil.generateFilesNames(1, nrOfDeletedFiles, files.base, files.extension);
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const folderUploadedModel = await uploadActions.createFolder(folderModel.name, '-my-');
         emptyFolderModel = await uploadActions.createFolder('emptyFolder', '-my-');

e2e/core/login/login-component.e2e.ts

@@ -55,7 +55,7 @@ describe('Login component', () => {
     beforeAll(async () => {
         await LocalStorageUtil.setStorageItem('authType', 'BASIC');
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(userA);
         await usersActions.createUser(userB);

e2e/core/notifications-component.e2e.ts

@@ -31,11 +31,11 @@ describe('Notifications Component', () => {
     let acsUser: UserModel;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         acsUser = await usersActions.createUser();
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         await loginPage.login(acsUser.email, acsUser.password);
 

e2e/core/pagination-empty-current-page.e2e.ts

@@ -71,13 +71,13 @@ describe('Pagination - returns to previous page when current is empty', () => {
     beforeAll(async () => {
         const uploadActions = new UploadActions(apiService);
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(acsUser);
 
         fileNames = StringUtil.generateFilesNames(1, nrOfFiles, files.base, files.extension);
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const folderUploadedModel = await uploadActions.createFolder(folderModel.name, '-my-');
 

e2e/core/viewer/file-extensions/viewer-archive.component.e2e.ts

@@ -50,7 +50,7 @@ describe('Viewer', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
         site = await apiService.getInstance().core.sitesApi.createSite({
             title: StringUtil.generateRandomString(8),
@@ -60,11 +60,11 @@ describe('Viewer', () => {
             id: acsUser.email,
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
         await navigationBarPage.clickLogoutButton();
     });

e2e/core/viewer/file-extensions/viewer-component.e2e.ts

@@ -60,7 +60,7 @@ describe('Viewer', () => {
         await LocalStorageUtil.setStorageItem('providers', 'ECM');
         await LocalStorageUtil.setStorageItem('authType', 'BASIC');
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
         site = await apiService.getInstance().core.sitesApi.createSite({
@@ -73,13 +73,13 @@ describe('Viewer', () => {
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         pngFileUploaded = await uploadActions.uploadFile(pngFileInfo.location, pngFileInfo.name, site.entry.guid);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
         await navigationBarPage.clickLogoutButton();
     });

e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts

@@ -47,7 +47,7 @@ describe('Viewer', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
         site = await apiService.getInstance().core.sitesApi.createSite({
@@ -60,11 +60,11 @@ describe('Viewer', () => {
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
     });
 

e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts

@@ -53,7 +53,7 @@ describe('Viewer', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
         site = await apiService.getInstance().core.sitesApi.createSite({
@@ -66,11 +66,11 @@ describe('Viewer', () => {
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
     });
 

e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts

@@ -49,7 +49,7 @@ describe('Viewer', () => {
     let site;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
         site = await apiService.getInstance().core.sitesApi.createSite({
@@ -62,11 +62,11 @@ describe('Viewer', () => {
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
     });
 

e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts

@@ -47,7 +47,7 @@ describe('Viewer', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
         site = await apiService.getInstance().core.sitesApi.createSite({
@@ -60,11 +60,11 @@ describe('Viewer', () => {
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
     });
 

e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts

@@ -49,7 +49,7 @@ describe('Viewer', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
         site = await apiService.getInstance().core.sitesApi.createSite({
@@ -62,11 +62,11 @@ describe('Viewer', () => {
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
         await navigationBarPage.clickLogoutButton();
     });

e2e/core/viewer/viewer-content-services-component.e2e.ts

@@ -88,11 +88,11 @@ describe('Content Services Viewer', () => {
     const uploadActions = new UploadActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(acsUser);
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         const pdfFileUploaded = await uploadActions.uploadFile(pdfFile.location, pdfFile.name, '-my-');
         Object.assign(pdfFile, pdfFileUploaded.entry);

e2e/core/viewer/viewer-custom-toolbar-info-drawer.e2e.ts

@@ -48,10 +48,10 @@ describe('Viewer', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         txtFileUploaded = await uploadActions.uploadFile(txtFileInfo.location, txtFileInfo.name, '-my-');
 

e2e/core/viewer/viewer-properties.e2e.ts

@@ -52,11 +52,11 @@ describe('Viewer - properties', () => {
     const uploadActions = new UploadActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await usersActions.createUser(acsUser);
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         let pngFileUploaded = await uploadActions.uploadFile(pngFile.location, pngFile.name, '-my-');
         Object.assign(pngFile, pngFileUploaded.entry);

e2e/core/viewer/viewer-share-content.ts

@@ -62,7 +62,7 @@ describe('Viewer', () => {
     let pngFileShared, wordFileUploaded;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await usersActions.createUser(acsUser);
 
         site = await apiService.getInstance().core.sitesApi.createSite({
@@ -75,11 +75,11 @@ describe('Viewer', () => {
             role: CONSTANTS.CS_USER_ROLES.MANAGER
         });
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         pngFileUploaded = await uploadActions.uploadFile(pngFileInfo.location, pngFileInfo.name, site.entry.guid);
 
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
 
         wordFileUploaded = await uploadActions.uploadFile(wordFileInfo.location, wordFileInfo.name, '-my-');
 
@@ -88,7 +88,7 @@ describe('Viewer', () => {
 
     afterAll(async () => {
         await apiService.getInstance().core.sitesApi.deleteSite(site.entry.id, { permanent: true });
-        await apiService.getInstance().login(acsUser.email, acsUser.password);
+        await apiService.login(acsUser.email, acsUser.password);
         await uploadActions.deleteFileOrFolder(wordFileUploaded.entry.id);
     });
 

e2e/insights/analytics-component.e2e.ts

@@ -20,7 +20,6 @@ import { NavigationBarPage } from '../core/pages/navigation-bar.page';
 import { AnalyticsPage } from '../process-services/pages/analytics.page';
 import { ProcessServicesPage } from '../process-services/pages/process-services.page';
 import { ProcessServiceTabBarPage } from '../process-services/pages/process-service-tab-bar.page';
-import { browser } from 'protractor';
 
 describe('Analytics Smoke Test', () => {
 
@@ -37,7 +36,7 @@ describe('Analytics Smoke Test', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         procUserModel = await usersActions.createUser();
 

e2e/process-services-cloud/process-task-attach-content-file-cloud.e2e.ts

@@ -93,7 +93,7 @@ describe('Process Task - Attach content file', () => {
 
         const task = await queryService.getProcessInstanceTasks(processInstance.entry.id, simpleApp);
         await tasksService.claimTask(task.list.entries[0].entry.id, simpleApp);
-        await apiService.getInstance().login(testUser.email, testUser.password);
+        await apiService.login(testUser.email, testUser.password);
         uploadedFolder = await uploadActions.createFolder(folderName, '-my-');
         await uploadActions.uploadFile(pdfFileOne.location, pdfFileOne.name, uploadedFolder.entry.id);
         await uploadActions.uploadFile(pdfFileTwo.location, pdfFileTwo.name, uploadedFolder.entry.id);

e2e/process-services-cloud/start-task-form-cloud.e2e.ts

@@ -141,7 +141,7 @@ describe('Start Task Form', () => {
             'businessKey': StringUtil.generateRandomString()
         });
 
-        await apiService.getInstance().login(testUser.email, testUser.password);
+        await apiService.login(testUser.email, testUser.password);
         uploadedFolder = await uploadActions.createFolder(folderName, '-my-');
         await uploadActions.uploadFile(testFileModel.location, testFileModel.name, uploadedFolder.entry.id);
         await uploadActions.uploadFile(pdfFileModel.location, pdfFileModel.name, uploadedFolder.entry.id);

e2e/process-services/about-process-services.e2e.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 import { AboutPage, ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
-import { browser } from 'protractor';
 import { NavigationBarPage } from '../core/pages/navigation-bar.page';
 
 describe('About Process Services', () => {
@@ -30,16 +29,16 @@ describe('About Process Services', () => {
     const usersActions = new UsersActions(apiService);
 
     beforeAll(async() => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         user = await usersActions.createUser();
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
         await loginPage.login(user.email, user.password);
         await navigationBarPage.clickAboutButton();
     });
 
     afterAll(async() => {
         await navigationBarPage.clickLogoutButton();
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
     });
 

e2e/process-services/apps-section.e2e.ts

@@ -41,11 +41,11 @@ describe('Modify applications', () => {
     let firstApp, appVersionToBeDeleted;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         const user = await usersActions.createUser();
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         firstApp = await applicationService.importPublishDeployApp(app.file_path);
         appVersionToBeDeleted = await applicationService.importPublishDeployApp(appToBeDeleted.file_path);

e2e/process-services/attach-file-content-service.e2e.ts

@@ -78,7 +78,7 @@ describe('Attach File - Content service', () => {
     beforeAll(async () => {
         await LocalStorageUtil.setStorageItem('providers', 'ALL');
 
-        await apiService.getInstance().login(email, password);
+        await apiService.login(email, password);
         user = await usersActions.createUser();
 
         await apiServiceExternal.login(email, password);
@@ -95,7 +95,7 @@ describe('Attach File - Content service', () => {
             host: browser.params.testConfig.adf_external_acs.host
         });
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
         await uploadActions.uploadFile(pdfFileTwo.location, pdfFileTwo.name, '-my-');
         await applicationService.importPublishDeployApp(app.file_path);
 
@@ -104,7 +104,7 @@ describe('Attach File - Content service', () => {
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(email, password);
+        await apiService.login(email, password);
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
     });
 

e2e/process-services/attach-file-widget-start-task-app.e2e.ts

@@ -52,15 +52,15 @@ describe('Start Task - Task App', () => {
     const appFields = app.form_fields;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         user = await usersActions.createUser();
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
         await applicationService.importPublishDeployApp(app.file_path);
         await loginPage.login(user.email, user.password);
    });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
    });
 

e2e/process-services/attach-folder.e2e.ts

@@ -55,7 +55,7 @@ describe('Attach Folder', () => {
     beforeAll(async () => {
         await LocalStorageUtil.setStorageItem('providers', 'ALL');
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         user = await usersActions.createUser();
 
         await integrationService.addCSIntegration({
@@ -63,7 +63,7 @@ describe('Attach Folder', () => {
             name: 'adf dev',
             host: browser.params.testConfig.appConfig.ecmHost
         });
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
         await applicationService.importPublishDeployApp(app.file_path);
         await new UploadActions(apiService).createFolder(folderName, '-my-');
         await searchService.isSearchable(folderName);
@@ -71,7 +71,7 @@ describe('Attach Folder', () => {
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
     });
 

e2e/process-services/attach-form-component.e2e.ts

@@ -50,13 +50,13 @@ describe('Attach Form Component', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         user = await usersActions.createUser();
 
         tenantId = user.tenantId;
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         appModel = await applicationService.importPublishDeployApp(app.file_path);
 
@@ -67,7 +67,7 @@ describe('Attach Form Component', () => {
 
     afterAll(async () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appModel.id);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
    });
 

e2e/process-services/checklist-component.e2e.ts

@@ -47,14 +47,14 @@ describe('Checklist component', () => {
     const hierarchyChecklist = ['checklistOne', 'checklistTwo', 'checklistOneChild', 'checklistTwoChild'];
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         processUserModel = await usersActions.createUser();
 
         const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
         const file = fs.createReadStream(pathFile);
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         await apiService.getInstance().activiti.appsApi.importAppDefinition(file);
 

e2e/process-services/comment-component-processes.e2e.ts

@@ -38,11 +38,11 @@ describe('Comment component for Processes', () => {
     const processName = 'Comment APS';
 
     beforeAll(async () => {
-       await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+       await apiService.loginWithProfile('admin');
 
        user = await usersActions.createUser();
 
-       await apiService.getInstance().login(user.email, user.password);
+       await apiService.login(user.email, user.password);
 
        const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
        appId = importedApp.id;
@@ -55,7 +55,7 @@ describe('Comment component for Processes', () => {
 
     afterAll(async () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
     });
 

e2e/process-services/comment-component-tasks.e2e.ts

@@ -45,12 +45,12 @@ describe('Comment component for Processes', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         user = await usersActions.createUser();
         secondUser = await usersActions.createUser(new UserModel({ tenantId: user.tenantId }));
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         const importedApp = await new ApplicationsUtil(apiService).importPublishDeployApp(app.file_path);
         appId = importedApp.id;
@@ -60,7 +60,7 @@ describe('Comment component for Processes', () => {
 
     afterAll(async () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
     });
 

e2e/process-services/custom-process-filters-sorting.e2e.ts

@@ -49,14 +49,14 @@ describe('Sorting for process filters', () => {
     };
 
     beforeEach(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         const applicationsService = new ApplicationsUtil(apiService);
 
         user = await usersActions.createUser();
         tenantId = user.tenantId;
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         importedApp = await applicationsService.importPublishDeployApp(app.file_path);
         appId = importedApp.id;
@@ -67,7 +67,7 @@ describe('Sorting for process filters', () => {
     afterEach(async () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
 

e2e/process-services/custom-process-filters.e2e.ts

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-import { browser } from 'protractor';
-
 import { ApiService, LoginPage, UsersActions } from '@alfresco/adf-testing';
 import { ProcessFiltersPage } from './pages/process-filters.page';
 import { ProcessServiceTabBarPage } from './pages/process-service-tab-bar.page';
@@ -48,19 +46,19 @@ describe('New Process Filters', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         user = await usersActions.createUser();
 
         tenantId = user.tenantId;
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         await loginPage.login(user.email, user.password);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
     });
 

e2e/process-services/custom-tasks-filters.e2e.ts

@@ -81,11 +81,11 @@ describe('Start Task - Custom App', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         processUserModel = await usersActions.createUser();
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         appModel = await applicationsService.importPublishDeployApp(app.file_path);
 

e2e/process-services/dynamic-table-date-picker.e2e.ts

@@ -43,13 +43,13 @@ describe('Dynamic Table', () => {
     let user, tenantId, appId;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         user = await usersActions.createUser();
         tenantId = user.tenantId;
    });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
    });
 
@@ -68,7 +68,7 @@ describe('Dynamic Table', () => {
         const rowPosition = 0;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(user.email, user.password);
+            await apiService.login(user.email, user.password);
             const applicationsService = new ApplicationsUtil(apiService);
             const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
             appId = importedApp.id;
@@ -76,7 +76,7 @@ describe('Dynamic Table', () => {
         });
 
         afterAll(async () => {
-            await apiService.getInstance().login(user.email, user.password);
+            await apiService.login(user.email, user.password);
             await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
             await navigationBarPage.clickLogoutButton();
         });
@@ -130,7 +130,7 @@ describe('Dynamic Table', () => {
         const dropdown = widget.dropdown();
 
         beforeAll(async () => {
-            await apiService.getInstance().login(user.email, user.password);
+            await apiService.login(user.email, user.password);
             const applicationsService = new ApplicationsUtil(apiService);
 
             const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
@@ -139,7 +139,7 @@ describe('Dynamic Table', () => {
         });
 
         afterAll(async () => {
-            await apiService.getInstance().login(user.email, user.password);
+            await apiService.login(user.email, user.password);
             await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
         });
 

e2e/process-services/empty-process-list-component.e2e.ts

@@ -42,13 +42,13 @@ describe('Empty Process List Test', () => {
     beforeAll(async () => {
         const usersActions = new UsersActions(apiService);
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         const applicationsService = new ApplicationsUtil(apiService);
 
         user = await usersActions.createUser();
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         await applicationsService.importPublishDeployApp(appWithProcess.file_path);
         await applicationsService.importPublishDeployApp(simpleAppWithUserForm.file_path);

e2e/process-services/form-component.e2e.ts

@@ -17,7 +17,6 @@
 
 import { ApiService, FormPage, LoginPage, UsersActions, Widget } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../core/pages/navigation-bar.page';
-import { browser } from 'protractor';
 
 describe('Form Component', () => {
 
@@ -48,13 +47,13 @@ describe('Form Component', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         user = await usersActions.createUser();
 
         tenantId = user.tenantId;
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         await loginPage.login(user.email, user.password);
 
@@ -62,7 +61,7 @@ describe('Form Component', () => {
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
     });

e2e/process-services/form-people-widget.e2e.ts

@@ -49,11 +49,11 @@ describe('Form widgets - People ', () => {
     let appModel;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         processUserModel = await usersActions.createUser();
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         const applicationsService = new ApplicationsUtil(apiService);
 
@@ -63,7 +63,7 @@ describe('Form widgets - People ', () => {
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
     });

e2e/process-services/form-widgets-component.e2e.ts

@@ -51,11 +51,11 @@ describe('Form widgets', () => {
         const appFields = appWidget.form_fields;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             processUserModel = await usersActions.createUser();
 
-            await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+            await apiService.login(processUserModel.email, processUserModel.password);
 
             appModelWidget = await applicationsService.importPublishDeployApp(appWidget.file_path);
 
@@ -83,7 +83,7 @@ describe('Form widgets', () => {
 
         afterAll(async () => {
             await new NavigationBarPage().clickLogoutButton();
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
             await apiService.getInstance().logout();
@@ -199,11 +199,11 @@ describe('Form widgets', () => {
         let appModel;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             processUserModel = await usersActions.createUser();
 
-            await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+            await apiService.login(processUserModel.email, processUserModel.password);
             appModel = await applicationsService.importPublishDeployApp(app.file_path);
 
             const processUtil = new ProcessUtil(apiService);
@@ -220,7 +220,7 @@ describe('Form widgets', () => {
 
         afterAll(async () => {
             await apiService.getInstance().activiti.processApi.deleteProcessInstance(process.id);
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
         });
 

e2e/process-services/info-drawer.e2e.ts

@@ -74,7 +74,7 @@ describe('Info Drawer', () => {
     beforeAll(async () => {
         const usersActions = new UsersActions(apiService);
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         const assigneeUserModel = await usersActions.createUser();
         assigneeUserModelFullName = assigneeUserModel.firstName + ' ' + assigneeUserModel.lastName;
@@ -82,7 +82,7 @@ describe('Info Drawer', () => {
         processUserModel = await usersActions.createUser(new UserModel({ tenantId: assigneeUserModel.tenantId }));
         processUserModelFullName = processUserModel.firstName + ' ' + processUserModel.lastName;
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
         appCreated = await applicationsService.importPublishDeployApp(app.file_path);
 
         await loginPage.login(processUserModel.email, processUserModel.password);
@@ -90,7 +90,7 @@ describe('Info Drawer', () => {
 
     afterAll(async () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appCreated.id);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
     });
 

e2e/process-services/pagination-processlist-adding-processes.e2e.ts

@@ -51,11 +51,11 @@ describe('Process List - Pagination when adding processes', () => {
     let resultApp;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         processUserModel = await usersActions.createUser();
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         resultApp = await applicationsService.importPublishDeployApp(app.file_path);
 

e2e/process-services/pagination-tasklist-adding-tasks.e2e.ts

@@ -53,11 +53,11 @@ describe('Items per page set to 15 and adding of tasks', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         processUserModel = await usersActions.createUser();
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         resultApp = await applicationsService.importPublishDeployApp(app.file_path);
 

e2e/process-services/people-component.e2e.ts

@@ -43,7 +43,7 @@ describe('People component', () => {
     const tasks = ['no people involved task', 'remove people task', 'can not complete task', 'multiple users', 'completed filter'];
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         assigneeUserModel = await usersActions.createUser();
         secondAssigneeUserModel = await usersActions.createUser(new UserModel({ tenantId: assigneeUserModel.tenantId }));
@@ -52,7 +52,7 @@ describe('People component', () => {
         const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
         const file = fs.createReadStream(pathFile);
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         await apiService.getInstance().activiti.appsApi.importAppDefinition(file);
 

e2e/process-services/process-attachment-list-action-menu.e2e.ts

@@ -63,13 +63,13 @@ describe('Attachment list action menu for processes', () => {
 
     beforeAll(async () => {
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         const user = await usersActions.createUser();
 
         tenantId = user.tenantId;
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         const importedApp = await applicationsService.importPublishDeployApp(app.file_path);
         appId = importedApp.id;
@@ -86,7 +86,7 @@ describe('Attachment list action menu for processes', () => {
 
     afterAll(async () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
     });
 

e2e/process-services/process-filters-component.e2e.ts

@@ -69,9 +69,9 @@ describe('Process Filters Test', () => {
 
     beforeAll(async () => {
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         user = await usersActions.createUser();
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
         appModel = await applicationsService.importPublishDeployApp(app.file_path);
         await loginPage.login(user.email, user.password);
     });

e2e/process-services/process-instance-details.e2e.ts

@@ -43,11 +43,11 @@ describe('Process Instance Details', () => {
     const PROCESS_DATE_FORMAT = 'll';
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         user = await usersActions.createUser();
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         appModel = await applicationsService.importPublishDeployApp(app.file_path);
         const processModel = await new ProcessUtil(apiService).startProcessOfApp(appModel.name);
@@ -65,7 +65,7 @@ describe('Process Instance Details', () => {
 
     afterAll(async () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appModel.id);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
    });
 

e2e/process-services/process-list-component.e2e.ts

@@ -58,11 +58,11 @@ describe('Process List Test', () => {
     let procWithDate, completedProcWithDate, completedProcWithUserWidget;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         user = await usersActions.createUser();
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
 
         appDateModel = await applicationsUtil.importPublishDeployApp(appWithDateField.file_path);
 
@@ -91,7 +91,7 @@ describe('Process List Test', () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appDateModel.id);
         await apiService.getInstance().activiti.modelsApi.deleteModel(appUserWidgetModel.id);
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
    });

e2e/process-services/processlist-pagination.e2e.ts

@@ -63,11 +63,11 @@ describe('Process List - Pagination', () => {
     let totalPages;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         processUserModel = await usersActions.createUser();
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         deployedTestApp = await applicationsService.importPublishDeployApp(app.file_path);
 
@@ -76,7 +76,7 @@ describe('Process List - Pagination', () => {
 
     describe('With processes Pagination', () => {
         beforeAll(async () => {
-            await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+            await apiService.login(processUserModel.email, processUserModel.password);
 
             for (let i = 0; i < nrOfProcesses; i++) {
                 await new ProcessUtil(apiService).startProcessOfApp(deployedTestApp.name);

e2e/process-services/sort-tasklist-pagination.e2e.ts

@@ -56,11 +56,11 @@ describe('Task List Pagination - Sorting', () => {
     };
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         processUserModel = await usersActions.createUser();
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         await applicationsService.importPublishDeployApp(app.file_path);
 

e2e/process-services/standalone-task.e2e.ts

@@ -42,14 +42,14 @@ describe('Start Task - Task App', () => {
 
     beforeAll(async () => {
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         processUserModel = await usersActions.createUser();
 
         const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
         const file = fs.createReadStream(pathFile);
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         await apiService.getInstance().activiti.appsApi.importAppDefinition(file);
 

e2e/process-services/start-process-component.e2e.ts

@@ -83,13 +83,13 @@ describe('Start Process Component', () => {
     describe('Provider: BPM', () => {
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             const usersActions = new UsersActions(apiService);
             procUserModel = await usersActions.createUser();
             secondProcUserModel = await usersActions.createUser(new UserModel({ tenantId: procUserModel.tenantId }));
 
-            await apiServiceUserTwo.getInstance().login(secondProcUserModel.email, secondProcUserModel.password);
+            await apiServiceUserTwo.login(secondProcUserModel.email, secondProcUserModel.password);
 
             const applicationsService = new ApplicationsUtil(apiServiceUserTwo);
             appCreated = await applicationsService.importPublishDeployApp(app.file_path);

e2e/process-services/start-task-custom-app.e2e.ts

@@ -52,12 +52,12 @@ describe('Start Task - Custom App', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         assigneeUserModel = await usersActions.createUser();
         processUserModel = await usersActions.createUser(new UserModel({ tenantId: assigneeUserModel.tenantId }));
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         appModel = await applicationsService.importPublishDeployApp(app.file_path);
 

e2e/process-services/start-task-task-app.e2e.ts

@@ -56,7 +56,7 @@ describe('Start Task - Task App', () => {
     });
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
 
         assigneeUserModel = await usersActions.createUser();
 
@@ -65,7 +65,7 @@ describe('Start Task - Task App', () => {
         const pathFile = path.join(browser.params.testConfig.main.rootPath + app.file_location);
         const file = fs.createReadStream(pathFile);
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
 
         await apiService.getInstance().activiti.appsApi.importAppDefinition(file);
 

e2e/process-services/stencil.e2e.ts

@@ -53,17 +53,17 @@ describe('Stencil', () => {
     let user: UserModel;
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         user = await usersActions.createUser();
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
         const applicationsService = new ApplicationsUtil(apiService);
         await applicationsService.importPublishDeployApp(app.file_path);
         await loginPage.login(user.email, user.password);
     });
 
     afterAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
     });
 

e2e/process-services/task-assignee.e2e.ts

@@ -57,7 +57,7 @@ describe('Task Assignee', () => {
         let user: UserModel;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
 
             user = await usersActions.createUser(new UserModel({
                 firstName: app.candidate.firstName,
@@ -73,14 +73,14 @@ describe('Task Assignee', () => {
             } catch (e) {
             }
 
-            await apiService.getInstance().login(user.email, user.password);
+            await apiService.login(user.email, user.password);
             await applicationsService.importPublishDeployApp(app.file_path, { renewIdmEntries: true });
 
             await loginPage.login(user.email, user.password);
         });
 
         afterAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
             await navigationBarPage.clickLogoutButton();
         });
@@ -127,7 +127,7 @@ describe('Task Assignee', () => {
         let candidate2: UserModel;
 
         beforeAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             user = await usersActions.createUser();
             candidate1 = await usersActions.createUser(new UserModel({ tenantId: user.tenantId }));
             candidate2 = await usersActions.createUser(new UserModel({ tenantId: user.tenantId }));
@@ -157,14 +157,14 @@ describe('Task Assignee', () => {
             } catch (e) {
             }
 
-            await apiService.getInstance().login(user.email, user.password);
+            await apiService.login(user.email, user.password);
             const appModel = await applicationsService.importPublishDeployApp(app.file_path, { renewIdmEntries: true });
 
             await new ProcessUtil(apiService).startProcessByDefinitionName(appModel.name, app.processNames[1]);
         });
 
         afterAll(async () => {
-            await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+            await apiService.loginWithProfile('admin');
             await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(user.tenantId);
         });
 

e2e/process-services/task-attachment-list-action-menu.e2e.ts

@@ -61,11 +61,11 @@ describe('Attachment list action menu for tasks', () => {
 
     beforeAll(async () => {
 
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         const user = await usersActions.createUser();
         tenantId = user.tenantId;
 
-        await apiService.getInstance().login(user.email, user.password);
+        await apiService.login(user.email, user.password);
         const applicationsService = new ApplicationsUtil(apiService);
         const { id } = await applicationsService.importPublishDeployApp(app.file_path);
         appId = id;
@@ -75,7 +75,7 @@ describe('Attachment list action menu for tasks', () => {
 
     afterAll(async () => {
         await apiService.getInstance().activiti.modelsApi.deleteModel(appId);
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(tenantId);
     });
 

e2e/process-services/task-audit.e2e.ts

@@ -41,10 +41,10 @@ describe('Task Audit', () => {
     const auditLogFile = 'Audit.pdf';
 
     beforeAll(async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         processUserModel = await usersActions.createUser();
 
-        await apiService.getInstance().login(processUserModel.email, processUserModel.password);
+        await apiService.login(processUserModel.email, processUserModel.password);
         await apiService.getInstance().activiti.taskApi.createNewTask(new TaskRepresentation({ name: taskTaskApp }));
         const applicationsService = new ApplicationsUtil(apiService);
         await applicationsService.importPublishDeployApp(app.file_path);
@@ -53,7 +53,7 @@ describe('Task Audit', () => {
     });
 
     afterAll( async () => {
-        await apiService.getInstance().login(browser.params.testConfig.admin.email, browser.params.testConfig.admin.password);
+        await apiService.loginWithProfile('admin');
         await apiService.getInstance().activiti.adminTenantsApi.deleteTenant(processUserModel.tenantId);
     });