[ACA-4715] upgrade to latest ADF alphas and cleanup env vars (#3312)

* use latest ADF alphas

* use latest ADF alphas

* use ECM provider by default

* use BASIC auth by default

* defaults for oauth host

* remove unused vars

.github/actions/run-e2e-playwright/action.yml

@@ -26,9 +26,6 @@ runs:
 
         {
           echo "APP_CONFIG_ECM_HOST={protocol}//{hostname}{:port}"
-          echo "APP_CONFIG_PROVIDER=ECM"
-          echo "APP_CONFIG_AUTH_TYPE=BASIC"
-          echo "APP_CONFIG_OAUTH2_HOST=http://localhost:4200/auth/realms/alfresco"
         } >> .env
 
         npm start > /dev/null &\

.github/actions/run-e2e/action.yml

@@ -27,9 +27,6 @@ runs:
 
         {
           echo "APP_CONFIG_ECM_HOST={protocol}//{hostname}{:port}"
-          echo "APP_CONFIG_PROVIDER=ECM"
-          echo "APP_CONFIG_AUTH_TYPE=BASIC"
-          echo "APP_CONFIG_OAUTH2_HOST=http://localhost:4200/auth/realms/alfresco"
         } >> .env
 
         npm start > /dev/null &\

.github/workflows/pull-request.yml

@@ -25,9 +25,6 @@ env:
   SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD}}
   AWS_REGION: "eu-west-2"
   CONTENT_CE_DIST_PATH: "./dist/content-ce"
-  APP_CONFIG_PROVIDER: ECM
-  APP_CONFIG_AUTH_TYPE: BASIC
-  APP_CONFIG_OAUTH2_HOST: http://localhost:4200/auth/realms/alfresco
   PLAYWRIGHT_E2E_HOST: ${{ secrets.PLAYWRIGHT_E2E_HOST }}
   GH_BUILD_NUMBER: ${{ github.run_id }}
   MAXINSTANCES: 2

.github/workflows/release.yml

@@ -19,9 +19,6 @@ env:
   ADMIN_PASSWORD: ${{ secrets.PIPELINE_ADMIN_PASSWORD }}
   AWS_REGION: "eu-west-2"
   CONTENT_CE_DIST_PATH: "./dist/content-ce"
-  APP_CONFIG_PROVIDER: ECM
-  APP_CONFIG_AUTH_TYPE: BASIC
-  APP_CONFIG_OAUTH2_HOST: http://localhost:4200/auth/realms/alfresco
   PLAYWRIGHT_E2E_HOST: ${{ secrets.PLAYWRIGHT_E2E_HOST }}
   NPM_REGISTRY_ADDRESS: ${{ secrets.NPM_REGISTRY_ADDRESS }}
 

Dockerfile

@@ -17,13 +17,7 @@ RUN apk update && apk upgrade
 USER 101
 
 ARG PROJECT_NAME
-ARG PROVIDER="ECM"
-ARG AUTH_TYPE="BASIC"
 
-ENV APP_CONFIG_PROVIDER=$PROVIDER
-ENV APP_CONFIG_AUTH_TYPE=$AUTH_TYPE
-
-ENV APP_CONFIG_OAUTH2_HOST="{protocol}//{hostname}{:port}/auth/realms/alfresco"
 ENV APP_CONFIG_BPM_HOST="{protocol}//{hostname}{:port}"
 ENV APP_CONFIG_ECM_HOST="{protocol}//{hostname}{:port}"
 

README.md

@@ -26,9 +26,6 @@ Create an `.env` file in the project root folder with the following content
 
 ```yml
 APP_CONFIG_ECM_HOST="<URL>"
-APP_CONFIG_PROVIDER=ECM
-APP_CONFIG_AUTH_TYPE=BASIC
-APP_CONFIG_OAUTH2_HOST=http://localhost:4200/auth/realms/alfresco
 ```
 
 Where `<URL>` is the address of the ACS.

app/src/app.config.json.tpl

@@ -3,8 +3,8 @@
   "ecmHost": "${APP_CONFIG_ECM_HOST}",
   "aosHost": "${APP_CONFIG_ECM_HOST}/alfresco/aos",
   "baseShareUrl": "${APP_CONFIG_ECM_HOST}/#/preview/s",
-  "providers": "${APP_CONFIG_PROVIDER}",
-  "authType": "${APP_CONFIG_AUTH_TYPE}",
+  "providers": "ECM",
+  "authType": "BASIC",
   "loginRoute": "login",
   "mobileAppSwitch": {
     "enabled": true
@@ -15,7 +15,7 @@
     "folderRules": true
   },
   "oauth2": {
-    "host": "${APP_CONFIG_OAUTH2_HOST}",
+    "host": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
     "clientId": "alfresco",
     "scope": "openid",
     "secret": "",

docker/run.sh

@@ -5,16 +5,8 @@ set -e
 eval ALL_ARGUMENTS=("BASE_PATH"
     "APP_BASE_SHARE_URL"
     "APP_CONFIG_IDENTITY_HOST"
-    "APP_CONFIG_OAUTH2_HOST"
     "APP_CONFIG_BPM_HOST"
     "APP_CONFIG_ECM_HOST"
-    "APP_CONFIG_AUTH_TYPE"
-    "APP_CONFIG_PROVIDER"
-    "APP_CONFIG_PLUGIN_MICROSOFT_ONLINE"
-    "APP_CONFIG_MICROSOFT_ONLINE_AUTHORITY"
-    "APP_CONFIG_MICROSOFT_ONLINE_CLIENTID"
-    "APP_CONFIG_MICROSOFT_ONLINE_OOI_URL"
-    "APP_CONFIG_MICROSOFT_ONLINE_REDIRECT"
 )
 ALL_ARGUMENTS_LENGTH=${#ALL_ARGUMENTS[@]}
 DOCKER_ARGS=""

package.json

@@ -7,7 +7,7 @@
     "postinstall": "ngcc",
     "ng": "ng",
     "validate-app-config": "ajv validate -s ./node_modules/@alfresco/adf-core/app.config.schema.json -d ./app/.tmp/app.config.json --errors=text --verbose",
-    "assemble-app-config": "envsub --env-file ./.env --env APP_CONFIG_ECM_HOST={protocol}//{hostname}{:port} --env APP_CONFIG_PROVIDER=ECM --env APP_CONFIG_AUTH_TYPE=BASIC --env APP_CONFIG_OAUTH2_HOST=http://localhost:4200/auth/realms/alfresco --all ./app/src/app.config.json.tpl ./app/.tmp/app.config.json",
+    "assemble-app-config": "envsub --env-file ./.env --env APP_CONFIG_ECM_HOST={protocol}//{hostname}{:port} --all ./app/src/app.config.json.tpl ./app/.tmp/app.config.json",
     "prestart": "mkdir -p ./app/.tmp && npm run assemble-app-config && npm run validate-app-config",
     "start": "nx serve content-ce",
     "start:prod": "npm run validate-app-config && node --max-old-space-size=8192 nx serve content-ce --configuration production",
@@ -38,10 +38,10 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "6.2.0",
-    "@alfresco/adf-core": "6.2.0",
-    "@alfresco/adf-extensions": "6.2.0",
-    "@alfresco/eslint-plugin-eslint-angular": "6.2.0",
+    "@alfresco/adf-content-services": "6.3.0-5466178577",
+    "@alfresco/adf-core": "6.3.0-5466178577",
+    "@alfresco/adf-extensions": "6.3.0-5466178577",
+    "@alfresco/eslint-plugin-eslint-angular": "6.3.0-5466178577",
     "@alfresco/js-api": "6.2.0",
     "@angular/animations": "14.1.3",
     "@angular/cdk": "14.1.3",
@@ -73,8 +73,8 @@
     "zone.js": "0.11.8"
   },
   "devDependencies": {
-    "@alfresco/adf-cli": "6.2.0",
-    "@alfresco/adf-testing": "6.2.0",
+    "@alfresco/adf-cli": "6.3.0-5466178577",
+    "@alfresco/adf-testing": "6.3.0-5466178577",
     "@angular-devkit/build-angular": "14.2.11",
     "@angular-devkit/core": "14.1.2",
     "@angular-devkit/schematics": "14.1.2",

projects/aca-playwright-shared/src/api/api-client-factory.ts

@@ -50,10 +50,10 @@ export interface AcaBackend {
 }
 
 const config = {
-  authType: process.env.APP_CONFIG_AUTH_TYPE,
+  authType: 'BASIC',
   hostBpm: process.env.APP_CONFIG_BPM_HOST,
   hostEcm: process.env.APP_CONFIG_ECM_HOST,
-  provider: process.env.APP_CONFIG_PROVIDER,
+  provider: 'ECM',
   contextRoot: 'alfresco'
 };