From 7e727b30af58e67a6d459564e5c1fda7f7856273 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Tue, 25 Feb 2025 13:03:45 +0100 Subject: [PATCH] fix(files_external): Move definition parameter to the correct place Signed-off-by: provokateurin --- .../lib/Lib/Auth/Password/LoginCredentials.php | 3 +++ .../lib/Lib/Auth/Password/SessionCredentials.php | 6 +++++- apps/files_external/lib/Lib/Backend/OwnCloud.php | 3 --- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php index e6c2be70056f9..4a8264f82f888 100644 --- a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php +++ b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php @@ -28,6 +28,7 @@ namespace OCA\Files_External\Lib\Auth\Password; use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; use OCA\Files_External\Lib\StorageConfig; use OCA\Files_External\Listener\StorePasswordListener; @@ -79,6 +80,8 @@ public function __construct( ->setScheme(self::SCHEME_PASSWORD) ->setText($l->t('Log-in credentials, save in database')) ->addParameters([ + (new DefinitionParameter('password', $l->t('Password'))) + ->setType(DefinitionParameter::VALUE_PASSWORD), ]); $eventDispatcher->addServiceListener(UserLoggedInEvent::class, StorePasswordListener::class); diff --git a/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php b/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php index 228366db20438..ea14a282e3d4d 100644 --- a/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php +++ b/apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php @@ -24,6 +24,7 @@ namespace OCA\Files_External\Lib\Auth\Password; use OCA\Files_External\Lib\Auth\AuthMechanism; +use OCA\Files_External\Lib\DefinitionParameter; use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; use OCA\Files_External\Lib\SessionStorageWrapper; use OCA\Files_External\Lib\StorageConfig; @@ -48,7 +49,10 @@ public function __construct(IL10N $l, CredentialsStore $credentialsStore) { $this->setIdentifier('password::sessioncredentials') ->setScheme(self::SCHEME_PASSWORD) ->setText($l->t('Log-in credentials, save in session')) - ->addParameters([]); + ->addParameters([ + (new DefinitionParameter('password', $l->t('Password'))) + ->setType(DefinitionParameter::VALUE_PASSWORD), + ]); } public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { diff --git a/apps/files_external/lib/Lib/Backend/OwnCloud.php b/apps/files_external/lib/Lib/Backend/OwnCloud.php index 643322b9fa68d..97297b6a977f7 100644 --- a/apps/files_external/lib/Lib/Backend/OwnCloud.php +++ b/apps/files_external/lib/Lib/Backend/OwnCloud.php @@ -43,9 +43,6 @@ public function __construct(IL10N $l, Password $legacyAuth) { (new DefinitionParameter('secure', $l->t('Secure https://'))) ->setType(DefinitionParameter::VALUE_BOOLEAN) ->setDefaultValue(true), - (new DefinitionParameter('password', $l->t('Password'))) - ->setFlag(DefinitionParameter::FLAG_OPTIONAL) - ->setType(DefinitionParameter::VALUE_PASSWORD), ]) ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) ->setLegacyAuthMechanism($legacyAuth)