hardcoded attribute name in getCredentials #2 register the moduleAttr…

…ibute config variable into Configuration.php
NIIF · Jan 15, 2018 · 4187863 · 4187863
1 parent af2ea95
commit 4187863
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -36,6 +36,9 @@ public function getConfigTreeBuilder()
                 ->scalarNode('usernameAttribute')
                     ->defaultValue('REMOTE_USER')
                 ->end()
+                ->scalarNode('moduleAttribute')
+                    ->defaultValue('HTTP_SHIB_APPLICATION_ID')
+                ->end()
             ->end()
         ;
 

diff --git a/Security/ShibbolethAuthenticator.php b/Security/ShibbolethAuthenticator.php
@@ -38,10 +38,7 @@ public function __construct($logger, $config, TokenStorage $tokenStorage, Router
     public function getCredentials(Request $request)
     {
         $this->logger->debug('[ShibbolethAuthenticator::getCredential]');
-        $shibbolethModuleAttribute = 'HTTP_SHIB_APPLICATION_ID';
-        if (array_key_exists('moduleAttribute', $this->config)) {
-            $shibbolethModuleAttribute = $this->config['moduleAttribute'];
-        };
+        $shibbolethModuleAttribute = $this->config['moduleAttribute'];
         if ($request->server->has($shibbolethModuleAttribute)) {
             // What you return here will be passed to getUser() as $credentials
             $username = $request->server->get($this->config['usernameAttribute']);