diff --git a/lib/Controller/IdDocsController.php b/lib/Controller/IdDocsController.php index da02aa49c4..644ed4f6c8 100644 --- a/lib/Controller/IdDocsController.php +++ b/lib/Controller/IdDocsController.php @@ -20,6 +20,7 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired; use OCP\AppFramework\Http\Attribute\NoCSRFRequired; use OCP\AppFramework\Http\Attribute\PublicPage; +use OCP\AppFramework\Http\Attribute\RequestHeader; use OCP\AppFramework\Http\DataResponse; use OCP\IL10N; use OCP\IRequest; @@ -62,6 +63,7 @@ public function __construct( #[AnonRateLimit(limit: 30, period: 60)] #[NoAdminRequired] #[NoCSRFRequired] + #[RequestHeader(name: 'libresign-sign-request-uuid', description: 'The UUID of the sign request, used to identify the request', indirect: true)] #[RequireSignRequestUuid(skipIfAuthenticated: true)] #[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/id-docs', requirements: ['apiVersion' => '(v1)'])] public function addFiles(array $files): DataResponse { @@ -111,6 +113,7 @@ public function addFiles(array $files): DataResponse { #[AnonRateLimit(limit: 30, period: 60)] #[NoAdminRequired] #[NoCSRFRequired] + #[RequestHeader(name: 'libresign-sign-request-uuid', description: 'The UUID of the sign request, used to identify the request', indirect: true)] #[RequireSignRequestUuid(skipIfAuthenticated: true)] #[ApiRoute(verb: 'DELETE', url: '/api/{apiVersion}/id-docs/{nodeId}', requirements: ['apiVersion' => '(v1)'])] public function delete(int $nodeId, ?string $uuid = null): DataResponse { @@ -150,6 +153,7 @@ public function delete(int $nodeId, ?string $uuid = null): DataResponse { #[PublicPage] #[AnonRateLimit(limit: 30, period: 60)] #[NoCSRFRequired] + #[RequestHeader(name: 'libresign-sign-request-uuid', description: 'The UUID of the sign request, used to identify the request', indirect: true)] #[RequireSignRequestUuid(skipIfAuthenticated: true)] #[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/id-docs', requirements: ['apiVersion' => '(v1)'])] public function listUnauthenticatedSignerDocuments( diff --git a/lib/Controller/SignFileController.php b/lib/Controller/SignFileController.php index aac6112b3c..430f12ab11 100644 --- a/lib/Controller/SignFileController.php +++ b/lib/Controller/SignFileController.php @@ -33,6 +33,7 @@ use OCP\AppFramework\Http\Attribute\NoCSRFRequired; use OCP\AppFramework\Http\Attribute\OpenAPI; use OCP\AppFramework\Http\Attribute\PublicPage; +use OCP\AppFramework\Http\Attribute\RequestHeader; use OCP\AppFramework\Http\DataResponse; use OCP\IL10N; use OCP\IRequest; @@ -327,6 +328,7 @@ public function requestCodeBySignerUuid(string $uuid, ?string $identifyMethod, ? #[RequireSigner] #[PublicPage] #[OpenAPI(tags: ['signing'])] + #[RequestHeader(name: 'libresign-sign-request-uuid', description: 'The UUID of the sign request, used to identify the request', indirect: true)] #[ApiRoute(verb: 'POST', url: '/api/{apiVersion}/sign/file_id/{fileId}/code', requirements: ['apiVersion' => '(v1)'])] public function requestCodeByFileId(int $fileId, ?string $identifyMethod, ?string $signMethod, ?string $identify): DataResponse { try { diff --git a/lib/Controller/SignatureElementsController.php b/lib/Controller/SignatureElementsController.php index 949b514f97..c5a30ea9ce 100644 --- a/lib/Controller/SignatureElementsController.php +++ b/lib/Controller/SignatureElementsController.php @@ -159,6 +159,7 @@ public function getSignatureElements(): DataResponse { #[NoAdminRequired] #[PublicPage] #[NoCSRFRequired] + #[RequestHeader(name: 'libresign-sign-request-uuid', description: 'The UUID of the sign request, used to identify the request', indirect: true)] #[RequireSignRequestUuid(skipIfAuthenticated: true)] #[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/signature/elements/preview/{nodeId}', requirements: ['apiVersion' => '(v1)'])] public function previewSignatureElement(int $nodeId) { @@ -239,6 +240,7 @@ public function getSignatureElement(int $nodeId): DataResponse { #[NoAdminRequired] #[PublicPage] #[NoCSRFRequired] + #[RequestHeader(name: 'libresign-sign-request-uuid', description: 'The UUID of the sign request, used to identify the request', indirect: true)] #[RequireSignRequestUuid(skipIfAuthenticated: true)] #[ApiRoute(verb: 'PATCH', url: '/api/{apiVersion}/signature/elements/{nodeId}', requirements: ['apiVersion' => '(v1)'])] public function patchSignatureElement(int $nodeId, string $type = '', array $file = []): DataResponse { @@ -295,6 +297,7 @@ public function patchSignatureElement(int $nodeId, string $type = '', array $fil #[NoAdminRequired] #[NoCSRFRequired] #[PublicPage] + #[RequestHeader(name: 'libresign-sign-request-uuid', description: 'The UUID of the sign request, used to identify the request', indirect: true)] #[RequireSignRequestUuid(skipIfAuthenticated: true)] #[ApiRoute(verb: 'DELETE', url: '/api/{apiVersion}/signature/elements/{nodeId}', requirements: ['apiVersion' => '(v1)'])] public function deleteSignatureElement(int $nodeId): DataResponse { diff --git a/src/tests/views/SignPDF/_partials/ModalVerificationCode.spec.ts b/src/tests/views/SignPDF/_partials/ModalVerificationCode.spec.ts index 60873e0c83..2f87a36606 100644 --- a/src/tests/views/SignPDF/_partials/ModalVerificationCode.spec.ts +++ b/src/tests/views/SignPDF/_partials/ModalVerificationCode.spec.ts @@ -530,6 +530,7 @@ describe('ModalVerificationCode requestCode route (#8365)', () => { signStore.document = { ...signStore.document, uuid: 'id-doc-file-uuid', + fileId: 42, signers: [{ me: false, sign_request_uuid: 'external-signer-uuid', email: 'external@example.com' }], settings: { isApprover: true }, } as typeof signStore.document @@ -549,6 +550,7 @@ describe('ModalVerificationCode requestCode route (#8365)', () => { signStore.document = { ...signStore.document, uuid: 'file-uuid', + fileId: 42, signers: [{ me: true, sign_request_uuid: 'my-signer-uuid' }], settings: { isApprover: false }, } as typeof signStore.document @@ -565,6 +567,7 @@ describe('ModalVerificationCode requestCode route (#8365)', () => { signStore.document = { ...signStore.document, uuid: 'file-uuid', + fileId: 42, signers: [{ me: true, sign_request_uuid: 'my-signer-uuid' }], settings: { isApprover: true }, } as typeof signStore.document @@ -575,4 +578,21 @@ describe('ModalVerificationCode requestCode route (#8365)', () => { const [url] = vi.mocked(axios.post).mock.calls[0] expect(url).toBe('/ocs/v2.php/apps/libresign/api/v1/sign/uuid/my-signer-uuid/code') }) + it('does not request a code with fileId alone when signer UUID is unavailable', async () => { + const signStore = useSignStore() + signStore.document = { + ...signStore.document, + fileId: 42, + uuid: 'file-uuid', + signers: [], + settings: { isApprover: false }, + } as typeof signStore.document + + const wrapper = mountToken() + await wrapper.vm.requestCode() + + expect(axios.post).not.toHaveBeenCalled() + expect(wrapper.vm.tokenRequested).toBe(false) + expect(wrapper.vm.loading).toBe(false) + }) }) diff --git a/src/views/SignPDF/_partials/ModalVerificationCode.vue b/src/views/SignPDF/_partials/ModalVerificationCode.vue index 45399870aa..66b7bf1a8c 100644 --- a/src/views/SignPDF/_partials/ModalVerificationCode.vue +++ b/src/views/SignPDF/_partials/ModalVerificationCode.vue @@ -147,7 +147,6 @@ import md5 from 'blueimp-md5' import axios from '@nextcloud/axios' import { showError } from '@nextcloud/dialogs' import { loadState } from '@nextcloud/initial-state' -import { generateOcsUrl } from '@nextcloud/router' import NcButton from '@nextcloud/vue/components/NcButton' import NcDialog from '@nextcloud/vue/components/NcDialog' @@ -387,21 +386,14 @@ async function requestCode() { signMethod: activeTokenMethod.value, } - if (signStore.document.fileId) { - await axios.post( - generateOcsUrl('/apps/libresign/api/v1/sign/file_id/{fileId}/code', { - fileId: signStore.document.fileId, - }), - params, - ) - } else { - // Same route/context decision as signing (Sign.vue). - const signRequestUuid = getSigningRouteUuid(signStore.document) - if (!signRequestUuid) { - throw new Error(t('libresign', 'Document not found')) - } - await axios.post(signStore.buildRequestCodeUrl(signRequestUuid), params) + // Resolve signer or approver context even when a fileId is available. + // Both verification code routes require a UUID in the signing middleware. + const signRequestUuid = getSigningRouteUuid(signStore.document) + if (!signRequestUuid) { + // TRANSLATORS Error when the document has no usable signing context. + throw new Error(t('libresign', 'Document not found')) } + await axios.post(signStore.buildRequestCodeUrl(signRequestUuid), params) if (props.mode === 'email') { signMethodsStore.setHasEmailConfirmCode(true)