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

Author: raktima-opensignlabs

apps/OpenSign/package-lock.json

@@ -11,7 +11,7 @@
     "@reduxjs/toolkit": "^2.2.7",
     "axios": "^1.7.7",
     "file-saver": "^2.0.5",
-    "i18next": "^23.15.1",
+    "i18next": "^23.15.2",
     "i18next-browser-languagedetector": "^8.0.0",
     "i18next-http-backend": "^2.6.2",
     "jszip": "^3.10.1",
@@ -37,7 +37,7 @@
     "react-i18next": "^15.0.2",
     "react-konva": "^18.2.10",
     "react-pdf": "^9.1.1",
-    "react-quill-new": "^3.3.2",
+    "react-quill-new": "^3.3.3",
     "react-redux": "^9.1.2",
     "react-rnd": "^10.4.13",
     "react-router-dom": "^6.26.2",
@@ -105,10 +105,10 @@
     "commitizen": "^4.3.1",
     "concurrently": "^9.0.1",
     "css-loader": "^7.1.2",
-    "daisyui": "^4.12.11",
+    "daisyui": "^4.12.12",
     "dotenv": "^16.4.5",
     "dotenv-webpack": "^8.1.0",
-    "eslint": "^9.11.1",
+    "eslint": "^9.12.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.37.1",
     "lint-staged": "^15.2.10",

apps/OpenSign/package.json

@@ -711,7 +711,8 @@ export const createDocument = async (
       AutomaticReminders: Doc?.AutomaticReminders || false,
       RemindOnceInEvery: parseInt(Doc?.RemindOnceInEvery || 5),
       IsEnableOTP: Doc?.IsEnableOTP || false,
-      IsTourEnabled: Doc?.IsTourEnabled || false
+      IsTourEnabled: Doc?.IsTourEnabled || false,
+      IsFileAdapter: Doc?.IsFileAdapter || false
     };
 
     try {

apps/OpenSign/src/constant/Utils.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-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/apiV1.js

@@ -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/CreateDocumentWithTemplate.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 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;