From a92d90db4ab7b0b404589c49aa2f7baccee7826d Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Thu, 25 Jan 2024 18:36:49 +0530 Subject: [PATCH 1/2] change body parameter of update API --- .../customRoute/v1/routes/updateDocument.js | 16 ++++++++-------- .../customRoute/v1/routes/updateTemplate.js | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js index c6ecc0c2c8..30c9b9d41e 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js @@ -26,20 +26,20 @@ export default async function updateDocument(request, response) { const document = Parse.Object.extend('contracts_Document'); const updateQuery = new document(); updateQuery.id = request.params.document_id; - if (request?.body?.Name) { - updateQuery.set('Name', request?.body?.Name); + if (request?.body?.name) { + updateQuery.set('Name', request?.body?.name); } - if (request?.body?.Note) { - updateQuery.set('Note', request?.body?.Note); + if (request?.body?.note) { + updateQuery.set('Note', request?.body?.note); } - if (request?.body?.Description) { - updateQuery.set('Name', request?.body?.Description); + if (request?.body?.description) { + updateQuery.set('Name', request?.body?.description); } - if (request?.body?.FolderId) { + if (request?.body?.folderId) { updateQuery.set('Folder', { __type: 'Pointer', className: 'contracts_Document', - objectId: request?.body?.FolderId, + objectId: request?.body?.folderId, }); } const updatedRes = await updateQuery.save(null, { useMasterKey: true }); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js index 791844a8b0..38dac8e6de 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js @@ -26,20 +26,20 @@ export default async function updateTemplate(request, response) { const template = Parse.Object.extend('contracts_Template'); const updateQuery = new template(); updateQuery.id = request.params.template_id; - if (request?.body?.Name) { - updateQuery.set('Name', request?.body?.Name); + if (request?.body?.name) { + updateQuery.set('Name', request?.body?.name); } - if (request?.body?.Note) { - updateQuery.set('Note', request?.body?.Note); + if (request?.body?.note) { + updateQuery.set('Note', request?.body?.note); } - if (request?.body?.Description) { - updateQuery.set('Name', request?.body?.Description); + if (request?.body?.description) { + updateQuery.set('Name', request?.body?.description); } - if (request?.body?.FolderId) { + if (request?.body?.folderId) { updateQuery.set('Folder', { __type: 'Pointer', className: 'contracts_Template', - objectId: request?.body?.FolderId, + objectId: request?.body?.folderId, }); } const updatedRes = await updateQuery.save(null, { useMasterKey: true }); From 8ce31d3d80bf623cbbdb783a77035754164317b2 Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Thu, 25 Jan 2024 19:16:09 +0530 Subject: [PATCH 2/2] fix: get host method in API --- .../v1/routes/CreateDocumentWithTemplate.js | 12 +++--------- .../cloud/customRoute/v1/routes/createDocument.js | 12 +++--------- .../cloud/customRoute/v1/routes/createTemplate.js | 12 +++--------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js index 6efa6f84df..0f5857aa19 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js @@ -3,15 +3,9 @@ export default async function createDocumentWithTemplate(request, response) { const signers = request.body.signers; const folderId = request.body.folderId; const templateId = request.params.template_id; - const url = request?.get('host'); - let protocol = 'https://' + url; - if (request.hostname === 'localhost') { - // console.log('Running in development environment'); - protocol = 'http://' + url; - } else { - // console.log('Running in production environment'); - protocol = 'https://' + url; - } + const url = new URL(process.env.SERVER_URL); + let protocol = url.origin; + try { const reqToken = request.headers['x-api-token']; if (!reqToken) { diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js index e4c7a4a7f5..8b93a72d2b 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js @@ -10,17 +10,11 @@ export default async function createDocument(request, response) { const signers = request.body.signers; const folderId = request.body.folderId; const base64File = request.body.file; - const url = request?.get('host'); const fileData = request.files?.[0] ? request.files[0].buffer : null; // console.log('fileData ', fileData); - let protocol = 'https://' + url; - if (request.hostname === 'localhost') { - // console.log('Running in development environment'); - protocol = 'http://' + url; - } else { - // console.log('Running in production environment'); - protocol = 'https://' + url; - } + const url = new URL(process.env.SERVER_URL); + let protocol = url.origin; + try { const reqToken = request.headers['x-api-token']; if (!reqToken) { diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js index 4879d7988b..36014c48fc 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js @@ -5,17 +5,11 @@ export default async function createTemplate(request, response) { const description = request.body?.description; const signers = request.body?.signers; const folderId = request.body?.folderId; - const url = request?.get('host'); const base64File = request.body.file; const fileData = request.files?.[0] ? request.files[0].buffer : null; - let protocol = 'https://' + url; - if (request.hostname === 'localhost') { - // console.log('Running in development environment'); - protocol = 'http://' + url; - } else { - // console.log('Running in production environment'); - protocol = 'https://' + url; - } + const url = new URL(process.env.SERVER_URL); + let protocol = url.origin; + try { const reqToken = request.headers['x-api-token']; if (!reqToken) {