🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
refactor: remove unncessary code
prafull-opensignlabs204c53071211
diff --git a/apps/OpenSignServer/cloud/customRoute/v1/apiV1.js b/apps/OpenSignServer/cloud/customRoute/v1/apiV1.jsindex ac33cff5a..2ccd5a1c7 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/apiV1.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/apiV1.js@@ -10,7 +10,6 @@ import getContact from './routes/getContact.js';import deleteContact from './routes/deleteContact.js';import getContactList from './routes/getContactList.js';import draftDocument from './routes/draftDocument.js';-import createTemplate from './routes/createTemplate.js';import getTemplate from './routes/getTemplate.js';import deletedTemplate from './routes/deleteTemplate.js';import getTemplatetList from './routes/getTemplateList.js';@@ -81,9 +80,6 @@ app.get('/documentlist/:doctype', getDocumentList);// create Template with co-ordinateapp.post('/createtemplate', createTemplatewithCoordinate);-// create Template-app.post('/drafttemplate', createTemplate);-// create Template with binaryapp.post('/createtemplatewithbinary', upload.array('file', 1), createTemplatewithCoordinate);diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.jsindex d931b02d8..8cc7509de 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js@@ -209,6 +209,7 @@ export default async function createDocumentWithTemplate(request, response) {if (folderId) {object.set('Folder', folderPtr);}+ object.set('IsFileAdapter', template?.IsFileAdapter || false);const newACL = new Parse.ACL();newACL.setPublicReadAccess(false);newACL.setPublicWriteAccess(false);diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.jsindex 59c681c1e..b47a082bf 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js@@ -8,6 +8,7 @@ import {sanitizeFileName,cloudServerUrl,} from '../../../../Utils.js';+import uploadFileToS3 from '../../../parsefunction/uploadFiletoS3.js';// `sendDoctoWebhook` is used to send res data of document on webhookasync function sendDoctoWebhook(doc, WebhookUrl, userId) {@@ -87,6 +88,7 @@ export default async function createDocumentwithCoordinate(request, response) {};const extUsers = new Parse.Query('contracts_Users');extUsers.equalTo('UserId', userPtr);+ extUsers.include('TenantId');const extUser = await extUsers.first({ useMasterKey: true });const subscription = new Parse.Query('contracts_Subscriptions');@@ -114,6 +116,7 @@ export default async function createDocumentwithCoordinate(request, response) {.status(400).json({ error: 'Please add at least one signature widget for all signers' });}+ const parseExtUser = JSON.parse(JSON.stringify(extUser));let fileUrl;if (request.files?.[0]) {const base64 = fileData?.toString('base64');@@ -126,23 +129,32 @@ export default async function createDocumentwithCoordinate(request, response) {saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);} else {const filename = sanitizeFileName(`${name}.pdf`);- const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');- await file.save({ useMasterKey: true });- fileUrl = file.url();+ if (parseExtUser?.TenantId?.ActiveFileAdapter) {+ const adapter = {+ fileAdapter: parseExtUser?.TenantId?.ActiveFileAdapter,+ bucketName: parseExtUser?.TenantId?.FileAdapter?.bucketName,+ region: parseExtUser?.TenantId?.FileAdapter?.region,+ endpoint: parseExtUser?.TenantId?.FileAdapter?.endpoint,+ accessKeyId: parseExtUser?.TenantId?.FileAdapter?.accessKeyId,+ secretAccessKey: parseExtUser?.TenantId?.FileAdapter?.secretAccessKey,+ baseUrl: parseExtUser?.TenantId?.FileAdapter?.baseUrl,+ };+ const filedata = Buffer.from(base64File, 'base64');+ // `uploadFileToS3` is used to save document in user's file storage+ fileUrl = await uploadFileToS3(filedata, filename, 'application/pdf', adapter);+ } else {+ const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');+ await file.save({ useMasterKey: true });+ fileUrl = file.url();+ }const buffer = Buffer.from(base64File, 'base64');saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);}- const contractsUser = new Parse.Query('contracts_Users');- contractsUser.equalTo('UserId', userPtr);- const extUser = await contractsUser.first({ useMasterKey: true });- const parseExtUser = JSON.parse(JSON.stringify(extUser));-const extUserPtr = {__type: 'Pointer',className: 'contracts_Users',objectId: extUser.id,};-const object = new Parse.Object('contracts_Document');object.set('Name', name);@@ -165,6 +177,11 @@ export default async function createDocumentwithCoordinate(request, response) {}object.set('IsEnableOTP', IsEnableOTP);object.set('IsSendMail', send_email);+ if (parseExtUser?.TenantId?.ActiveFileAdapter) {+ object.set('IsFileAdapter', true);+ } else {+ object.set('IsFileAdapter', false);+ }let contact = [];if (signers && signers.length > 0) {let parseSigners;diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.jsdeleted file mode 100644index ad9462ca3..000000000--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js+++ /dev/null@@ -1,140 +0,0 @@-import { saveFileUsage } from '../../../../Utils.js';-export default async function createTemplate(request, response) {- const name = request.body?.title;- const note = request.body?.note;- const description = request.body?.description;- const signers = request.body?.signers;- const folderId = request.body?.folderId;- const base64File = request.body.file;- const SendinOrder = request.body.sendInOrder || false;- const fileData = request.files?.[0] ? request.files[0].buffer : null;- const baseUrl = new URL(process.env.PUBLIC_URL);- const isEnableOTP = request.body?.enableOTP === true ? true : false;-- try {- const reqToken = request.headers['x-api-token'];- if (!reqToken) {- return response.status(400).json({ error: 'Please Provide API Token' });- }- const tokenQuery = new Parse.Query('appToken');- tokenQuery.equalTo('token', reqToken);- tokenQuery.include('userId');- const token = await tokenQuery.first({ useMasterKey: true });- if (token !== undefined) {- // Valid Token then proceed request- const parseUser = JSON.parse(JSON.stringify(token));- const userPtr = {- __type: 'Pointer',- className: '_User',- objectId: parseUser.userId.objectId,- };- let fileUrl;- if (base64File) {- const file = new Parse.File(`${name}.pdf`, {- base64: base64File,- });- await file.save({ useMasterKey: true });- fileUrl = file.url();- const buffer = Buffer.from(base64File, 'base64');- saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);- } else {- const base64 = fileData?.toString('base64');- const file = new Parse.File(request.files?.[0]?.originalname, {- base64: base64,- });- await file.save({ useMasterKey: true });- fileUrl = file.url();- const buffer = Buffer.from(base64, 'base64');- saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);- }-- const contractsUser = new Parse.Query('contracts_Users');- contractsUser.equalTo('UserId', userPtr);- const extUser = await contractsUser.first({ useMasterKey: true });- const extUserPtr = { __type: 'Pointer', className: 'contracts_Users', objectId: extUser.id };-- const folderPtr = { __type: 'Pointer', className: 'contracts_Template', objectId: folderId };-- const object = new Parse.Object('contracts_Template');- object.set('Name', name);- if (note) {- object.set('Note', note);- }- if (description) {- object.set('Description', description);- }- object.set('URL', fileUrl);- object.set('CreatedBy', userPtr);- object.set('ExtUserPtr', extUserPtr);- object.set('IsEnableOTP', isEnableOTP);- if (SendinOrder) {- object.set('SendinOrder', SendinOrder);- }- if (signers && signers.length > 0) {- let parseSigners;- if (base64File) {- parseSigners = signers;- } else {- parseSigners = JSON.parse(signers);- }- let createContactUrl = protocol + '/v1/createcontact';-- let contact = [];- for (const obj of parseSigners) {- const body = {- name: obj?.name || '',- email: obj?.email || '',- phone: obj?.phone || '',- };- try {- const res = await axios.post(createContactUrl, body, {- headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },- });- // console.log('res ', res.data);- contact.push({- __type: 'Pointer',- className: 'contracts_Contactbook',- objectId: res.data?.objectId,- });- } catch (err) {- // console.log('err ', err.response);- if (err?.response?.data?.objectId) {- contact.push({- __type: 'Pointer',- className: 'contracts_Contactbook',- objectId: err.response.data?.objectId,- });- }- }- }- object.set('Signers', contact);- }- if (folderId) {- object.set('Folder', folderPtr);- }- const newACL = new Parse.ACL();- newACL.setPublicReadAccess(false);- newACL.setPublicWriteAccess(false);- newACL.setReadAccess(userPtr.objectId, true);- newACL.setWriteAccess(userPtr.objectId, true);- object.setACL(newACL);- const res = await object.save(null, { useMasterKey: true });- if (request.posthog) {- request.posthog?.capture({- distinctId: parseUser.userId.email,- event: 'api_draft_template',- properties: { response_code: 200 },- });- }- return response.json({- objectId: res.id,- url: baseUrl.origin + '/template/' + res.id,- });- } else {- return response.status(405).json({ error: 'Invalid API Token!' });- }- } catch (err) {- console.log('err ', err);- return response.status(400).json({ error: 'Something went wrong, please try again later!' });- }-}diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.jsindex ebbbd0a60..2d0b50734 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js@@ -6,6 +6,7 @@ import {formatWidgetOptions,sanitizeFileName,} from '../../../../Utils.js';+import uploadFileToS3 from '../../../parsefunction/uploadFiletoS3.js';const randomId = () => Math.floor(1000 + Math.random() * 9000);export default async function createTemplatewithCoordinate(request, response) {@@ -40,6 +41,11 @@ export default async function createTemplatewithCoordinate(request, response) {objectId: parseUser.userId.objectId,};if (signers && signers.length > 0) {+ const contractsUser = new Parse.Query('contracts_Users');+ contractsUser.equalTo('UserId', userPtr);+ contractsUser.include('TenantId');+ const extUser = await contractsUser.first({ useMasterKey: true });+ const parseExtUser = JSON.parse(JSON.stringify(extUser));let fileUrl;if (request.files?.[0]) {const base64 = fileData?.toString('base64');@@ -52,24 +58,34 @@ export default async function createTemplatewithCoordinate(request, response) {saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);} else {const filename = sanitizeFileName(`${name}.pdf`);- const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');- await file.save({ useMasterKey: true });- fileUrl = file.url();+ if (parseExtUser?.TenantId?.ActiveFileAdapter) {+ const adapter = {+ fileAdapter: parseExtUser?.TenantId?.ActiveFileAdapter,+ bucketName: parseExtUser?.TenantId?.FileAdapter?.bucketName,+ region: parseExtUser?.TenantId?.FileAdapter?.region,+ endpoint: parseExtUser?.TenantId?.FileAdapter?.endpoint,+ accessKeyId: parseExtUser?.TenantId?.FileAdapter?.accessKeyId,+ secretAccessKey: parseExtUser?.TenantId?.FileAdapter?.secretAccessKey,+ baseUrl: parseExtUser?.TenantId?.FileAdapter?.baseUrl,+ };+ const filedata = Buffer.from(base64File, 'base64');+ // `uploadFileToS3` is used to save document in user's file storage+ fileUrl = await uploadFileToS3(filedata, filename, 'application/pdf', adapter);+ } else {+ const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');+ await file.save({ useMasterKey: true });+ fileUrl = file.url();+ }const buffer = Buffer.from(base64File, 'base64');saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);}- const contractsUser = new Parse.Query('contracts_Users');- contractsUser.equalTo('UserId', userPtr);- const extUser = await contractsUser.first({ useMasterKey: true });const extUserPtr = {__type: 'Pointer',className: 'contracts_Users',objectId: extUser.id,};-const object = new Parse.Object('contracts_Template');object.set('Name', name);-if (note) {object.set('Note', note);}@@ -186,6 +202,11 @@ export default async function createTemplatewithCoordinate(request, response) {objectId: folderId,});}+ if (parseExtUser?.TenantId?.ActiveFileAdapter) {+ object.set('IsFileAdapter', true);+ } else {+ object.set('IsFileAdapter', false);+ }const newACL = new Parse.ACL();newACL.setPublicReadAccess(false);newACL.setPublicWriteAccess(false);