diff --git a/frontend/src/core/components/tools/certSign/CertificateFilesSettings.tsx b/frontend/src/core/components/tools/certSign/CertificateFilesSettings.tsx index ffedbe70d..6e6df830c 100644 --- a/frontend/src/core/components/tools/certSign/CertificateFilesSettings.tsx +++ b/frontend/src/core/components/tools/certSign/CertificateFilesSettings.tsx @@ -36,23 +36,17 @@ const CertificateFilesSettings = ({ parameters, onParameterChange, disabled = fa )} - {parameters.certType === 'PKCS12' && ( + {(parameters.certType === 'PKCS12' || parameters.certType === 'PFX') && ( onParameterChange('p12File', file || undefined)} - accept=".p12" + accept=".p12,.pfx" disabled={disabled} - placeholder={t('certSign.chooseP12File', 'Choose PKCS12 File')} - /> - )} - - {parameters.certType === 'PFX' && ( - onParameterChange('p12File', file || undefined)} - accept=".pfx" - disabled={disabled} - placeholder={t('certSign.choosePfxFile', 'Choose PFX File')} + placeholder={ + parameters.certType === 'PFX' + ? t('certSign.choosePfxFile', 'Choose PFX File') + : t('certSign.chooseP12File', 'Choose PKCS12 File') + } /> )} @@ -92,4 +86,4 @@ const CertificateFilesSettings = ({ parameters, onParameterChange, disabled = fa ); }; -export default CertificateFilesSettings; \ No newline at end of file +export default CertificateFilesSettings; diff --git a/frontend/src/core/hooks/tools/certSign/useCertSignOperation.ts b/frontend/src/core/hooks/tools/certSign/useCertSignOperation.ts index c81b73fea..d8c580fe2 100644 --- a/frontend/src/core/hooks/tools/certSign/useCertSignOperation.ts +++ b/frontend/src/core/hooks/tools/certSign/useCertSignOperation.ts @@ -7,14 +7,14 @@ import { CertSignParameters, defaultParameters } from '@app/hooks/tools/certSign export const buildCertSignFormData = (parameters: CertSignParameters, file: File): FormData => { const formData = new FormData(); formData.append('fileInput', file); - + // Handle sign mode if (parameters.signMode === 'AUTO') { formData.append('certType', 'SERVER'); } else { formData.append('certType', parameters.certType); formData.append('password', parameters.password); - + // Add certificate files based on type (only for manual mode) switch (parameters.certType) { case 'PEM': @@ -26,6 +26,7 @@ export const buildCertSignFormData = (parameters: CertSignParameters, file: File } break; case 'PKCS12': + case 'PFX': if (parameters.p12File) { formData.append('p12File', parameters.p12File); } @@ -37,7 +38,7 @@ export const buildCertSignFormData = (parameters: CertSignParameters, file: File break; } } - + // Add signature appearance options if enabled if (parameters.showSignature) { formData.append('showSignature', 'true'); @@ -47,7 +48,7 @@ export const buildCertSignFormData = (parameters: CertSignParameters, file: File formData.append('pageNumber', parameters.pageNumber.toString()); formData.append('showLogo', parameters.showLogo.toString()); } - + return formData; }; @@ -68,4 +69,4 @@ export const useCertSignOperation = () => { ...certSignOperationConfig, getErrorMessage: createStandardErrorHandler(t('certSign.error.failed', 'An error occurred while processing signatures.')) }); -}; \ No newline at end of file +};