mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2026-09-09 18:03:21 +00:00
[AAE-12501] move auth in ADF (#8689)
* remove unneeded JS-API dep move auth in the right place * [AAE-12501] Replace alfresco api client with AdfHttpClient * [AAE-12501] Restore get username methods * [AAE-12501] Get username with authentication service * [AAE-12501] Create a request options interface with the needed props, remove the import from js-api, return the body from request * add emitters * [AAE-12501] Replace Math.random() to fix hospot security issue, fix lint issues * [AAE-12501] Comment temporary setCsrfToken because is not possible to import app config service from core due to circular dependencies * [AAE-12501] Get disableCsrf from app config serviice when app configuration is loaded * [AAE-12501] Remove wrong character * Pass down the requestUrl for request interception bring back check from js-api fixing isLogin issues part1 some fix around emit Narrow access for methods fix sso username issue Switch to dynamic service injection add emitters move auth inside ADF * clean * fix unit test * fix lint * Fix exports * Fix process-services unit tests * Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests * Fix content-services unit tests: getEcmUsername from authentication service Fix content-services unit tests: alfresco api service has been replaced by authentication service * Fix circular dependecies issue importing AppConfigService outside the api entrypoint dir * Import AuthModule even in not only canary mode to let the e2es run * Fix authentication unit tests * Fix unit test '[ECM] should return a ticket undefined after logout' * Remove AlfrescoApiService is not used anymore * Fix unit test '[BPM] should return an BPM ticket after the login done': add Basic suffix to basicAuth * Fix unit tests core * Fix login errors with the BASIC authentication * Fix missing onLogin event * Temporary skip unit tests to check e2es * Fix login component doesn't add the authorization header * Fix prefix is undefined * Fix image is not showed by the alfresco file viewer because alf_ticket is not added to the content url query params, pass ticketEcm to the alfrescoApi configuration used by alfrescoApiClient.ts getAlfTicket() * Fix C280012: set app prefix before calling content api * Revert "Fix image is not showed by the alfresco file viewer because alf_ticket is not added to the content url query params, pass ticketEcm to the alfrescoApi configuration used by alfrescoApiClient.ts getAlfTicket()" This reverts commit afbf086b98d72835aab8b15d4af433efeaac2d3b. * try to change adf core autoamtion service init * go back * grant type password login * fix * remove automatic login in reset try * fix not silent login * lint happy * fix * Update alfresco-api-v2-loader.service.ts * fixint * Revert "Temporary skip unit tests to check e2es" This reverts commit a0adc7e58a001a54442c82952761bff891caa5cd. * fix modules * fix app config stream in storing service fix app config stream for sub property * fix identity test to use the real service * fix unit * fix unit * fix unit * remove test that are probably have never been green * fix * fix PC * fix localstorage * fix * fix * fix * fix * fix storybook move e2e in content for versioning fix lint * fix * fix size * enable log * some fix for usernames * remove log * fix rebase * [AAE-12502] Restore isKerberosEnabled into authentication service * subject onLogin * fix unit * Fix lint issue * fix * Update error message * Revert change did by https://github.com/Alfresco/alfresco-ng2-components/pull/8689/commits/b79c5d37d69b2d76b33e5561eab2bf5b80c81b9e\#diff-ad85723e21276e05e577bab652c6ab0d243bd0ad54d4cc70ef6e60dc5e635c33L38 * Refresh the browser to wait for the user to click process cloud page * Remove e2e, the application list is already tested by the app-list-cloud.component.spec.ts https://github.com/Alfresco/alfresco-ng2-components/blob/dev-eromano-AAE-12501-2/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts\#L147 * [12502] Add getUsername method to the AuthenticationService * [12501] restore mutlipart/form-data header needed by angular http-client to to fix 415 unsupported media type * Revert "[12501] restore mutlipart/form-data header needed by angular http-client to to fix 415 unsupported media type" This reverts commit d8c584b94f649b57859d74157ec0861f2ebddebb. * [12501] fix unsupported upload file on admin-apa, append json content type only calling alfresco api * [12501] fix unsupported upload file on admin-apa [12501] fix unsupported upload file on admin-apa * Revert "[12501] fix unsupported upload file on admin-apa" This reverts commit 53cda21d795588d87244c78c5a5347afd04ea2b1. * Improve getHeaders * Revert change * Set application/json content type if request body is not a FormData * Logout by the authenticationService * Update returned error message * Fix lint issues after rebasing * [12502] Add basic template with data-automation-ad selector to check when is attached to the Dom * Fix issues after rebase --------- Co-authored-by: Amedeo Lepore <amedeo.lepore@hyland.com> Co-authored-by: Andras Popovics <popovics@ndras.hu>
This commit is contained in:
co-authored by
Amedeo Lepore
Andras Popovics
parent
057e0bcd7c
commit
08da9ae2c3
@@ -37,7 +37,7 @@ export class UploadActions {
|
||||
async uploadFile(fileLocation: fs.PathLike, fileName: string, parentFolderId: string): Promise<NodeEntry> {
|
||||
const file = fs.createReadStream(fileLocation);
|
||||
|
||||
return this.uploadApi.uploadFile(
|
||||
const uploadPromise = this.uploadApi.uploadFile(
|
||||
file,
|
||||
'',
|
||||
parentFolderId,
|
||||
@@ -48,6 +48,12 @@ export class UploadActions {
|
||||
renditions: 'doclib'
|
||||
}
|
||||
);
|
||||
|
||||
await uploadPromise.then(() => {
|
||||
Logger.info(`${fileName} uploaded in ${parentFolderId}`);
|
||||
});
|
||||
|
||||
return uploadPromise;
|
||||
}
|
||||
|
||||
async createEmptyFiles(emptyFileNames: string[], parentFolderId: string): Promise<NodeEntry> {
|
||||
@@ -74,6 +80,7 @@ export class UploadActions {
|
||||
async deleteFileOrFolder(nodeId: string) {
|
||||
const apiCall = async () => {
|
||||
try {
|
||||
Logger.info(`Deleting ${nodeId}`);
|
||||
return this.nodesApi.deleteNode(nodeId, { permanent: true });
|
||||
} catch (error) {
|
||||
Logger.error('Error delete file or folder');
|
||||
@@ -91,8 +98,18 @@ export class UploadActions {
|
||||
if (files && files.length > 0) {
|
||||
for (const fileName of files) {
|
||||
const pathFile = path.join(sourcePath, fileName);
|
||||
promises.push(this.uploadFile(pathFile, fileName, folder));
|
||||
|
||||
const uploadPromise = this.uploadFile(pathFile, fileName, folder);
|
||||
|
||||
await uploadPromise.then(() => {
|
||||
Logger.info(`File ${fileName} uploaded successfully in ${folder}!`);
|
||||
}).catch(() => {
|
||||
Logger.error(`File ${fileName} error during the upload in ${folder}!`);
|
||||
});
|
||||
|
||||
promises.push(uploadPromise);
|
||||
}
|
||||
|
||||
uploadedFiles = await Promise.all(promises);
|
||||
}
|
||||
|
||||
|
||||
@@ -82,7 +82,14 @@ export class IdentityService {
|
||||
const method = 'DELETE';
|
||||
const queryParams = {};
|
||||
const postBody = {};
|
||||
return this.api.performIdentityOperation(path, method, queryParams, postBody);
|
||||
|
||||
const deletePromise = this.api.performIdentityOperation(path, method, queryParams, postBody);
|
||||
|
||||
await deletePromise.then(() => {
|
||||
Logger.info(`user ${userId} delete`);
|
||||
});
|
||||
|
||||
return deletePromise;
|
||||
}
|
||||
|
||||
async getUserInfoByUsername(username: string): Promise<any> {
|
||||
|
||||
@@ -66,6 +66,8 @@ export class LoginPage {
|
||||
Logger.log('Login With ' + username);
|
||||
const authType = await LocalStorageUtil.getConfigField('authType');
|
||||
|
||||
Logger.log(`AuthType ${authType}`);
|
||||
|
||||
if (!authType || authType === 'OAUTH') {
|
||||
await this.loginSSOIdentityService(username, password, options);
|
||||
} else {
|
||||
@@ -83,7 +85,10 @@ export class LoginPage {
|
||||
await BrowserActions.getUrl(loginURL);
|
||||
|
||||
if (oauth2 && oauth2.silentLogin === false) {
|
||||
Logger.log(`Login SSO`);
|
||||
await this.clickOnSSOButton();
|
||||
}else{
|
||||
Logger.log(`Login SSO silent login`);
|
||||
}
|
||||
|
||||
await BrowserVisibility.waitUntilElementIsVisible(this.usernameField);
|
||||
@@ -98,6 +103,8 @@ export class LoginPage {
|
||||
}
|
||||
|
||||
async loginBasicAuth(username: string, password: string, options: LoginOptions = { waitForUserIcon: true }): Promise<void> {
|
||||
Logger.log(`Login Basic`);
|
||||
|
||||
await this.goToLoginPage();
|
||||
|
||||
await this.enterUsernameBasicAuth(username);
|
||||
|
||||
@@ -23,7 +23,7 @@ export class FileBrowserUtil {
|
||||
|
||||
static async isFileDownloaded(fileName: string): Promise<boolean> {
|
||||
const DEFAULT_ROOT_PATH = browser.params.testConfig ? browser.params.testConfig.main.rootPath : __dirname;
|
||||
const file = await browser.driver.wait(() => fs.existsSync(path.join(DEFAULT_ROOT_PATH, 'downloads', fileName)), 30000);
|
||||
const file = await browser.driver.wait(() => fs.existsSync(path.join(DEFAULT_ROOT_PATH, 'downloads', fileName)), 30000,`${fileName} not downloaded`);
|
||||
|
||||
await expect(file).toBe(true, `${fileName} not downloaded`);
|
||||
|
||||
|
||||
@@ -17,6 +17,9 @@
|
||||
|
||||
import { browser } from 'protractor';
|
||||
|
||||
/*
|
||||
Open the CoreAutomationService in ADF core to see where we augment the window
|
||||
*/
|
||||
export class LocalStorageUtil {
|
||||
static async getConfigField(field: string): Promise<any> {
|
||||
return browser.executeScript('return window.adf ? window.adf.getConfigField(`' + field + '`) : null;');
|
||||
|
||||
Reference in New Issue
Block a user