fix: align footer policy reset behavior

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

lib/Handler/FooterHandler.php

@@ -129,6 +129,10 @@ public function setWriteQrcodeOnFooterOverride(?bool $value): self {
 		return $this;
 	}
 
+	public function getEffectiveFooterPolicyAsJson(): string {
+		return (string)$this->policyService->resolve(FooterPolicy::KEY, $this->requestPolicyOverrides)->getEffectiveValue();
+	}
+
 	/** @return array{enabled: bool, writeQrcodeOnFooter: bool, validationSite: string, customizeFooterTemplate: bool, footerTemplate: string, previewWidth: int, previewHeight: int, previewZoom: int} */
 	private function resolveFooterPolicy(): array {
 		return FooterPolicyValue::normalize(

lib/Service/FooterService.php

@@ -10,6 +10,8 @@
 
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Handler\FooterHandler;
+use OCA\Libresign\Service\Policy\Provider\Footer\FooterPolicy;
+use OCA\Libresign\Service\Policy\Provider\Footer\FooterPolicyValue;
 use OCP\IAppConfig;
 
 class FooterService {
@@ -20,34 +22,64 @@ public function __construct(
 	}
 
 	public function isDefaultTemplate(): bool {
-		$customTemplate = $this->appConfig->getValueString(Application::APP_ID, 'footer_template', '');
-		return empty($customTemplate);
+		$footerPolicy = $this->getEffectiveFooterPolicy();
+		return !$footerPolicy['customizeFooterTemplate'];
 	}
 
 	public function getTemplate(): string {
 		return $this->footerHandler->getTemplate();
 	}
 
 	public function saveTemplate(string $template = ''): void {
+		$currentPolicy = $this->getEffectiveFooterPolicy();
+		$defaultTemplateFromPolicy = $currentPolicy['footerTemplate'];
+
 		if (empty($template)) {
 			$this->appConfig->deleteKey(Application::APP_ID, 'footer_template');
+			$this->syncFooterPolicyTemplate('', false);
 			return;
 		}
 
-		if ($template === $this->footerHandler->getDefaultTemplate()) {
+		$isProvidedTemplateEqualsDefault = $template === $defaultTemplateFromPolicy;
+
+		if ($isProvidedTemplateEqualsDefault) {
 			$this->appConfig->deleteKey(Application::APP_ID, 'footer_template');
+			$this->syncFooterPolicyTemplate('', false);
 		} else {
 			$this->appConfig->setValueString(Application::APP_ID, 'footer_template', $template);
+			$this->syncFooterPolicyTemplate($template, true);
 		}
 	}
 
+	private function syncFooterPolicyTemplate(string $template, bool $customizeFooterTemplate): void {
+		$currentPolicy = $this->getEffectiveFooterPolicy();
+		$defaultTemplate = $currentPolicy['footerTemplate'];
+
+		$normalizedPolicy = FooterPolicyValue::normalize(
+			$this->appConfig->getValueString(Application::APP_ID, FooterPolicy::KEY, ''),
+			$defaultTemplate
+		);
+
+		$normalizedPolicy['customizeFooterTemplate'] = $customizeFooterTemplate;
+		$normalizedPolicy['footerTemplate'] = $customizeFooterTemplate ? $template : '';
+
+		$this->appConfig->setValueString(
+			Application::APP_ID,
+			FooterPolicy::KEY,
+			FooterPolicyValue::encode($normalizedPolicy)
+		);
+	}
+
+	private function getEffectiveFooterPolicy(): array {
+		$policyJson = $this->footerHandler->getEffectiveFooterPolicyAsJson();
+		return FooterPolicyValue::normalize($policyJson, '');
+	}
+
 	public function renderPreviewPdf(string $template = '', int $width = 595, int $height = 50, ?bool $writeQrcodeOnFooter = null): string {
 		if (!empty($template)) {
 			$this->saveTemplate($template);
 		}
 
-		// Generate a realistic UUID format for preview (36 chars with hyphens, same as real UUIDs)
-		// This ensures QR code size matches the final document
 		$previewUuid = sprintf(
 			'preview-%04x-%04x-%04x-%012x',
 			random_int(0, 0xffff),

lib/Service/IdentifyMethod/TwofactorGateway.php

@@ -18,6 +18,7 @@
 use OCP\IUserSession;
 use OCP\Server;
 use Psr\Log\LoggerInterface;
+use Throwable;
 
 class TwofactorGateway extends AbstractIdentifyMethod {
 	public function __construct(
@@ -67,8 +68,17 @@ public function isTwofactorGatewayEnabled(): bool {
 
 		$gatewayName = $this->getGatewayName();
 
-		$gateway = $gatewayFactory->get($gatewayName);
-		return $gateway->isComplete();
+		try {
+			$gateway = $gatewayFactory->get($gatewayName);
+			return $gateway->isComplete();
+		} catch (Throwable $exception) {
+			$this->logger->warning('Unable to load twofactor gateway provider.', [
+				'gateway' => $gatewayName,
+				'identifyMethod' => $this->getId(),
+				'exception' => $exception,
+			]);
+			return false;
+		}
 	}
 
 	private function getGatewayName(): string {