fix: extension key in event listener

xima-media · May 5, 2023 · 3195ab1 · 3195ab1
1 parent ed8c652
commit 3195ab1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/Classes/EventListener/BackendUserLookup.php b/Classes/EventListener/BackendUserLookup.php
@@ -22,6 +22,8 @@ public function __construct(
     }
 
     /**
+     * @throws ExtensionConfigurationExtensionNotConfiguredException
+     * @throws ExtensionConfigurationPathDoesNotExistException
      * @throws IdentityResolverException
      */
     public function __invoke(BackendUserLookupEvent $event): void
@@ -31,13 +33,8 @@ public function __invoke(BackendUserLookupEvent $event): void
         }
 
         $providerId = $event->getProviderId();
-        try {
-            $extendedProviderConfiguration = $this->extensionConfiguration->get('xima-oauth2-extended', $providerId) ?? [];
-        } catch (ExtensionConfigurationPathDoesNotExistException|ExtensionConfigurationExtensionNotConfiguredException) {
-            return;
-        }
-
-        $resolverClass = $extendedProviderConfiguration['resolverClassName'] ?? '';
+        $extendedProviderConfiguration = $this->extensionConfiguration->get('xima_oauth2_extended', 'oauth2_client_providers') ?? [];
+        $resolverClass = $extendedProviderConfiguration[$providerId]['resolverClassName'] ?? '';
         if (!$resolverClass) {
             return;
         }

diff --git a/Classes/EventListener/FrontendUserLookup.php b/Classes/EventListener/FrontendUserLookup.php
@@ -24,20 +24,22 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @throws SiteNotFoundException
+     * @throws ExtensionConfigurationPathDoesNotExistException
+     * @throws IdentityResolverException
+     * @throws OAuth2ConfigurationException
+     * @throws ExtensionConfigurationExtensionNotConfiguredException
+     */
     public function __invoke(FrontendUserLookupEvent $event): void
     {
         if ($event->getTypo3User() !== null || !($event->getRemoteUser() instanceof ResourceOwnerInterface)) {
             return;
         }
 
         $providerId = $event->getProviderId();
-        try {
-            $extendedProviderConfiguration = $this->extensionConfiguration->get('xima-oauth2-extended', $providerId) ?? [];
-        } catch (ExtensionConfigurationPathDoesNotExistException|ExtensionConfigurationExtensionNotConfiguredException) {
-            return;
-        }
-
-        $resolverClass = $extendedProviderConfiguration['resolverClassName'] ?? '';
+        $extendedProviderConfiguration = $this->extensionConfiguration->get('xima_oauth2_extended', 'oauth2_client_providers') ?? [];
+        $resolverClass = $extendedProviderConfiguration[$providerId]['resolverClassName'] ?? '';
         if (!$resolverClass) {
             return;
         }