inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Removing implicitFlow in favor of codeFlow"

Browse Source 
This reverts commit 58951a77b8.
This commit is contained in:
VitoAlbano
2024-06-18 11:18:57 +01:00
parent 8db9934c9b
commit 0107b3b6fe
5 changed files with 59 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/testing/package.json
View File

@@ -11,7 +11,7 @@
"url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
},
"peerDependencies": {
"@alfresco/js-api": ">=7.9.0-0"
"@alfresco/js-api": ">=7.9.0"
},
"keywords": [
"testing",

30
lib/testing/src/lib/protractor/core/pages/settings.page.ts
View File

@@ -32,8 +32,8 @@ export class SettingsPage {
silentLoginToggleLabel = $(`${materialLocators.Slide.toggle.root}[formcontrolname="silentLogin"] label`);
silentLoginToggleElement = $(`${materialLocators.Slide.toggle.root}[formcontrolname="silentLogin"]`);
implicitFlowLabel = $(`${materialLocators.Slide.toggle.root}[formcontrolname="implicitFlow"] label`);
implicitFlowElement = $(`${materialLocators.Slide.toggle.root}[formcontrolname="implicitFlow"]`);
codeFlowElement = $(`${materialLocators.Slide.toggle.root}[formcontrolname="codeFlow"]`);
codeFlowLabel = $(`${materialLocators.Slide.toggle.root}[formcontrolname="codeFlow"] label`);
applyButton = $('button[data-automation-id="settings-apply-button"]');
providerDropdown = new DropdownPage($(`${materialLocators.Select.root}[id="adf-provider-selector"]`));
@@ -64,9 +64,10 @@ export class SettingsPage {
authHost,
identityHost,
silentLogin = true,
codeFlow = true,
implicitFlow = true,
clientId?: string,
logoutUrl: string = '/logout'
logoutUrl: string = '/logout',
codeFlow = true
) {
await this.goToSettingsPage();
await this.setProvider('ECM');
@@ -74,8 +75,9 @@ export class SettingsPage {
await this.setContentServicesURL(contentServiceURL);
await this.setAuthHost(authHost);
await this.setIdentityHost(identityHost);
await this.setCodeFlow(codeFlow);
await this.setSilentLogin(silentLogin);
await this.setImplicitFlow(implicitFlow);
await this.setCodeFlow(codeFlow);
await this.setClientId(clientId);
await this.setLogoutUrl(logoutUrl);
await this.clickApply();
@@ -87,7 +89,7 @@ export class SettingsPage {
authHost,
identityHost,
silentLogin = true,
codeFlow = true,
implicitFlow = true,
clientId?: string,
logoutUrl: string = '/logout'
) {
@@ -97,8 +99,9 @@ export class SettingsPage {
await this.setContentServicesURL(contentServiceURL);
await this.setAuthHost(authHost);
await this.setIdentityHost(identityHost);
await this.setCodeFlow(codeFlow);
await this.setSilentLogin(silentLogin);
await this.setCodeFlow(false);
await this.setImplicitFlow(implicitFlow);
await this.setClientId(clientId);
await this.setLogoutUrl(logoutUrl);
await this.clickApply();
@@ -140,14 +143,23 @@ export class SettingsPage {
}
}
async setImplicitFlow(enableToggle) {
await BrowserVisibility.waitUntilElementIsVisible(this.implicitFlowElement);
const isChecked = (await BrowserActions.getAttribute(this.implicitFlowElement, 'class')).includes(materialLocators.Slide.toggle.checked);
if ((isChecked && !enableToggle) || (!isChecked && enableToggle)) {
await BrowserActions.click(this.implicitFlowLabel);
}
}
async setCodeFlow(enableToggle) {
await BrowserVisibility.waitUntilElementIsVisible(this.codeFlowElement);
const classElements = await BrowserActions.getAttribute(this.codeFlowElement, 'class');
const isChecked = classElements.includes(materialLocators.Slide.toggle.checked);
const isChecked = (await BrowserActions.getAttribute(this.codeFlowElement, 'class')).includes(materialLocators.Checked.root);
if ((isChecked && !enableToggle) || (!isChecked && enableToggle)) {
await BrowserActions.click(this.codeFlowLabel);
await BrowserActions.click(this.codeFlowElement);
}
}
}