WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-09-13 21:27:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into react-tour

Browse Source
This commit is contained in:
RaktimaNXG
2024-10-08 10:18:05 +05:30
parent 5e55f0debf b08fa9bf60
commit cdd92f6990
9 changed files with 239 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSignServer/cloud/customRoute/v1/apiV1.js
-4
View File
@@ -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-ordinate
app.post('/createtemplate', createTemplatewithCoordinate);
// create Template
app.post('/drafttemplate', createTemplate);
// create Template with binary
app.post('/createtemplatewithbinary', upload.array('file', 1), createTemplatewithCoordinate);
apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
+1
View File
@@ -213,6 +213,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);
apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js
+26 -9
View File
@@ -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 webhook
async function sendDoctoWebhook(doc, WebhookUrl, userId) {
@@ -88,6 +89,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');
@@ -115,6 +117,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');
@@ -127,23 +130,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);
@@ -167,6 +179,11 @@ export default async function createDocumentwithCoordinate(request, response) {
object.set('IsEnableOTP', IsEnableOTP);
object.set('IsTourEnabled', isTourEnabled);
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;
apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js
+29 -8
View File
@@ -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) {
@@ -41,6 +42,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');
@@ -53,24 +59,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);
}
@@ -188,6 +204,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);