Merge pull request #19 from bookboon/hotfix/revert-some-last

fix: revert override for auth_uri
bookboon · Jun 27, 2022 · dfbc08f · dfbc08f
2 parents 9248881 + bfe849a
commit dfbc08f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Client/AccessTokenClient.php b/Client/AccessTokenClient.php
@@ -24,9 +24,9 @@ public function __construct(
         string $apiId,
         string $apiSecret,
         array $scopes,
-        string $authServiceUri,
         string $redirectUri,
         ?string $appUserId = null,
+        ?string $authServiceUri = null,
         ?LoggerInterface $logger = null,
         array $clientOptions = []
     ) {

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -16,14 +16,14 @@ public function getConfigTreeBuilder()
             ->children()
             ->scalarNode('id')->isRequired()->end()
             ->scalarNode('secret')->isRequired()->end()
-            ->scalarNode('auth_uri')->isRequired()->end()
             ->scalarNode('branding')->end()
             ->scalarNode('rotation')->end()
             ->scalarNode('currency')->end()
             ->scalarNode('impersonator_id')->defaultNull()->end()
             ->scalarNode('redirect')->defaultNull()->end()
             ->arrayNode('languages')->isRequired()->prototype('scalar')->end()->end()
             ->arrayNode('scopes')->isRequired()->prototype('scalar')->end()->end()
+            ->scalarNode('override_auth_uri')->defaultNull()->end()
             ->integerNode('premium_level')->end()
             ;
 

diff --git a/Helper/ConfigurationHolder.php b/Helper/ConfigurationHolder.php
@@ -62,8 +62,8 @@ public function getPremiumLevel(): ?string
         return $this->_config['premium_level'] ?? null;
     }
 
-    public function getAuthUri(): string
+    public function getOverrideAuthUri(): ?string
     {
-        return $this->_config['auth_uri'] ?? '';
+        return $this->_config['override_auth_uri'] ?? null;
     }
 }
diff --git a/Service/ApiFactory.php b/Service/ApiFactory.php
@@ -22,9 +22,9 @@ public static function createOauth(
             $config->getId(),
             $config->getSecret(),
             $config->getScopes(),
-            $config->getAuthUri(),
             '',
             null,
+            $config->getOverrideAuthUri(),
             $logger,
             ['handler' => $stack]
         );