From 5703c45ad87b8f7e0e410abe432407c87a730e06 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Sat, 13 Jul 2019 16:16:40 +0100 Subject: [PATCH] [ADF-4259] ClientId shouldn't be in the config file (#4930) * add delete users missing in ps cloud e2e * clientId use config param * Update test.config.js --- .../sso/sso-download-directive-component.e2e.ts | 6 +++--- e2e/core/auth-guard/auth-guard-sso.e2e.ts | 2 +- e2e/core/login/login-sso/login-sso.e2e.ts | 12 ++++++------ e2e/core/user-info-component-cloud.e2e.ts | 4 ++-- .../start-task-form-cloud.e2e.ts | 2 +- e2e/test.config.js | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/e2e/content-services/sso/sso-download-directive-component.e2e.ts b/e2e/content-services/sso/sso-download-directive-component.e2e.ts index 661771acb5..4aa65f8de5 100644 --- a/e2e/content-services/sso/sso-download-directive-component.e2e.ts +++ b/e2e/content-services/sso/sso-download-directive-component.e2e.ts @@ -55,7 +55,7 @@ describe('SSO in ADF using ACS and AIS, Download Directive, Viewer, DocumentList authType: 'OAUTH', oauth2: { host: browser.params.testConfig.adf.hostSso, - clientId: 'alfresco', + clientId: browser.params.config.oauth2.clientId, scope: 'openid', secret: '', 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', () => { 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); 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, browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostIdentity, - silentLogin, implicitFlow, 'alfresco'); + silentLogin, implicitFlow, browser.params.config.oauth2.clientId); loginSsoPage.clickOnSSOButton(); loginSsoPage.loginSSOIdentityService(acsUser.id, acsUser.password); diff --git a/e2e/core/auth-guard/auth-guard-sso.e2e.ts b/e2e/core/auth-guard/auth-guard-sso.e2e.ts index 7118681d1a..042dd698d5 100644 --- a/e2e/core/auth-guard/auth-guard-sso.e2e.ts +++ b/e2e/core/auth-guard/auth-guard-sso.e2e.ts @@ -28,7 +28,7 @@ describe('Auth Guard SSO', () => { settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, browser.params.testConfig.adf.hostSso, browser.params.testConfig.adf.hostIdentity, - false, true, 'alfresco'); + false, true, browser.params.config.oauth2.clientId); loginSSOPage.clickOnSSOButton(); await loginSSOPage.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); diff --git a/e2e/core/login/login-sso/login-sso.e2e.ts b/e2e/core/login/login-sso/login-sso.e2e.ts index 3c4e0dfd75..0c06f1f72f 100644 --- a/e2e/core/login/login-sso/login-sso.e2e.ts +++ b/e2e/core/login/login-sso/login-sso.e2e.ts @@ -40,7 +40,7 @@ describe('Login component - SSO', () => { it('[C261050] Should be possible login with SSO', () => { settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, 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.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', () => { settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, 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); }); }); @@ -63,7 +63,7 @@ describe('Login component - SSO', () => { it('[C299205] Should display the login error message when the SSO identity service is wrongly configured', () => { settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, '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.checkLoginErrorIsDisplayed(); expect(loginSSOPage.getLoginErrorMessage()).toContain('SSO Authentication server unreachable'); @@ -76,13 +76,13 @@ describe('Login component - SSO', () => { implicitFlow = false; settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, 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(); settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, 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; 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', () => { settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, 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.loginSSOIdentityService(browser.params.testConfig.adf.adminEmail, browser.params.testConfig.adf.adminPassword); navigationBarPage.clickLogoutButton(); diff --git a/e2e/core/user-info-component-cloud.e2e.ts b/e2e/core/user-info-component-cloud.e2e.ts index c8687e098f..27c9559f73 100644 --- a/e2e/core/user-info-component-cloud.e2e.ts +++ b/e2e/core/user-info-component-cloud.e2e.ts @@ -29,7 +29,7 @@ describe('User Info - SSO', () => { let identityService: IdentityService; 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); identityService = new IdentityService(apiService); @@ -38,7 +38,7 @@ describe('User Info - SSO', () => { silentLogin = false; settingsPage.setProviderEcmSso(browser.params.testConfig.adf.url, 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(); diff --git a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts index b1596244e8..0a3e0e1071 100644 --- a/e2e/process-services-cloud/start-task-form-cloud.e2e.ts +++ b/e2e/process-services-cloud/start-task-form-cloud.e2e.ts @@ -162,7 +162,7 @@ describe('Start Task Form', () => { browser.params.config.bpmHost, browser.params.config.oauth2.host, browser.params.config.identityHost, - 'alfresco'); + browser.params.config.oauth2.clientId); loginSSOPage.loginSSOIdentityService(testUser.email, testUser.password); await LocalStorageUtil.setConfigField('adf-cloud-start-process', JSON.stringify(startProcessCloudConfig)); done(); diff --git a/e2e/test.config.js b/e2e/test.config.js index 9963110d73..1dd6dbc56f 100644 --- a/e2e/test.config.js +++ b/e2e/test.config.js @@ -22,7 +22,7 @@ const PROXY = process.env.PROXY_HOST_ADF; const LOG = process.env.LOG; const BPM_HOST = process.env.URL_HOST_BPM_ADF || "bpm"; 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_ADMIN_EMAIL = process.env.IDENTITY_ADMIN_EMAIL || "defaultadmin"; @@ -39,7 +39,7 @@ const appConfig = { "authType": "OAUTH", "oauth2": { "host": OAUTH_HOST, - "clientId": OAUTH_CLIENDID, + "clientId": OAUTH_CLIENT_ID, "scope": "openid", "secret": "", "implicitFlow": true,