Merge pull request #4 from xima-media/optional-configuration

Make extended OAuth configuration optional
xima-media · May 5, 2023 · ed8c652 · ed8c652
2 parents 01f9fb1 + fd37f3c
commit ed8c652
Show file tree

Hide file tree

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

diff --git a/Classes/EventListener/FrontendUserLookup.php b/Classes/EventListener/FrontendUserLookup.php
@@ -4,6 +4,8 @@
 
 use League\OAuth2\Client\Provider\ResourceOwnerInterface;
 use Psr\Log\LoggerInterface;
+use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationExtensionNotConfiguredException;
+use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Exception\SiteNotFoundException;
 use TYPO3\CMS\Core\Site\Entity\Site;
@@ -29,9 +31,13 @@ public function __invoke(FrontendUserLookupEvent $event): void
         }
 
         $providerId = $event->getProviderId();
-        $extendedProviderConfiguration = $this->extensionConfiguration->get('xima_oauth2_extended', $providerId) ?? [];
-        $resolverClass = $extendedProviderConfiguration['resolverClassName'] ?? '';
+        try {
+            $extendedProviderConfiguration = $this->extensionConfiguration->get('xima-oauth2-extended', $providerId) ?? [];
+        } catch (ExtensionConfigurationPathDoesNotExistException|ExtensionConfigurationExtensionNotConfiguredException) {
+            return;
+        }
 
+        $resolverClass = $extendedProviderConfiguration['resolverClassName'] ?? '';
         if (!$resolverClass) {
             return;
         }