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/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/EmailAuthenticator.php

@@ -70,7 +70,7 @@ class EmailAuthenticator implements \VuFind\I18n\Translator\TranslatorAwareInter
      * @param \VuFind\Mailer\Mailer           $mailer          Mailer
      * @param PhpRenderer                     $viewRenderer    View Renderer
      * @param UserIpReader                    $userIpReader    User IP address reader
-     * @param \VuFind\Config\Config           $config          Configuration
+     * @param array                           $config          Configuration
      * @param AuthHashServiceInterface        $authHashService AuthHash database service
      */
     public function __construct(
@@ -79,7 +79,7 @@ public function __construct(
         protected \VuFind\Mailer\Mailer $mailer,
         protected PhpRenderer $viewRenderer,
         protected UserIpReader $userIpReader,
-        protected \VuFind\Config\Config $config,
+        protected array $config,
         protected AuthHashServiceInterface $authHashService
     ) {
     }
@@ -113,7 +113,7 @@ public function sendAuthenticationLink(
         $templateParams = []
     ) {
         // Make sure we've waited long enough
-        $recoveryInterval = $this->config->Authentication->recover_interval ?? 60;
+        $recoveryInterval = $this->config['Authentication']['recover_interval'] ?? 60;
         $sessionId = $this->sessionManager->getId();
 
         if (
@@ -145,7 +145,7 @@ public function sendAuthenticationLink(
         $viewParams['url'] = $serverHelper(
             $urlHelper($linkRoute, $routeParams, ['query' => $urlParams])
         );
-        $viewParams['title'] = $this->config->Site->title;
+        $viewParams['title'] = $this->config['Site']['title'];
 
         $message = $this->viewRenderer->render($template, $viewParams);
         $from = $this->getEmailSenderAddress($this->config, $email);
@@ -236,7 +236,7 @@ public function sendAuthenticationCode(
         $templateParams = []
     ): int {
         // Make sure we've waited long enough
-        $recoveryInterval = $this->config->Authentication->recover_interval ?? 60;
+        $recoveryInterval = $this->config['Authentication']['recover_interval'] ?? 60;
         $sessionId = $this->sessionManager->getId();
 
         if (
@@ -260,7 +260,7 @@ public function sendAuthenticationCode(
 
         $viewParams = $templateParams;
         $viewParams['code'] = $otp;
-        $viewParams['title'] = $this->config->Site->title ?? '';
+        $viewParams['title'] = $this->config['Site']['title'] ?? '';
 
         $message = $this->viewRenderer->render($template, $viewParams);
         $from = $this->getEmailSenderAddress($this->config, $email);
@@ -310,7 +310,7 @@ public function verifyAuthenticationCode(
             throw $e;
         }
         // Check the maximum attempt limit:
-        $maxAttempts = max($this->config->Authentication->otp_max_attempts ?? 3, 1);
+        $maxAttempts = max($this->config['Authentication']['otp_max_attempts'] ?? 3, 1);
         if ($attempts > $maxAttempts) {
             throw new AuthException('authentication_error_expired');
         }

module/VuFind/src/VuFind/Auth/EmailAuthenticatorFactory.php

@@ -73,7 +73,7 @@ public function __invoke(
             $container->get(\VuFind\Mailer\Mailer::class),
             $container->get('ViewRenderer'),
             $container->get(\VuFind\Net\UserIpReader::class),
-            $container->get(\VuFind\Config\ConfigManagerInterface::class)->getConfigObject('config'),
+            $container->get(\VuFind\Config\ConfigManagerInterface::class)->getConfigArray('config'),
             $container->get(\VuFind\Db\Service\PluginManager::class)
                 ->get(\VuFind\Db\Service\AuthHashServiceInterface::class)
         );

module/VuFind/src/VuFind/Auth/LoginTokenManager.php

@@ -36,7 +36,6 @@
 use Laminas\Session\SessionManager;
 use Laminas\View\Renderer\RendererInterface;
 use Psr\Log\LoggerAwareInterface;
-use VuFind\Config\Config;
 use VuFind\Config\Feature\EmailSettingsTrait;
 use VuFind\Cookie\CookieManager;
 use VuFind\Db\Entity\UserEntityInterface;
@@ -104,7 +103,7 @@ class LoginTokenManager implements LoggerAwareInterface, TranslatorAwareInterfac
     /**
      * LoginToken constructor.
      *
-     * @param Config                     $config            Configuration
+     * @param array                      $config            Configuration
      * @param UserServiceInterface       $userService       User database service
      * @param LoginTokenServiceInterface $loginTokenService Login Token database service
      * @param CookieManager              $cookieManager     Cookie manager
@@ -114,7 +113,7 @@ class LoginTokenManager implements LoggerAwareInterface, TranslatorAwareInterfac
      * @param callable                   $browscapCB        Callback for creating Browscap
      */
     public function __construct(
-        protected Config $config,
+        protected array $config,
         protected UserServiceInterface $userService,
         protected LoginTokenServiceInterface $loginTokenService,
         protected CookieManager $cookieManager,
@@ -273,7 +272,7 @@ public function deleteUserLoginTokens($userId)
      */
     public function getCookieLifetime(): int
     {
-        return (int)($this->config->Authentication->persistent_login_lifetime ?? 14);
+        return (int)($this->config['Authentication']['persistent_login_lifetime'] ?? 14);
     }
 
     /**
@@ -332,7 +331,7 @@ protected function createOrRotateToken(
         $userId = $user->getId();
         try {
             if ($series) {
-                $lenient = ($this->config->Authentication->lenient_token_rotation ?? true);
+                $lenient = ($this->config['Authentication']['lenient_token_rotation'] ?? true);
                 $this->loginTokenService->deleteBySeries($series, $lenient ? $currentTokenId : null);
                 $this->debug("Updating login token $token series $series for user {$userId}");
             } else {
@@ -364,16 +363,16 @@ protected function createOrRotateToken(
      */
     protected function sendLoginTokenWarningEmail(UserEntityInterface $user)
     {
-        if (!($this->config->Authentication->send_login_warnings ?? true)) {
+        if (!($this->config['Authentication']['send_login_warnings'] ?? true)) {
             return;
         }
-        $title = $this->config->Site->title ?? '';
+        $title = $this->config['Site']['title'] ?? '';
         if ($toAddr = $user->getEmail()) {
             $message = $this->viewRenderer->render(
                 'Email/login-warning.phtml',
                 compact('title')
             );
-            $subject = $this->config->Authentication->persistent_login_warning_email_subject
+            $subject = $this->config['Authentication']['persistent_login_warning_email_subject']
                 ?? 'persistent_login_warning_email_subject';
 
             try {

module/VuFind/src/VuFind/Auth/LoginTokenManagerFactory.php

@@ -82,7 +82,7 @@ public function __invoke(
 
         $dbServiceManager = $container->get(\VuFind\Db\Service\PluginManager::class);
         return new $requestedName(
-            $container->get(\VuFind\Config\ConfigManagerInterface::class)->getConfigObject('config'),
+            $container->get(\VuFind\Config\ConfigManagerInterface::class)->getConfigArray('config'),
             $dbServiceManager->get(UserServiceInterface::class),
             $dbServiceManager->get(LoginTokenServiceInterface::class),
             $container->get(\VuFind\Cookie\CookieManager::class),

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;
@@ -121,7 +120,7 @@ class Manager implements IdentityProviderInterface, LoggerAwareInterface
     /**
      * Constructor.
      *
-     * @param Config                          $config            VuFind configuration
+     * @param array                           $config            VuFind configuration
      * @param UserServiceInterface            $userService       User database service
      * @param UserSessionPersistenceInterface $userSession       User session persistence service
      * @param SessionManager                  $sessionManager    Session manager
@@ -134,7 +133,7 @@ class Manager implements IdentityProviderInterface, LoggerAwareInterface
      * @param AuditEventServiceInterface      $auditEventService Event database service
      */
     public function __construct(
-        protected Config $config,
+        protected array $config,
         protected UserServiceInterface $userService,
         protected UserSessionPersistenceInterface $userSession,
         protected SessionManager $sessionManager,
@@ -148,7 +147,7 @@ public function __construct(
     ) {
         // Initialize active authentication setting (defaulting to Database
         // if no setting passed in):
-        $method = $this->getPreAuthenticationData()['authMethod'] ?? $config->Authentication->method ?? 'Database';
+        $method = $this->getPreAuthenticationData()['authMethod'] ?? $config['Authentication']['method'] ?? 'Database';
         // Set the active authentication method and force it legal:
         $this->setAuthMethod($method, true);
     }
@@ -231,7 +230,7 @@ public function supportsCreation(?string $authMethod = null): bool
      */
     public function supportsRecovery(?string $authMethod = null, ?string $target = null): bool
     {
-        return ($this->config->Authentication->recover_password ?? false)
+        return ($this->config['Authentication']['recover_password'] ?? false)
             && $this->getAuth($authMethod)->supportsPasswordRecovery($target);
     }
 
@@ -269,7 +268,7 @@ public function getPasswordRecoveryData(array $params): ?array
      */
     public function supportsEmailChange(?string $authMethod = null): bool
     {
-        return $this->config->Authentication->change_email ?? false;
+        return $this->config['Authentication']['change_email'] ?? false;
     }
 
     /**
@@ -282,7 +281,7 @@ public function supportsEmailChange(?string $authMethod = null): bool
      */
     public function supportsPasswordChange(?string $authMethod = null): bool
     {
-        return ($this->config->Authentication->change_password ?? false)
+        return ($this->config['Authentication']['change_password'] ?? false)
             && $this->getAuth($authMethod)->supportsPasswordChange();
     }
 
@@ -296,7 +295,7 @@ public function supportsPasswordChange(?string $authMethod = null): bool
      */
     public function supportsConnectingLibraryCard(?string $authMethod = null): bool
     {
-        return ($this->config->Catalog->auth_based_library_cards ?? false)
+        return ($this->config['Catalog']['auth_based_library_cards'] ?? false)
             && $this->getAuth($authMethod)->supportsConnectingLibraryCard();
     }
 
@@ -309,10 +308,10 @@ public function supportsConnectingLibraryCard(?string $authMethod = null): bool
      */
     public function supportsPersistentLogin(?string $authMethod = null): bool
     {
-        if (!empty($this->config->Authentication->persistent_login)) {
+        if (!empty($this->config['Authentication']['persistent_login'])) {
             return in_array(
                 strtolower($authMethod ?? $this->getSelectedAuthMethod() ?? ''),
-                explode(',', strtolower($this->config->Authentication->persistent_login))
+                explode(',', strtolower($this->config['Authentication']['persistent_login']))
             );
         }
         return false;
@@ -325,7 +324,7 @@ public function supportsPersistentLogin(?string $authMethod = null): bool
      */
     public function getPersistentLoginLifetime(): int
     {
-        return $this->config->Authentication->persistent_login_lifetime ?? 14;
+        return $this->config['Authentication']['persistent_login_lifetime'] ?? 14;
     }
 
     /**
@@ -516,7 +515,7 @@ public function loginEnabled(): bool
     {
         if (null === $this->hideLogin) {
             // Assume login is enabled unless explicitly turned off:
-            $this->hideLogin = ($this->config->Authentication->hideLogin ?? false);
+            $this->hideLogin = ($this->config['Authentication']['hideLogin'] ?? false);
 
             if (!$this->hideLogin) {
                 try {
@@ -544,7 +543,7 @@ public function loginEnabled(): bool
     public function ajaxEnabled(): bool
     {
         // Assume ajax is enabled unless explicitly turned off:
-        return $this->config->Authentication->enableAjax ?? true;
+        return $this->config['Authentication']['enableAjax'] ?? true;
     }
 
     /**
@@ -555,7 +554,7 @@ public function ajaxEnabled(): bool
     public function dropdownEnabled(): bool
     {
         // Assume dropdown is disabled unless explicitly turned on:
-        return $this->config->Authentication->enableDropdown ?? false;
+        return $this->config['Authentication']['enableDropdown'] ?? false;
     }
 
     /**
@@ -740,7 +739,7 @@ public function checkForExpiredCredentials(): bool
      */
     public function inPrivacyMode(): bool
     {
-        return $this->config->Authentication->privacy ?? false;
+        return $this->config['Authentication']['privacy'] ?? false;
     }
 
     /**
@@ -838,7 +837,7 @@ public function updateEmail(UserEntityInterface $user, string $email): void
     {
         // Depending on verification setting, either do a direct update or else
         // put the new address into a pending state.
-        if ($this->config->Authentication->verify_email ?? false) {
+        if ($this->config['Authentication']['verify_email'] ?? false) {
             // If new email address is the current address, just reset any pending
             // email address:
             $user->setPendingEmail($email === $user->getEmail() ? '' : $email);
@@ -996,7 +995,7 @@ public function login(Request $request): ?UserEntityInterface
             // Attempt catalog login so that any bad credentials are cleared before further processing
             // (avoids e.g. multiple login attempts by account AJAX checks).
             if (
-                ($this->config->Catalog->checkILSCredentialsOnLogin ?? true)
+                ($this->config['Catalog']['checkILSCredentialsOnLogin'] ?? true)
                 && $this->ilsAuthenticator
                 && $this->allowsUserIlsLogin()
                 && ($catUsername = $user->getCatUsername())
@@ -1225,7 +1224,7 @@ protected function updateUser(UserEntityInterface $user, ?string $authMethod): v
      */
     public function allowsUserIlsLogin(): bool
     {
-        return $this->config->Catalog->allowUserLogin ?? true;
+        return $this->config['Catalog']['allowUserLogin'] ?? true;
     }
 
     /**

module/VuFind/src/VuFind/Auth/ManagerFactory.php

@@ -69,7 +69,7 @@ public function __invoke(
             throw new \Exception('Unexpected options passed to factory.');
         }
         // Load dependencies:
-        $config = $container->get(\VuFind\Config\ConfigManagerInterface::class)->getConfigObject('config');
+        $config = $container->get(\VuFind\Config\ConfigManagerInterface::class)->getConfigArray('config');
         $dbServiceManager = $container->get(\VuFind\Db\Service\PluginManager::class);
         $userService = $dbServiceManager->get(\VuFind\Db\Service\UserServiceInterface::class);
         $sessionManager = $container->get(\Laminas\Session\SessionManager::class);