Use config array instead of object for Auth plugins

module/VuFind/src/VuFind/Auth/AbstractBase.php

@@ -70,7 +70,7 @@ abstract class AbstractBase implements
     /**
      * Configuration settings.
      *
-     * @var \VuFind\Config\Config
+     * @var array
      */
     protected $config = null;
 
@@ -101,7 +101,7 @@ abstract class AbstractBase implements
      * exception if the configuration is invalid.
      *
      * @throws AuthException
-     * @return \VuFind\Config\Config
+     * @return array
      */
     public function getConfig()
     {
@@ -145,7 +145,7 @@ public function clearLoginState()
     /**
      * Set configuration.
      *
-     * @param \VuFind\Config\Config $config Configuration to set
+     * @param array $config Configuration to set
      *
      * @return void
      */
@@ -450,9 +450,8 @@ public function getPolicyConfig(string $type): array
     {
         $policy = [];
         $config = $this->getConfig();
-        $authConfig = isset($config->Authentication)
-            ? $config->Authentication->toArray()
-            : [];
+        $authConfig = $config['Authentication']
+            ?? [];
         /* Map settings to the policy array, e.g.:
          *
          * password_minimum_length or username_minimum_length => minLength

module/VuFind/src/VuFind/Auth/AlmaDatabase.php

@@ -88,7 +88,7 @@ public function create($request)
     {
         // When in privacy mode, don't create an Alma account and delegate
         // further code execution to the parent.
-        if ($this->getConfig()->Authentication->privacy) {
+        if ($this->getConfig()['Authentication']['privacy']) {
             return parent::create($request);
         }
 

module/VuFind/src/VuFind/Auth/AuthInterface.php

@@ -71,7 +71,7 @@ public function clearLoginState();
     /**
      * Set configuration.
      *
-     * @param \VuFind\Config\Config $config Configuration to set
+     * @param array $config Configuration to set
      *
      * @return void
      */

module/VuFind/src/VuFind/Auth/ChoiceAuth.php

@@ -107,8 +107,8 @@ public function __construct(\Laminas\Session\Container $container)
     protected function validateConfig()
     {
         if (
-            !isset($this->config->ChoiceAuth->choice_order)
-            || !strlen($this->config->ChoiceAuth->choice_order)
+            !isset($this->config['ChoiceAuth']['choice_order'])
+            || !strlen($this->config['ChoiceAuth']['choice_order'])
         ) {
             throw new AuthException(
                 'One or more ChoiceAuth parameters are missing. ' .
@@ -120,7 +120,7 @@ protected function validateConfig()
     /**
      * Set configuration; throw an exception if it is invalid.
      *
-     * @param \VuFind\Config\Config $config Configuration to set
+     * @param $config Configuration to set
      *
      * @throws AuthException
      * @return void
@@ -130,7 +130,7 @@ public function setConfig($config)
         parent::setConfig($config);
         $this->strategies = array_map(
             'trim',
-            explode(',', $this->getConfig()->ChoiceAuth->choice_order)
+            explode(',', $this->getConfig()['ChoiceAuth']['choice_order'])
         );
     }
 

module/VuFind/src/VuFind/Auth/Manager.php

@@ -35,7 +35,6 @@
 use Lmc\Rbac\Identity\IdentityInterface;
 use Lmc\Rbac\Mvc\Identity\IdentityProviderInterface;
 use Psr\Log\LoggerAwareInterface;
-use VuFind\Config\Config;
 use VuFind\Cookie\CookieManager;
 use VuFind\Db\Entity\UserEntityInterface;
 use VuFind\Db\Service\AuditEventServiceInterface;
@@ -204,7 +203,7 @@ protected function makeAuth(string $method): AuthInterface
             throw new \Exception("Illegal authentication method: $method");
         }
         $auth = $this->pluginManager->get($method);
-        $auth->setConfig(new Config($this->config));
+        $auth->setConfig($this->config);
         return $auth;
     }
 

module/VuFind/src/VuFind/Auth/MultiAuth.php

@@ -115,7 +115,7 @@ class MultiAuth extends AbstractBase
      */
     protected function validateConfig()
     {
-        if (empty($this->config->MultiAuth->method_order)) {
+        if (empty($this->config['MultiAuth']['method_order'])) {
             throw new AuthException(
                 'One or more MultiAuth parameters are missing. ' .
                 'Check your config.ini!'
@@ -126,27 +126,27 @@ protected function validateConfig()
     /**
      * Set configuration; throw an exception if it is invalid.
      *
-     * @param \VuFind\Config\Config $config Configuration to set
+     * @param array $config Configuration to set
      *
      * @throws AuthException
      * @return void
      */
     public function setConfig($config)
     {
         parent::setConfig($config);
-        if (isset($config->MultiAuth->method_order)) {
+        if (isset($config['MultiAuth']['method_order'])) {
             $this->methods = array_map(
                 'trim',
-                explode(',', $config->MultiAuth->method_order)
+                explode(',', $config['MultiAuth']['method_order'])
             );
         }
         if (
-            isset($config->MultiAuth->filters)
-            && strlen($config->MultiAuth->filters)
+            isset($config['MultiAuth']['filters'])
+            && strlen($config['MultiAuth']['filters'])
         ) {
             $this->filters = array_map(
                 'trim',
-                explode(',', $config->MultiAuth->filters)
+                explode(',', $config['MultiAuth']['filters'])
             );
         }
     }

module/VuFind/src/VuFind/Auth/PasswordAccess.php

@@ -52,7 +52,7 @@ class PasswordAccess extends AbstractBase
      * exception if the configuration is invalid.
      *
      * @throws AuthException
-     * @return \VuFind\Config\Config
+     * @return array
      */
     public function getConfig()
     {
@@ -76,7 +76,7 @@ public function getConfig()
      */
     public function authenticate($request)
     {
-        $config = $this->getConfig()->toArray();
+        $config = $this->getConfig();
         $requestPassword = trim($request->getPost()->get('password', ''));
         foreach ($config['PasswordAccess']['access_user_hashed'] ?? [] as $username => $passwordHash) {
             if (password_verify($requestPassword, $passwordHash)) {

module/VuFind/src/VuFind/Auth/Shibboleth.php

@@ -116,17 +116,17 @@ public function __construct(
     /**
      * Set configuration.
      *
-     * @param \VuFind\Config\Config $config Configuration to set
+     * @param array $config Configuration to set
      *
      * @return void
      */
     public function setConfig($config)
     {
         parent::setConfig($config);
-        $this->useHeaders = $this->config->Shibboleth->use_headers ?? false;
-        $this->shibIdentityProvider = $this->config->Shibboleth->idpserverparam
+        $this->useHeaders = $this->config['Shibboleth']['use_headers'] ?? false;
+        $this->shibIdentityProvider = $this->config['Shibboleth']['idpserverparam']
             ?? self::DEFAULT_IDPSERVERPARAM;
-        $this->shibSessionId = $this->config->Shibboleth->session_id ?? null;
+        $this->shibSessionId = $this->config['Shibboleth']['session_id'] ?? null;
     }
 
     /**
@@ -140,8 +140,8 @@ public function setConfig($config)
     protected function validateConfig()
     {
         // Throw an exception if the required username setting is missing.
-        $shib = $this->config->Shibboleth;
-        if (!isset($shib->username) || empty($shib->username)) {
+        $shib = $this->config['Shibboleth'];
+        if (!isset($shib['username']) || empty([$shib['username']])) {
             throw new AuthException(
                 'Shibboleth username is missing in your configuration file.'
             );
@@ -239,17 +239,17 @@ public function authenticate($request)
     public function getSessionInitiator(string $target): ?string
     {
         $config = $this->getConfig();
-        $shibTarget = $config->Shibboleth->target ?? $target;
+        $shibTarget = $config['Shibboleth']['target'] ?? $target;
         $append = (str_contains($shibTarget, '?')) ? '&' : '?';
         // Adding the auth_method parameter makes it possible to handle logins when
         // using an auth method that proxies others.
-        $sessionInitiator = $config->Shibboleth->login
+        $sessionInitiator = $config['Shibboleth']['login']
             . '?target=' . urlencode($shibTarget)
             . urlencode($append . 'auth_method=Shibboleth');
 
-        if (isset($config->Shibboleth->provider_id)) {
+        if (isset($config['Shibboleth']['provider_id'])) {
             $sessionInitiator = $sessionInitiator . '&entityID=' .
-                urlencode($config->Shibboleth->provider_id);
+                urlencode($config['Shibboleth']['provider_id']);
         }
 
         return $sessionInitiator;
@@ -265,7 +265,7 @@ public function isExpired()
         $config = $this->getConfig();
         if (
             !isset($this->shibSessionId)
-            || !($config->Shibboleth->checkExpiredSession ?? true)
+            || !($config['Shibboleth']['checkExpiredSession'] ?? true)
         ) {
             return false;
         }
@@ -284,9 +284,9 @@ public function getLogoutRedirectUrl(string $url): string
     {
         // If single log-out is enabled, use a special URL:
         $config = $this->getConfig();
-        if (!empty($config->Shibboleth->logout)) {
-            $append = (str_contains($config->Shibboleth->logout, '?')) ? '&' : '?';
-            $url = $config->Shibboleth->logout . $append . 'return=' . urlencode($url);
+        if (!empty($config['Shibboleth']['logout'])) {
+            $append = (str_contains($config['Shibboleth']['logout'], '?')) ? '&' : '?';
+            $url = $config['Shibboleth']['logout'] . $append . 'return=' . urlencode($url);
         }
 
         // Send back the redirect URL (possibly modified):