From 3fd2f22fed5af0541cfac83522bb7c4b3a2402a7 Mon Sep 17 00:00:00 2001
From: Maurizio Vitale <maurizio.vitale@alfresco.com>
Date: Wed, 24 Feb 2021 13:38:58 +0000
Subject: [PATCH] Remove useless properties (#6462)

---
 lib/cli/scripts/init-aae-env.ts            | 8 ++------
 scripts/ci/check-env/check-ps-cloud-env.sh | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/cli/scripts/init-aae-env.ts b/lib/cli/scripts/init-aae-env.ts
index d239d2b30e..1f781d0723 100644
--- a/lib/cli/scripts/init-aae-env.ts
+++ b/lib/cli/scripts/init-aae-env.ts
@@ -40,7 +40,6 @@ export interface ConfigArgs {
     devopsPassword: string;
     clientId: string;
     host: string;
-    oauth: string;
     identityHost: boolean;
 }
 
@@ -226,11 +225,10 @@ function deploy(model: any) {
 function getAlfrescoJsApiInstance(configArgs: ConfigArgs) {
     const config = {
         provider: 'BPM',
-        hostEcm: `${configArgs.host}`,
         hostBpm: `${configArgs.host}`,
         authType: 'OAUTH',
         oauth2: {
-            host: `${configArgs.oauth}/auth/realms/alfresco`,
+            host: `${configArgs.host}/auth/realms/alfresco`,
             clientId: `${configArgs.clientId}`,
             scope: 'openid',
             secret: '',
@@ -422,10 +420,8 @@ async function main(configArgs: ConfigArgs) {
     program
         .version('0.1.0')
         .description('The following command is in charge of Initializing the activiti cloud env with the default apps' +
-            'adf-cli init-aae-env --host "gateway_env"  --oauth "identity_env" --modelerUsername "modelerusername" --modelerPassword "modelerpassword" --devopsUsername "devevopsusername" --devopsPassword "devopspassword"')
+            'adf-cli init-aae-env --host "gateway_env" --modelerUsername "modelerusername" --modelerPassword "modelerpassword" --devopsUsername "devevopsusername" --devopsPassword "devopspassword"')
         .option('-h, --host [type]', 'Host gateway')
-        .option('-o, --oauth [type]', 'Host sso server')
-        .option('-jsonAppsPath, --oauth [type]', 'Host sso server')
         .option('--clientId [type]', 'sso client')
         .option('--modelerUsername [type]', 'username of a user with role ACTIVIT_MODELER')
         .option('--modelerPassword [type]', 'modeler password')
diff --git a/scripts/ci/check-env/check-ps-cloud-env.sh b/scripts/ci/check-env/check-ps-cloud-env.sh
index a75c9bde0b..03f4ccb794 100755
--- a/scripts/ci/check-env/check-ps-cloud-env.sh
+++ b/scripts/ci/check-env/check-ps-cloud-env.sh
@@ -6,4 +6,4 @@ cd $DIR/../../../
 
 echo "====== Check PS Cloud UP ====="
 
-./node_modules/@alfresco/adf-cli/bin/adf-cli init-aae-env --host "$E2E_HOST" --oauth "$HOST_SSO" --modelerUsername "$E2E_MODELER_USERNAME" --modelerPassword "$E2E_MODELER_PASSWORD" --devopsUsername "$E2E_DEVOPS_USERNAME" --devopsPassword "$E2E_DEVOPS_PASSWORD" --clientId 'alfresco' || exit 1
+./node_modules/@alfresco/adf-cli/bin/adf-cli init-aae-env --host "$E2E_HOST" --modelerUsername "$E2E_MODELER_USERNAME" --modelerPassword "$E2E_MODELER_PASSWORD" --devopsUsername "$E2E_DEVOPS_USERNAME" --devopsPassword "$E2E_DEVOPS_PASSWORD" --clientId 'alfresco' || exit 1