fix: prevent load empty entity when have an entity

Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>

Author: vitormattos

lib/Service/IdentifyMethodService.php

@@ -75,6 +75,7 @@ public function getInstanceOfIdentifyMethod(string $name, ?string $identifyValue
 		if ($identifyValue && isset($this->identifyMethods[$name])) {
 			foreach ($this->identifyMethods[$name] as $identifyMethod) {
 				if ($identifyMethod->getEntity()->getIdentifierValue() === $identifyValue) {
+					$identifyValue = $this->mergeWithCurrentIdentifyMethod($identifyMethod);
 					return $identifyMethod;
 				}
 			}
@@ -95,6 +96,18 @@ public function getInstanceOfIdentifyMethod(string $name, ?string $identifyValue
 		return $identifyMethod;
 	}
 
+	private function mergeWithCurrentIdentifyMethod(IIdentifyMethod $identifyMethod): IIdentifyMethod {
+		if ($this->currentIdentifyMethod === null) {
+			return $identifyMethod;
+		}
+		if ($this->currentIdentifyMethod->getIdentifierKey() === $identifyMethod->getEntity()->getIdentifierKey()
+			&& $this->currentIdentifyMethod->getIdentifierValue() === $identifyMethod->getEntity()->getIdentifierValue()
+		) {
+			$identifyMethod->setEntity($this->currentIdentifyMethod);
+		}
+		return $identifyMethod;
+	}
+
 	private function getNewInstanceOfMethod(string $name): IIdentifyMethod {
 		$className = 'OCA\Libresign\Service\IdentifyMethod\\' . ucfirst($name);
 		if (!class_exists($className)) {