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

[ADF-4259] ClientId shouldn't be in the config file (#4930)

Browse Source 
* add delete users missing in ps cloud e2e

* clientId use config param

* Update test.config.js
This commit is contained in:
Eugenio Romano
2019-07-13 16:16:40 +01:00
committed by GitHub
parent 098577f6e5
commit 5703c45ad8
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e2e/content-services/sso/sso-download-directive-component.e2e.ts
View File

@@ -55,7 +55,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
authType: 'OAUTH', authType: 'OAUTH',
oauth2: { oauth2: {
host: browser.params.testConfig.adf.hostSso, host: browser.params.testConfig.adf.hostSso,
clientId: 'alfresco', clientId: browser.params.config.oauth2.clientId,
scope: 'openid', scope: 'openid',
secret: '', secret: '',
implicitFlow: false, implicitFlow: false,
@@ -74,7 +74,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
describe('SSO in ADF using ACS and AIS, implicit flow set', () => { describe('SSO in ADF using ACS and AIS, implicit flow set', () => {
beforeAll(async (done) => { beforeAll(async (done) => {
const apiService = new ApiService('alfresco', browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, 'ECM'); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, 'ECM');
await apiService.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await apiService.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
identityService = new IdentityService(apiService); identityService = new IdentityService(apiService);
@@ -93,7 +93,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, browser.params.testConfig.adf.hostIdentity,
silentLogin, implicitFlow, 'alfresco'); silentLogin, implicitFlow, browser.params.config.oauth2.clientId);
loginSsoPage.clickOnSSOButton(); loginSsoPage.clickOnSSOButton();
loginSsoPage.loginSSOIdentityService(acsUser.id, acsUser.password); loginSsoPage.loginSSOIdentityService(acsUser.id, acsUser.password);

2
e2e/core/auth-guard/auth-guard-sso.e2e.ts
View File

@@ -28,7 +28,7 @@ describe('Auth Guard SSO', () => {
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, browser.params.testConfig.adf.hostIdentity,
false, true, 'alfresco'); false, true, browser.params.config.oauth2.clientId);
loginSSOPage.clickOnSSOButton(); loginSSOPage.clickOnSSOButton();
await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);

12
e2e/core/login/login-sso/login-sso.e2e.ts
View File

@@ -40,7 +40,7 @@ describe('Login component - SSO', () => {
it('[C261050] Should be possible login with SSO', () => { it('[C261050] Should be possible login with SSO', () => {
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco'); browser.params.testConfig.adf.hostIdentity, false, true, browser.params.config.oauth2.clientId);
loginSSOPage.clickOnSSOButton(); loginSSOPage.clickOnSSOButton();
loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
}); });
@@ -48,7 +48,7 @@ describe('Login component - SSO', () => {
it('[C280667] Should be redirect directly to keycloak without show the login page with silent login', () => { it('[C280667] Should be redirect directly to keycloak without show the login page with silent login', () => {
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, true, true, 'alfresco'); browser.params.testConfig.adf.hostIdentity, true, true, browser.params.config.oauth2.clientId);
loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
}); });
}); });
@@ -63,7 +63,7 @@ describe('Login component - SSO', () => {
it('[C299205] Should display the login error message when the SSO identity service is wrongly configured', () => { it('[C299205] Should display the login error message when the SSO identity service is wrongly configured', () => {
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
'http://aps22/auth/realms/alfresco', 'http://aps22/auth/realms/alfresco',
browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco'); browser.params.testConfig.adf.hostIdentity, false, true, browser.params.config.oauth2.clientId);
loginSSOPage.clickOnSSOButton(); loginSSOPage.clickOnSSOButton();
loginSSOPage.checkLoginErrorIsDisplayed(); loginSSOPage.checkLoginErrorIsDisplayed();
expect(loginSSOPage.getLoginErrorMessage()).toContain('SSO Authentication server unreachable'); expect(loginSSOPage.getLoginErrorMessage()).toContain('SSO Authentication server unreachable');
@@ -76,13 +76,13 @@ describe('Login component - SSO', () => {
implicitFlow = false; implicitFlow = false;
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco'); browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, browser.params.config.oauth2.clientId);
loginPage.waitForElements(); loginPage.waitForElements();
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, 'alfresco'); browser.params.testConfig.adf.hostIdentity, silentLogin, implicitFlow, browser.params.config.oauth2.clientId);
browser.ignoreSynchronization = true; browser.ignoreSynchronization = true;
loginPage.enterUsername(browser.params.testConfig.adf.adminEmail); loginPage.enterUsername(browser.params.testConfig.adf.adminEmail);
@@ -108,7 +108,7 @@ describe('Login component - SSO', () => {
it('[C280665] Should be possible change the logout redirect URL', () => { it('[C280665] Should be possible change the logout redirect URL', () => {
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, false, true, 'alfresco', '/login'); browser.params.testConfig.adf.hostIdentity, false, true, browser.params.config.oauth2.clientId, '/login');
loginSSOPage.clickOnSSOButton(); loginSSOPage.clickOnSSOButton();
loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
navigationBarPage.clickLogoutButton(); navigationBarPage.clickLogoutButton();

4
e2e/core/user-info-component-cloud.e2e.ts
View File

@@ -29,7 +29,7 @@ describe('User Info - SSO', () => {
let identityService: IdentityService; let identityService: IdentityService;
beforeAll(async (done) => { beforeAll(async (done) => {
const apiService = new ApiService('alfresco', browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, 'ECM'); const apiService = new ApiService(browser.params.config.oauth2.clientId, browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, 'ECM');
await apiService.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); await apiService.login(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword);
identityService = new IdentityService(apiService); identityService = new IdentityService(apiService);
@@ -38,7 +38,7 @@ describe('User Info - SSO', () => {
silentLogin = false; silentLogin = false;
settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url,
browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostSso,
browser.params.testConfig.adf.hostIdentity, silentLogin, true, 'alfresco'); browser.params.testConfig.adf.hostIdentity, silentLogin, true, browser.params.config.oauth2.clientId);
loginSSOPage.clickOnSSOButton(); loginSSOPage.clickOnSSOButton();

2
e2e/process-services-cloud/start-task-form-cloud.e2e.ts
View File

@@ -162,7 +162,7 @@ describe('Start Task Form', () => {
browser.params.config.bpmHost, browser.params.config.bpmHost,
browser.params.config.oauth2.host, browser.params.config.oauth2.host,
browser.params.config.identityHost, browser.params.config.identityHost,
'alfresco'); browser.params.config.oauth2.clientId);
loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password);
await LocalStorageUtil.setConfigField('adf-cloud-start-process', JSON.stringify(startProcessCloudConfig)); await LocalStorageUtil.setConfigField('adf-cloud-start-process', JSON.stringify(startProcessCloudConfig));
done(); done();

4
e2e/test.config.js
View File

@@ -22,7 +22,7 @@ const PROXY = process.env.PROXY_HOST_ADF;
const LOG = process.env.LOG; const LOG = process.env.LOG;
const BPM_HOST = process.env.URL_HOST_BPM_ADF || "bpm"; const BPM_HOST = process.env.URL_HOST_BPM_ADF || "bpm";
const OAUTH_HOST = process.env.URL_HOST_SSO_ADF || "keycloak"; const OAUTH_HOST = process.env.URL_HOST_SSO_ADF || "keycloak";
const OAUTH_CLIENDID = process.env.OAUTH_CLIENDID || "activiti"; const OAUTH_CLIENT_ID = process.env.OAUTH_CLIENDID || "alfresco";
const IDENTITY_HOST = process.env.URL_HOST_IDENTITY || "identity"; const IDENTITY_HOST = process.env.URL_HOST_IDENTITY || "identity";
const IDENTITY_ADMIN_EMAIL = process.env.IDENTITY_ADMIN_EMAIL || "defaultadmin"; const IDENTITY_ADMIN_EMAIL = process.env.IDENTITY_ADMIN_EMAIL || "defaultadmin";
@@ -39,7 +39,7 @@ const appConfig = {
"authType": "OAUTH", "authType": "OAUTH",
"oauth2": { "oauth2": {
"host": OAUTH_HOST, "host": OAUTH_HOST,
"clientId": OAUTH_CLIENDID, "clientId": OAUTH_CLIENT_ID,
"scope": "openid", "scope": "openid",
"secret": "", "secret": "",
"implicitFlow": true, "implicitFlow": true,