Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Controller/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -908,15 +908,15 @@ public function footerTemplatePreviewPdf(string $template = '', int $width = 595
#[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/admin/signature-flow/config', requirements: ['apiVersion' => '(v1)'])]
public function setSignatureFlowConfig(string $mode): DataResponse {
try {
$signatureFlow = \OCA\Libresign\Service\SignatureFlow::from($mode);
$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);
}

try {
if ($signatureFlow === \OCA\Libresign\Service\SignatureFlow::PARALLEL) {
if ($signatureFlow === \OCA\Libresign\Enum\SignatureFlow::PARALLEL) {
$this->appConfig->deleteKey(Application::APP_ID, 'signature_flow');
} else {
$this->appConfig->setValueString(
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/PageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function index(): TemplateResponse {

$this->provideSignerSignatues();
$this->initialState->provideInitialState('identify_methods', $this->identifyMethodService->getIdentifyMethodsSettings());
$this->initialState->provideInitialState('signature_flow', $this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Service\SignatureFlow::PARALLEL->value));
$this->initialState->provideInitialState('signature_flow', $this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Enum\SignatureFlow::PARALLEL->value));
$this->initialState->provideInitialState('legal_information', $this->appConfig->getValueString(Application::APP_ID, 'legal_information'));

Util::addScript(Application::APP_ID, 'libresign-main');
Expand Down
1 change: 1 addition & 0 deletions lib/Db/SignRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace OCA\Libresign\Db;

use OCA\Libresign\Enum\SignRequestStatus;
use OCP\AppFramework\Db\Entity;
use OCP\DB\Types;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Libresign\Db;
namespace OCA\Libresign\Enum;

enum SignRequestStatus: int {
case DRAFT = 0;
Expand Down
3 changes: 2 additions & 1 deletion lib/Service/SignatureFlow.php → lib/Enum/SignatureFlow.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2025 LibreCode coop and contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Libresign\Service;
namespace OCA\Libresign\Enum;

/**
* Signature flow modes
Expand Down
2 changes: 1 addition & 1 deletion lib/Files/TemplateLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function handle(Event $event): void {

$this->initialState->provideInitialState(
'signature_flow',
$this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Service\SignatureFlow::PARALLEL->value)
$this->appConfig->getValueString(Application::APP_ID, 'signature_flow', \OCA\Libresign\Enum\SignatureFlow::PARALLEL->value)
);

try {
Expand Down
4 changes: 2 additions & 2 deletions lib/Helper/ValidateHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -720,14 +720,14 @@ private function validateSignerStatus(string $uuid): void {
$signRequest = $this->signRequestMapper->getByUuid($uuid);
$status = $signRequest->getStatusEnum();

if ($status === \OCA\Libresign\Db\SignRequestStatus::DRAFT) {
if ($status === \OCA\Libresign\Enum\SignRequestStatus::DRAFT) {
throw new LibresignException(json_encode([
'action' => JSActions::ACTION_DO_NOTHING,
'errors' => [['message' => $this->l10n->t('You are not allowed to sign this document yet')]],
]));
}

if ($status === \OCA\Libresign\Db\SignRequestStatus::SIGNED) {
if ($status === \OCA\Libresign\Enum\SignRequestStatus::SIGNED) {
throw new LibresignException(json_encode([
'action' => JSActions::ACTION_DO_NOTHING,
'errors' => [['message' => $this->l10n->t('Document already signed')]],
Expand Down
12 changes: 6 additions & 6 deletions lib/Service/RequestSignatureService.php
Original file line number Diff line number Diff line change
Expand Up @@ -267,14 +267,14 @@ private function associateToSigner(
$isNewSignRequest = !$signRequest->getId();
$currentStatus = $signRequest->getStatusEnum();

if ($isNewSignRequest || $currentStatus === \OCA\Libresign\Db\SignRequestStatus::DRAFT) {
if ($isNewSignRequest || $currentStatus === \OCA\Libresign\Enum\SignRequestStatus::DRAFT) {
$initialStatus = $this->determineInitialStatus($signingOrder);
$signRequest->setStatusEnum($initialStatus);
}

$this->saveSignRequest($signRequest);

$shouldNotify = $notify && $signRequest->getStatusEnum() === \OCA\Libresign\Db\SignRequestStatus::ABLE_TO_SIGN;
$shouldNotify = $notify && $signRequest->getStatusEnum() === \OCA\Libresign\Enum\SignRequestStatus::ABLE_TO_SIGN;

foreach ($identifyMethodsIncances as $identifyMethod) {
$identifyMethod->getEntity()->setSignRequestId($signRequest->getId());
Expand All @@ -284,14 +284,14 @@ private function associateToSigner(
return $signRequest;
}

private function determineInitialStatus(int $signingOrder): \OCA\Libresign\Db\SignRequestStatus {
private function determineInitialStatus(int $signingOrder): \OCA\Libresign\Enum\SignRequestStatus {
if (!$this->sequentialSigningService->isOrderedNumericFlow()) {
return \OCA\Libresign\Db\SignRequestStatus::ABLE_TO_SIGN;
return \OCA\Libresign\Enum\SignRequestStatus::ABLE_TO_SIGN;
}

return $signingOrder === 1
? \OCA\Libresign\Db\SignRequestStatus::ABLE_TO_SIGN
: \OCA\Libresign\Db\SignRequestStatus::DRAFT;
? \OCA\Libresign\Enum\SignRequestStatus::ABLE_TO_SIGN
: \OCA\Libresign\Enum\SignRequestStatus::DRAFT;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion lib/Service/SequentialSigningService.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

use OCA\Libresign\AppInfo\Application;
use OCA\Libresign\Db\SignRequestMapper;
use OCA\Libresign\Db\SignRequestStatus;
use OCA\Libresign\Enum\SignatureFlow;
use OCA\Libresign\Enum\SignRequestStatus;
use OCP\IAppConfig;

class SequentialSigningService {
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/SignFileService.php
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ protected function updateSignRequest(string $hash): void {
$lastSignedDate = $this->getEngine()->getLastSignedDate();
$this->signRequest->setSigned($lastSignedDate);
$this->signRequest->setSignedHash($hash);
$this->signRequest->setStatusEnum(\OCA\Libresign\Db\SignRequestStatus::SIGNED);
$this->signRequest->setStatusEnum(\OCA\Libresign\Enum\SignRequestStatus::SIGNED);

$this->signRequestMapper->update($this->signRequest);

Expand Down
2 changes: 1 addition & 1 deletion lib/Settings/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
namespace OCA\Libresign\Settings;

use OCA\Libresign\AppInfo\Application;
use OCA\Libresign\Enum\SignatureFlow;
use OCA\Libresign\Exception\LibresignException;
use OCA\Libresign\Handler\CertificateEngine\CertificateEngineFactory;
use OCA\Libresign\Service\CertificatePolicyService;
use OCA\Libresign\Service\DocMdpConfigService;
use OCA\Libresign\Service\FooterService;
use OCA\Libresign\Service\IdentifyMethodService;
use OCA\Libresign\Service\SignatureBackgroundService;
use OCA\Libresign\Service\SignatureFlow;
use OCA\Libresign\Service\SignatureTextService;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
Expand Down
Loading