Merge pull request #2404 from LibreSign/bugfix/handle-pfx-password

Bugfix handle pfx password
LibreSign · Feb 29, 2024 · 2d42fd1 · 2d42fd1
2 parents 9f81702 + abc898b
commit 2d42fd1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php
@@ -478,6 +478,7 @@ public function updateSettings(?string $phone = null): JSONResponse {
 		);
 	}
 
+	#[NoAdminRequired]
 	public function deletePfx(): JSONResponse {
 		$this->accountService->deletePfx($this->userSession->getUser());
 		return new JSONResponse(

diff --git a/lib/Helper/ValidateHelper.php b/lib/Helper/ValidateHelper.php
@@ -732,7 +732,9 @@ public function validateCredentials(SignRequest $signRequest, ?IUser $user, stri
 			}
 		}
 		if (empty($identifyMethods)) {
-			$identifyMethod = $this->identifyMethodService->getInstanceOfIdentifyMethod($identifyMethodName, $identifyValue);
+			$identifyMethod = $this->identifyMethodService
+				->setCurrentIdentifyMethod()
+				->getInstanceOfIdentifyMethod($identifyMethodName, $identifyValue);
 		} else {
 			$identifyMethod = current($identifyMethods);
 		}

diff --git a/lib/Service/IdentifyMethodService.php b/lib/Service/IdentifyMethodService.php
@@ -142,19 +142,24 @@ private function isMandatoryMethod(string $methodName): bool {
 	public function getByUserData(array $data) {
 		$return = [];
 		foreach ($data as $method => $identifyValue) {
-			$this->currentIdentifyMethod = null;
+			$this->setCurrentIdentifyMethod();
 			$return[] = $this->getInstanceOfIdentifyMethod($method, $identifyValue);
 		}
 		return $return;
 	}
 
+	public function setCurrentIdentifyMethod(?IdentifyMethod $entity = null): self {
+		$this->currentIdentifyMethod = $entity;
+		return $this;
+	}
+
 	/**
 	 * @return array<string,array<IIdentifyMethod>>
 	 */
 	public function getIdentifyMethodsFromSignRequestId(int $signRequestId): array {
 		$entities = $this->identifyMethodMapper->getIdentifyMethodsFromSignRequestId($signRequestId);
 		foreach ($entities as $entity) {
-			$this->currentIdentifyMethod = $entity;
+			$this->setCurrentIdentifyMethod($entity);
 			$this->getInstanceOfIdentifyMethod(
 				$entity->getIdentifierKey(),
 				$entity->getIdentifierValue(),