diff --git a/composer.json b/composer.json index a56895bf033aa51fa215b627f03a8636f4392c67..88f9a3972cb12e92ac08579a6f2d05d5c6e05e3d 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "require": { "php": "^7.3", "brainmaestro/composer-git-hooks": "^2.8", - "dbp/relay-auth-bundle": "^0.1.2", + "dbp/relay-auth-bundle": "^0.1.3", "dbp/relay-core-bundle": "^0.1.10", "symfony/apache-pack": "^1.0", "symfony/console": "^5.2", diff --git a/composer.lock b/composer.lock index 85dd2b92fc7003327b45f0d7fce7c03fa2b6ab9b..492acda6ccae51f350c595ef53a5c0ea2b08f7cf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ebead725fb54071db3a8f299732686a9", + "content-hash": "60844e7ae0ebf06042359acf3c78fec6", "packages": [ { "name": "api-platform/core", @@ -300,11 +300,11 @@ }, { "name": "dbp/relay-auth-bundle", - "version": "v0.1.2", + "version": "v0.1.3", "source": { "type": "git", "url": "https://gitlab.tugraz.at/dbp/relay/dbp-relay-auth-bundle.git", - "reference": "3a0e46f0a5fa5dab921087dc422c86505af1d522" + "reference": "381e6cf2b36da9ecee190ddcfd1c3fd8cee7d5df" }, "require": { "dbp/relay-core-bundle": "^0.1.10", @@ -345,7 +345,7 @@ "license": [ "AGPL-3.0-or-later" ], - "time": "2021-10-07T13:49:32+00:00" + "time": "2021-10-12T14:16:29+00:00" }, { "name": "dbp/relay-core-bundle", diff --git a/config/packages/dbp_relay_auth.yaml b/config/packages/dbp_relay_auth.yaml index 590212cc40ddc581d9afe0f7f23611ed845a5e83..457663c45017e34619ca0278ab8935db55bcf960 100644 --- a/config/packages/dbp_relay_auth.yaml +++ b/config/packages/dbp_relay_auth.yaml @@ -1,8 +1,10 @@ dbp_relay_auth: - server_url: '%env(KEYCLOAK_SERVER_URL)%' - realm: '%env(KEYCLOAK_REALM)%' - remote_validation_client_id: '%env(KEYCLOAK_CLIENT_ID)%' - remote_validation_client_secret: '%env(KEYCLOAK_CLIENT_SECRET)%' - required_audience: '%env(KEYCLOAK_AUDIENCE)%' + server_url: '%env(KEYCLOAK_SERVER_URL)%/realms/%env(KEYCLOAK_REALM)%' + # Remote validation remote_validation: '%env(bool:KEYCLOAK_REMOTE_VALIDATION)%' - frontend_client_id: '%env(KEYCLOAK_FRONTEND_CLIENT_ID)%' + remote_validation_id: '%env(KEYCLOAK_CLIENT_ID)%' + remote_validation_secret: '%env(KEYCLOAK_CLIENT_SECRET)%' + # Frontend + frontend_keycloak_server: '%env(KEYCLOAK_SERVER_URL)%' + frontend_keycloak_realm: '%env(KEYCLOAK_REALM)%' + frontend_keycloak_client_id: '%env(KEYCLOAK_FRONTEND_CLIENT_ID)%'