From f33eaa9301e99f34dc8c39a59e9ced6691415d3a Mon Sep 17 00:00:00 2001 From: Matt Glaman Date: Thu, 7 Dec 2023 15:14:50 -0600 Subject: [PATCH 1/3] feat(next): dynamic consumer paths Provides dynamic consumer paths from generated URL using Consumer collection route. fixes #615 --- modules/next/src/Controller/NextSiteEntityController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/next/src/Controller/NextSiteEntityController.php b/modules/next/src/Controller/NextSiteEntityController.php index 07fab5a7..e174419b 100644 --- a/modules/next/src/Controller/NextSiteEntityController.php +++ b/modules/next/src/Controller/NextSiteEntityController.php @@ -3,6 +3,7 @@ namespace Drupal\next\Controller; use Drupal\Core\Controller\ControllerBase; +use Drupal\Core\Url; use Drupal\next\Entity\NextSiteInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; @@ -56,10 +57,11 @@ public function environmentVariables(NextSiteInterface $next_site) { 'NEXT_IMAGE_DOMAIN' => $this->request->getHost(), ]; + $path = Url::fromRoute('entity.consumer.collection')->toString(); $variables += [ 'authentication_bearer' => '# Authentication', - 'DRUPAL_CLIENT_ID' => 'Retrieve this from /admin/config/services/consumer', - 'DRUPAL_CLIENT_SECRET' => 'Retrieve this from /admin/config/services/consumer', + 'DRUPAL_CLIENT_ID' => 'Retrieve this from ' . $path, + 'DRUPAL_CLIENT_SECRET' => 'Retrieve this from ' . $path, ]; if ($secret = $next_site->getPreviewSecret()) { From 13077a14f5d58a7ce5648a6020e668748b812007 Mon Sep 17 00:00:00 2001 From: Matt Glaman Date: Wed, 13 Dec 2023 13:31:39 -0600 Subject: [PATCH 2/3] fix(next): missing dependency in test fixes consumers dependency in test --- .../src/Kernel/Controller/NextSiteEntityControllerTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/next/tests/src/Kernel/Controller/NextSiteEntityControllerTest.php b/modules/next/tests/src/Kernel/Controller/NextSiteEntityControllerTest.php index b9c694e0..e063fdd6 100644 --- a/modules/next/tests/src/Kernel/Controller/NextSiteEntityControllerTest.php +++ b/modules/next/tests/src/Kernel/Controller/NextSiteEntityControllerTest.php @@ -18,7 +18,7 @@ class NextSiteEntityControllerTest extends KernelTestBase { /** * {@inheritdoc} */ - protected static $modules = ['next']; + protected static $modules = ['consumers', 'next']; /** * The next_site entity. From f8269a03e647f104a6eae84a288c02dcb64be5da Mon Sep 17 00:00:00 2001 From: Matt Glaman Date: Wed, 28 Feb 2024 09:29:55 -0600 Subject: [PATCH 3/3] fix(next): missing dependency in test adds consumers to require dev --- modules/next/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/next/composer.json b/modules/next/composer.json index 48cea01e..1c6574a0 100644 --- a/modules/next/composer.json +++ b/modules/next/composer.json @@ -18,6 +18,7 @@ "drupal/subrequests": "^3.0" }, "require-dev": { + "drupal/consumers": "^1.0", "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0" } }