chore: Set default signature method

Signed-off-by: Vitor Mattos <[email protected]>
LibreSign · Apr 12, 2024 · 0b0af10 · 0b0af10
1 parent d2a15ad
commit 0b0af10
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/lib/Service/IdentifyMethod/AbstractIdentifyMethod.php b/lib/Service/IdentifyMethod/AbstractIdentifyMethod.php
@@ -47,6 +47,7 @@ abstract class AbstractIdentifyMethod implements IIdentifyMethod {
 	 * @var string[]
 	 */
 	public array $availableSignatureMethods = [];
+	protected string $defaultSignatureMethod = '';
 	/**
 	 * @var AbstractSignatureMethod[]
 	 */
@@ -315,23 +316,17 @@ private function loadSavedSettings(): void {
 			}
 			return $carry;
 		}, []);
+		$enabled = false;
 		foreach ($this->availableSignatureMethods as $signatureMethodName) {
 			$this->signatureMethods[$signatureMethodName] =
 				$this->getEmptyInstanceOfSignatureMethodByName($signatureMethodName);
-		}
-		if (!isset($this->settings['signatureMethods']) || !is_array($this->settings['signatureMethods'])) {
-			return;
-		}
-		foreach ($this->settings['signatureMethods'] as $signatureMethodName => $settings) {
-			if (!in_array($signatureMethodName, $this->availableSignatureMethods)) {
-				unset($this->settings['signatureMethods'][$signatureMethodName]);
-				continue;
+			if (isset($this->settings[$signatureMethodName]['enabled']) && $this->settings[$signatureMethodName]['enabled']) {
+				$this->signatureMethods[$signatureMethodName]->enable();
+				$enabled = true;
 			}
-			$signatureMethod = $this->getEmptyInstanceOfSignatureMethodByName($signatureMethodName);
-			if (isset($settings['enabled']) && $settings['enabled']) {
-				$signatureMethod->enable();
-			}
-			$this->signatureMethods[$signatureMethodName] = $signatureMethod;
+		}
+		if (!$enabled && $this->defaultSignatureMethod) {
+			$this->signatureMethods[$this->defaultSignatureMethod]->enable();
 		}
 	}
 

diff --git a/lib/Service/IdentifyMethod/Account.php b/lib/Service/IdentifyMethod/Account.php
@@ -46,6 +46,7 @@ class Account extends AbstractIdentifyMethod {
 		ISignatureMethod::SIGNATURE_METHOD_EMAIL_TOKEN,
 		ISignatureMethod::SIGNATURE_METHOD_PASSWORD,
 	];
+	public string $defaultSignatureMethod = ISignatureMethod::SIGNATURE_METHOD_PASSWORD;
 	public function __construct(
 		protected IdentifyService $identifyService,
 		private IUserManager $userManager,

diff --git a/lib/Service/IdentifyMethod/Email.php b/lib/Service/IdentifyMethod/Email.php
@@ -40,6 +40,7 @@ class Email extends AbstractIdentifyMethod {
 		ISignatureMethod::SIGNATURE_METHOD_CLICK_TO_SIGN,
 		ISignatureMethod::SIGNATURE_METHOD_EMAIL_TOKEN,
 	];
+	public string $defaultSignatureMethod = ISignatureMethod::SIGNATURE_METHOD_EMAIL_TOKEN;
 	public function __construct(
 		protected IdentifyService $identifyService,
 		private IdentifyMethodMapper $identifyMethodMapper,