Revert "Merge pull request #7314 from LibreSign/feat/policy-signature-flow-phase1-groundwork"

This reverts commit 5405914, reversing
changes made to 7005206.

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

Author: vitormattos

composer.lock

@@ -96,12 +96,6 @@ protected function configure(): void {
 				mode: InputOption::VALUE_NONE,
 				description: 'Reset config'
 			)
-			->addOption(
-				name: 'policy',
-				shortcut: null,
-				mode: InputOption::VALUE_NONE,
-				description: 'Reset policy data'
-			)
 		;
 	}
 
@@ -146,10 +140,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$this->resetConfig();
 				$ok = true;
 			}
-			if ($input->getOption('policy') || $all) {
-				$this->resetPolicy();
-				$ok = true;
-			}
 		} catch (\Exception $e) {
 			$this->logger->error($e->getMessage());
 			throw $e;
@@ -264,17 +254,4 @@ private function resetConfig(): void {
 		} catch (\Throwable) {
 		}
 	}
-
-	private function resetPolicy(): void {
-		try {
-			$delete = $this->db->getQueryBuilder();
-			$delete->delete('libresign_permission_set_binding')
-				->executeStatement();
-
-			$delete = $this->db->getQueryBuilder();
-			$delete->delete('libresign_permission_set')
-				->executeStatement();
-		} catch (\Throwable) {
-		}
-	}
 }

lib/Command/Developer/Reset.php

@@ -24,7 +24,6 @@
 use OCA\Libresign\Service\IdentifyMethodService;
 use OCA\Libresign\Service\Install\ConfigureCheckService;
 use OCA\Libresign\Service\Install\InstallService;
-use OCA\Libresign\Service\Policy\PolicyService;
 use OCA\Libresign\Service\ReminderService;
 use OCA\Libresign\Service\SignatureBackgroundService;
 use OCA\Libresign\Service\SignatureTextService;
@@ -84,7 +83,6 @@ public function __construct(
 		private ReminderService $reminderService,
 		private FooterService $footerService,
 		private DocMdpConfigService $docMdpConfigService,
-		private PolicyService $policyService,
 		private IdentifyMethodService $identifyMethodService,
 		private FileMapper $fileMapper,
 	) {
@@ -976,21 +974,36 @@ private function saveOrDeleteConfig(string $key, ?string $value, string $default
 	#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/admin/signature-flow/config', requirements: ['apiVersion' => '(v1)'])]
 	public function setSignatureFlowConfig(bool $enabled, ?string $mode = null): DataResponse {
 		try {
-			if ($enabled && $mode === null) {
+			if (!$enabled) {
+				$this->appConfig->deleteKey(Application::APP_ID, 'signature_flow');
+				return new DataResponse([
+					'message' => $this->l10n->t('Settings saved'),
+				]);
+			}
+
+			if ($mode === null) {
 				return new DataResponse([
 					'error' => $this->l10n->t('Mode is required when signature flow is enabled.'),
 				], Http::STATUS_BAD_REQUEST);
 			}
 
-			$this->policyService->saveSystem('signature_flow', $enabled ? $mode : null);
+			try {
+				$signatureFlow = \OCA\Libresign\Enum\SignatureFlow::from($mode);
+			} catch (\ValueError) {
+				return new DataResponse([
+					'error' => $this->l10n->t('Invalid signature flow mode. Use "parallel" or "ordered_numeric".'),
+				], Http::STATUS_BAD_REQUEST);
+			}
+
+			$this->appConfig->setValueString(
+				Application::APP_ID,
+				'signature_flow',
+				$signatureFlow->value
+			);
 
 			return new DataResponse([
 				'message' => $this->l10n->t('Settings saved'),
 			]);
-		} catch (\InvalidArgumentException) {
-			return new DataResponse([
-				'error' => $this->l10n->t('Invalid signature flow mode. Use "parallel" or "ordered_numeric".'),
-			], Http::STATUS_BAD_REQUEST);
 		} catch (\Exception $e) {
 			return new DataResponse([
 				'error' => $e->getMessage(),

lib/Controller/AdminController.php

@@ -23,7 +23,6 @@
 use OCA\Libresign\Service\FileService;
 use OCA\Libresign\Service\IdentifyMethod\SignatureMethod\TokenService;
 use OCA\Libresign\Service\IdentifyMethodService;
-use OCA\Libresign\Service\Policy\PolicyService;
 use OCA\Libresign\Service\RequestSignatureService;
 use OCA\Libresign\Service\SessionService;
 use OCA\Libresign\Service\SignerElementsService;
@@ -59,7 +58,6 @@ public function __construct(
 		private AccountService $accountService,
 		protected SignFileService $signFileService,
 		protected RequestSignatureService $requestSignatureService,
-		private PolicyService $policyService,
 		private SignerElementsService $signerElementsService,
 		protected IL10N $l10n,
 		private IdentifyMethodService $identifyMethodService,
@@ -108,13 +106,7 @@ public function index(): TemplateResponse {
 
 		$this->provideSignerSignatues();
 		$this->initialState->provideInitialState('identify_methods', $this->identifyMethodService->getIdentifyMethodsSettings());
-		$resolvedPolicies = [];
-		foreach ($this->policyService->resolveKnownPolicies() as $policyKey => $resolvedPolicy) {
-			$resolvedPolicies[$policyKey] = $resolvedPolicy->toArray();
-		}
-		$this->initialState->provideInitialState('effective_policies', [
-			'policies' => $resolvedPolicies,
-		]);
+		$this->initialState->provideInitialState('signature_flow', $this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Enum\SignatureFlow::NONE->value));
 		$this->initialState->provideInitialState('docmdp_config', $this->docMdpConfigService->getConfig());
 		$this->initialState->provideInitialState('legal_information', $this->appConfig->getValueString(Application::APP_ID, 'legal_information'));