From ea9dd538688b081eec55527e255a8f5b3cb72fe4 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 14 Nov 2022 16:10:16 +0100
Subject: [PATCH] wip
---
src/DependencyInjection/Configuration.php | 10 ++++++++++
src/DependencyInjection/DbpRelayAuthExtension.php | 2 ++
2 files changed, 12 insertions(+)
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 36f7340..07ab3a0 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -46,17 +46,27 @@ class Configuration implements ConfigurationInterface
->example('mysecret')
->end()
+ // API Frontend (API docs etc)
+ ->scalarNode('frontend_client_id')
+ ->info('The client ID for the OIDC client (authorization code flow) used for API docs and other frontends provided by the API itself')
+ ->example('client-docs')
+ ->end()
+
+ // [DEPRECATED]
// API docs. This is still Keycloak specific because we only have a keycloak
// web component right now.
->scalarNode('frontend_keycloak_server')
+ ->setDeprecated('dbp/relay-auth-bundle', '0.1.12', 'No longer needed')
->info('The Keycloak server base URL')
->example('https://keycloak.example.com/auth')
->end()
->scalarNode('frontend_keycloak_realm')
+ ->setDeprecated('dbp/relay-auth-bundle', '0.1.12', 'No longer needed')
->info('The keycloak realm')
->example('client-docs')
->end()
->scalarNode('frontend_keycloak_client_id')
+ ->setDeprecated('dbp/relay-auth-bundle', '0.1.12', 'Use "frontend_client_id" instead')
->info('The ID for the keycloak client (authorization code flow) used for API docs or similar')
->example('client-docs')
->end()
diff --git a/src/DependencyInjection/DbpRelayAuthExtension.php b/src/DependencyInjection/DbpRelayAuthExtension.php
index 0b6e058..70ef15d 100644
--- a/src/DependencyInjection/DbpRelayAuthExtension.php
+++ b/src/DependencyInjection/DbpRelayAuthExtension.php
@@ -39,6 +39,8 @@ class DbpRelayAuthExtension extends ConfigurableExtension implements PrependExte
{
$config = $container->getExtensionConfig($this->getAlias())[0];
$this->extendArrayParameter($container, 'dbp_api.twig_globals', [
+ 'oicd_server_url' => $config['server_url'] ?? '',
+ 'oicd_frontend_client_id' => $config['frontend_client_id'] ?? '',
'keycloak_server_url' => $config['frontend_keycloak_server'] ?? '',
'keycloak_realm' => $config['frontend_keycloak_realm'] ?? '',
'keycloak_frontend_client_id' => $config['frontend_keycloak_client_id'] ?? '',
--
GitLab