diff --git a/docs/changelog.md b/docs/changelog.md index 09325a2..cd1d432 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,7 +2,21 @@ All notable changes to this project will be documented in this file. -## [2.1.9] - Current +## [2.1.10] - Current + +### Fixed + +- Errors logging in when using guest or keycloak auth providers + +### Changed + +- Removed app-auth and app-auth-integrations from NFS config, since newer versions are present in DPDY +- Added `auth-backend-module-guest-provider` config to guest auth +- Added `auth-backend-module-oidc-provider` config to keycloak auth +- Added `auth-backend-module-github-provider` config to github auth +- Added `signIn` to app-config for github auth + +## [2.1.9] ### Changed diff --git a/package.json b/package.json index 2c158d6..847bfee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@red-hat-developer-hub/e2e-test-utils", - "version": "2.1.9", + "version": "2.1.10", "description": "Test utilities for RHDH E2E tests", "license": "Apache-2.0", "repository": { diff --git a/src/deployment/rhdh/config/auth/github/app-config.yaml b/src/deployment/rhdh/config/auth/github/app-config.yaml index 552584c..7cba333 100644 --- a/src/deployment/rhdh/config/auth/github/app-config.yaml +++ b/src/deployment/rhdh/config/auth/github/app-config.yaml @@ -8,6 +8,9 @@ auth: clientSecret: ${GITHUB_OAUTH_APP_SECRET} clientId: ${GITHUB_OAUTH_APP_ID} callbackUrl: ${RHDH_BASE_URL}/api/auth/github/handler/frame + signIn: + resolvers: + - resolver: usernameMatchingUserEntityName signInPage: github catalog: locations: diff --git a/src/deployment/rhdh/config/auth/github/dynamic-plugins.yaml b/src/deployment/rhdh/config/auth/github/dynamic-plugins.yaml new file mode 100644 index 0000000..f027990 --- /dev/null +++ b/src/deployment/rhdh/config/auth/github/dynamic-plugins.yaml @@ -0,0 +1,3 @@ +plugins: + - package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-auth-backend-module-github-provider:bs_1.52.0__0.5.4" + enabled: true diff --git a/src/deployment/rhdh/config/auth/guest/dynamic-plugins.yaml b/src/deployment/rhdh/config/auth/guest/dynamic-plugins.yaml new file mode 100644 index 0000000..11ac87f --- /dev/null +++ b/src/deployment/rhdh/config/auth/guest/dynamic-plugins.yaml @@ -0,0 +1,3 @@ +plugins: + - package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-auth-backend-module-guest-provider:bs_1.52.0__0.2.20" + enabled: true diff --git a/src/deployment/rhdh/config/auth/keycloak/dynamic-plugins.yaml b/src/deployment/rhdh/config/auth/keycloak/dynamic-plugins.yaml index 92bb9ac..e24099a 100644 --- a/src/deployment/rhdh/config/auth/keycloak/dynamic-plugins.yaml +++ b/src/deployment/rhdh/config/auth/keycloak/dynamic-plugins.yaml @@ -18,3 +18,5 @@ plugins: seconds: 15 timeout: minutes: 1 + - package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-auth-backend-module-oidc-provider:bs_1.52.0__0.4.17" + enabled: true diff --git a/src/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml b/src/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml deleted file mode 100644 index 8f8957b..0000000 --- a/src/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml +++ /dev/null @@ -1,5 +0,0 @@ -plugins: - - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1 - disabled: false - - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-integrations:bs_1.49.4__0.0.1 - disabled: false diff --git a/src/deployment/rhdh/constants.ts b/src/deployment/rhdh/constants.ts index 8d1f316..a239e12 100644 --- a/src/deployment/rhdh/constants.ts +++ b/src/deployment/rhdh/constants.ts @@ -24,10 +24,7 @@ export const DEFAULT_CONFIG_PATHS = { PACKAGE_ROOT, "dist/deployment/rhdh/config/new-frontend-system/secrets.yaml", ), - dynamicPlugins: path.join( - PACKAGE_ROOT, - "dist/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml", - ), + dynamicPlugins: "", valueFile: path.join( PACKAGE_ROOT, "dist/deployment/rhdh/config/new-frontend-system/value_file.yaml", @@ -62,7 +59,10 @@ export const AUTH_CONFIG_PATHS: Record< "dist/deployment/rhdh/config/auth/guest/app-config.yaml", ), secrets: "", - dynamicPlugins: "", + dynamicPlugins: path.join( + PACKAGE_ROOT, + "dist/deployment/rhdh/config/auth/guest/dynamic-plugins.yaml", + ), }, keycloak: { appConfig: path.join( @@ -87,7 +87,10 @@ export const AUTH_CONFIG_PATHS: Record< PACKAGE_ROOT, "dist/deployment/rhdh/config/auth/github/secrets.yaml", ), - dynamicPlugins: "", + dynamicPlugins: path.join( + PACKAGE_ROOT, + "dist/deployment/rhdh/config/auth/github/dynamic-plugins.yaml", + ), mergeStrategy: { arrayMergeStrategy: { byKey: "target" } }, }, };