diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js index e429e173c..cee2a2b0b 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js @@ -75,7 +75,7 @@ export default async function createContact(request, response) { return response.json({ code: 200, message: 'Contact created sucessfully!', - result: { id: contactRes.id }, + result: { objectId: contactRes.id }, }); } } catch (err) { @@ -114,7 +114,7 @@ export default async function createContact(request, response) { return response.json({ code: 200, message: 'Contact created sucessfully!', - result: { id: contactRes.id }, + result: { objectId: contactRes.id }, }); // const parseData = JSON.parse(JSON.stringify(res)); } diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js index d58cca4de..9e036fa4e 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js @@ -48,7 +48,7 @@ export default async function createDocument(request, response) { return response.json({ code: 200, message: 'Document created successfully!', - result: { id: res.id, url: url }, + result: { objectId: res.id, url: url }, }); } else { return response.json({ code: 405, message: 'Invalid API Token!' }); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/deleteContact.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/deleteContact.js index 5cae4e32d..86636f96c 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/deleteContact.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/deleteContact.js @@ -18,7 +18,7 @@ export default async function deleteContact(request, response) { if (res) { const isDeleted = res.get('IsDeleted'); if (isDeleted && isDeleted) { - return response.json({ code: 404, message: 'Record not found!' }); + return response.json({ code: 404, message: 'Contact not found!' }); } else { const Contactbook = Parse.Object.extend('contracts_Contactbook'); const deleteQuery = new Contactbook(); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/deleteTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/deleteTemplate.js index 3c1707f5a..b2c0518a0 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/deleteTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/deleteTemplate.js @@ -18,7 +18,7 @@ export default async function deletedTemplate(request, response) { if (res) { const isArchive = res.get('IsArchive'); if (isArchive && isArchive) { - return response.json({ code: 404, message: 'Record not found!' }); + return response.json({ code: 404, message: 'Template not found!' }); } else { const template = Parse.Object.extend('contracts_Template'); const deleteQuery = new template(); @@ -26,11 +26,11 @@ export default async function deletedTemplate(request, response) { deleteQuery.set('IsArchive', true); const deleteRes = await deleteQuery.save(null, { useMasterKey: true }); if (deleteRes) { - return response.json({ code: 200, message: 'Template delete successfully!' }); + return response.json({ code: 200, message: 'Template deleted successfully!' }); } } } else { - return response.json({ code: 404, message: 'Record not found!' }); + return response.json({ code: 404, message: 'Template not found!' }); } } else { return response.json({ code: 405, message: 'Invalid API Token!' }); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js index 069482a95..3be07d83e 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js @@ -24,7 +24,7 @@ export default async function getDocumentList(request, response) { case 'draftdocuments': reportId = 'ByHuevtCFY'; break; - case 'signatureRequest': + case 'signaturerequest': reportId = '4Hhwbp482K'; break; case 'inprogressdocuments': @@ -57,12 +57,24 @@ export default async function getDocumentList(request, response) { const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr`; const res = await axios.get(url, { headers: headers }); if (res.data && res.data.results) { - return response.json({ code: 200, result: res.data.results }); + const updateRes = + res.data.results.length > 0 + ? res.data.results.map(x => ({ + objectId: x.objectId, + Title: x.Name, + Note: x.Note || '', + Folder: x?.Folder?.Name || 'OpenSign™ Drive', + File: x?.SignedUrl || x.URL, + Owner: x?.ExtUserPtr?.Name, + Signers: x?.Signers?.map(y => y?.Name) || '', + })) + : []; + return response.json({ code: 200, result: updateRes }); } else { return response.json({ code: 200, result: [] }); } } else { - return response.json({ code: 404, message: 'Report is not available!' }); + return response.json({ code: 404, message: 'Report not available!' }); } } return response.json({ code: 405, message: 'Invalid API Token!' }); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js index 1a4ee3820..59ab9f864 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js @@ -34,6 +34,7 @@ export default async function getTemplatetList(request, response) { 'Description', 'Folder.Name', 'URL', + 'SignedUrl', 'ExtUserPtr.Name', 'Signers.Name', ]; @@ -48,7 +49,19 @@ export default async function getTemplatetList(request, response) { const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr`; const res = await axios.get(url, { headers: headers }); if (res.data && res.data.results) { - return response.json({ code: 200, result: res.data.results }); + const updateRes = + res.data.results.length > 0 + ? res.data.results.map(x => ({ + objectId: x.objectId, + Title: x.Name, + Note: x.Note || '', + Folder: x?.Folder?.Name || 'OpenSign™ Drive', + File: x?.SignedUrl || x.URL, + Owner: x?.ExtUserPtr?.Name, + Signers: x?.Signers?.map(y => y?.Name) || '', + })) + : []; + return response.json({ code: 200, result: updateRes }); } else { return response.json({ code: 200, result: [] }); } diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/getUser.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/getUser.js index c81ebed50..8d88218d9 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/getUser.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/getUser.js @@ -20,7 +20,7 @@ export default async function getUser(request, response) { if (result) { return response.json({ code: 200, result: result }); } else { - return response.json({ code: 404, message: 'Record not found!' }); + return response.json({ code: 404, message: 'User not found!' }); } } return response.json({ code: 405, message: 'Invalid API Token!' }); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js index 1703aab08..8dd0936fd 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js @@ -22,7 +22,7 @@ export default async function updateTemplate(request, response) { if (res) { const isArchive = res.get('IsArchive'); if (isArchive && isArchive) { - return response.json({ code: 404, message: 'Record not found!' }); + return response.json({ code: 404, message: 'Template not found!' }); } else { const template = Parse.Object.extend('contracts_Template'); const updateQuery = new template(); @@ -48,12 +48,12 @@ export default async function updateTemplate(request, response) { return response.json({ code: 200, message: 'Template updated successfully!', - result: updatedRes.id, + result: { objectId: updatedRes.id }, }); } } } else { - return response.json({ code: 404, message: 'Record not found!' }); + return response.json({ code: 404, message: 'Template not found!' }); } } else { return response.json({ code: 400, message: 'Please provide valid field names!' }); diff --git a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js index 2031cd076..24bc07dae 100644 --- a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js +++ b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js @@ -11,7 +11,11 @@ export default function reportJson(id, userId) { IsCompleted: { $ne: true }, IsDeclined: { $ne: true }, IsArchive: { $ne: true }, - $or: [{Signers:{$eq:[]}}, { Signers: null }, { Signers: { $exists: true }, Placeholders: null }], + $or: [ + { Signers: { $eq: [] } }, + { Signers: null }, + { Signers: { $exists: true }, Placeholders: null }, + ], CreatedBy: { __type: 'Pointer', className: '_User', @@ -99,6 +103,7 @@ export default function reportJson(id, userId) { 'Note', 'Folder.Name', 'URL', + 'SignedUrl', 'ExtUserPtr.Name', 'Signers.Name', 'TimeToCompleteDays', @@ -211,7 +216,11 @@ export default function reportJson(id, userId) { IsCompleted: { $ne: true }, IsDeclined: { $ne: true }, IsArchive: { $ne: true }, - $or: [{Signers:{$eq:[]}}, { Signers: null }, { Signers: { $exists: true }, Placeholders: null }], + $or: [ + { Signers: { $eq: [] } }, + { Signers: null }, + { Signers: { $exists: true }, Placeholders: null }, + ], CreatedBy: { __type: 'Pointer', className: '_User',