diff --git a/apps/OpenSign/package-lock.json b/apps/OpenSign/package-lock.json index b46dbbcc1..cb47fb8ad 100644 --- a/apps/OpenSign/package-lock.json +++ b/apps/OpenSign/package-lock.json @@ -28,7 +28,7 @@ "print-js": "^1.6.0", "radix-ui": "^1.0.1", "react": "^18.2.0", - "react-bootstrap": "^2.10.4", + "react-bootstrap": "^2.10.5", "react-confetti": "^6.1.0", "react-cookie": "^7.2.0", "react-datepicker": "^7.4.0", @@ -70,7 +70,7 @@ "autoprefixer": "^10.4.20", "babel-loader": "^9.2.1", "clean-webpack-plugin": "^4.0.0", - "commitizen": "^4.3.0", + "commitizen": "^4.3.1", "concurrently": "^9.0.1", "css-loader": "^7.1.2", "daisyui": "^4.12.10", @@ -78,7 +78,7 @@ "dotenv-webpack": "^8.1.0", "eslint": "^9.11.1", "eslint-plugin-prettier": "^5.2.1", - "eslint-plugin-react": "^7.36.1", + "eslint-plugin-react": "^7.37.0", "lint-staged": "^15.2.10", "mini-css-extract-plugin": "^2.9.1", "postcss": "^8.4.47", @@ -8750,9 +8750,9 @@ } }, "node_modules/commitizen": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-4.3.0.tgz", - "integrity": "sha512-H0iNtClNEhT0fotHvGV3E9tDejDeS04sN1veIebsKYGMuGscFaswRoYJKmT3eW85eIJAs0F28bG2+a/9wCOfPw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-4.3.1.tgz", + "integrity": "sha512-gwAPAVTy/j5YcOOebcCRIijn+mSjWJC+IYKivTu6aG8Ei/scoXgfsMRnuAk6b0GRste2J4NGxVdMN3ZpfNaVaw==", "dev": true, "dependencies": { "cachedir": "2.3.0", @@ -10856,9 +10856,9 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.36.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.36.1.tgz", - "integrity": "sha512-/qwbqNXZoq+VP30s1d4Nc1C5GTxjJQjk4Jzs4Wq2qzxFM7dSmuG2UkIjg2USMLh3A/aVcUNrK7v0J5U1XEGGwA==", + "version": "7.37.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.0.tgz", + "integrity": "sha512-IHBePmfWH5lKhJnJ7WB1V+v/GolbB0rjS8XYVCSQCZKaQCAUhMoVoOEn1Ef8Z8Wf0a7l8KTJvuZg5/e4qrZ6nA==", "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", @@ -20271,9 +20271,9 @@ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "node_modules/react-bootstrap": { - "version": "2.10.4", - "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.4.tgz", - "integrity": "sha512-W3398nBM2CBfmGP2evneEO3ZZwEMPtHs72q++eNw60uDGDAdiGn0f9yNys91eo7/y8CTF5Ke1C0QO8JFVPU40Q==", + "version": "2.10.5", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.5.tgz", + "integrity": "sha512-XueAOEn64RRkZ0s6yzUTdpFtdUXs5L5491QU//8ZcODKJNDLt/r01tNyriZccjgRImH1REynUc9pqjiRMpDLWQ==", "dependencies": { "@babel/runtime": "^7.24.7", "@restart/hooks": "^0.4.9", @@ -22508,9 +22508,9 @@ } }, "node_modules/rollup": { - "version": "2.79.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", - "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", + "version": "2.79.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz", + "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==", "bin": { "rollup": "dist/bin/rollup" }, diff --git a/apps/OpenSign/package.json b/apps/OpenSign/package.json index 579f02063..8ff0fb0c2 100644 --- a/apps/OpenSign/package.json +++ b/apps/OpenSign/package.json @@ -23,7 +23,7 @@ "print-js": "^1.6.0", "radix-ui": "^1.0.1", "react": "^18.2.0", - "react-bootstrap": "^2.10.4", + "react-bootstrap": "^2.10.5", "react-confetti": "^6.1.0", "react-cookie": "^7.2.0", "react-datepicker": "^7.4.0", @@ -102,7 +102,7 @@ "autoprefixer": "^10.4.20", "babel-loader": "^9.2.1", "clean-webpack-plugin": "^4.0.0", - "commitizen": "^4.3.0", + "commitizen": "^4.3.1", "concurrently": "^9.0.1", "css-loader": "^7.1.2", "daisyui": "^4.12.10", @@ -110,7 +110,7 @@ "dotenv-webpack": "^8.1.0", "eslint": "^9.11.1", "eslint-plugin-prettier": "^5.2.1", - "eslint-plugin-react": "^7.36.1", + "eslint-plugin-react": "^7.37.0", "lint-staged": "^15.2.10", "mini-css-extract-plugin": "^2.9.1", "postcss": "^8.4.47", diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.json index 19f3e5610..461ce6af7 100644 --- a/apps/OpenSign/public/locales/en/translation.json +++ b/apps/OpenSign/public/locales/en/translation.json @@ -265,10 +265,10 @@ "make-template-public-alert": "Are you sure you want to make this template public?", "make-template-private-alert": "Are you sure you want to make this template private? This will remove it from your public profile.", "public-role": "Public role", - "public-url": "Public URL", + "public-url": "Public profile needed", "public-url-copy": "Here’s your public URL: ", "public-url-copy-mssg":"Copy it or share it with the signer, and you will be able to see all your publicly set templates.", - "add-public-url-alert": "Please add your public URL, and you will be able to make a public template.", + "add-public-url-alert": "Please complete your OpenSign public profile setup. Once done, you’ll be able to make templates public. This process only needs to be completed once.", "share-with-alert": "You cannot share a template if any roles already have contacts assigned. Please remove all contact assignments from the roles before sharing the template.", "share-with": "Share with", "team-not-found": "Team not found", @@ -672,6 +672,7 @@ "document-logs":"Document logs", "server-down": "Unable to connect to the OpenSign server. If you are self-hosting OpenSign, please ensure that all the steps in the documentation have been followed correctly. If you're running OpenSign locally, you might be accessing it through an incorrect port number.", "admin-exists": "Admin already exists. Please login to the application using admin credentials in order to manage users.", - "public-tour-message":"Please make template public to copy public URL" + "public-tour-message":"The template needs to be public before you can generate a shareable link.", + "add-user-template": "You need to add a role before you can add fields for it." } diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.json index 0e1cce477..52dbd9933 100644 --- a/apps/OpenSign/public/locales/fr/translation.json +++ b/apps/OpenSign/public/locales/fr/translation.json @@ -264,10 +264,10 @@ "make-template-public-alert": "Êtes-vous sûr de vouloir rendre ce modèle public ?", "make-template-private-alert": "Êtes-vous sûr de vouloir rendre ce modèle privé ? Cela le supprimera de votre profil public.", "public-role": "Rôle public", - "public-url": "URL publique", + "public-url": "Profil public requis", "public-url-copy": "Voici votre URL publique : ", "public-url-copy-mssg": "copiez-la ou partagez-le avec le signataire et vous pouvoir voir tous vos paramètres publics modèles.", - "add-public-url-alert": "Veuillez ajouter votre URL publique et vous pourra rendre public modèle.", + "add-public-url-alert": "Veuillez terminer la configuration de votre profil public OpenSign. Une fois cela fait, vous pourrez rendre les modèles publics. Ce processus ne doit être effectué qu’une seule fois.", "share-with-alert": "Vous ne pouvez pas partager un modèle si des contacts sont déjà attribués à des rôles. Veuillez supprimer toutes les attributions de contacts des rôles avant de partager le modèle.", "share-with": "Partager avec", "team-not-found": "Équipe introuvable", @@ -671,7 +671,8 @@ "document-logs":"Journaux de documents", "server-down": "Impossible de se connecter au serveur OpenSign. Si vous hébergez vous-même OpenSign, veuillez vous assurer que toutes les étapes de la documentation ont été correctement suivies. Si vous exécutez OpenSign localement, vous y accédez peut-être via un numéro de port incorrect.", "admin-exists": "L'administrateur existe déjà. Veuillez vous connecter à l'application en utilisant les informations d'identification de l'administrateur afin de gérer les utilisateurs.", - "public-tour-message":"Veuillez rendre le modèle public pour copier l'URL publique" + "public-tour-message": "Le modèle doit être public avant que vous puissiez générer un lien partageable.", + "add-user-template":"Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. " } diff --git a/apps/OpenSign/src/components/pdf/PdfHeader.js b/apps/OpenSign/src/components/pdf/PdfHeader.js index 93b74cef7..ed67d517b 100644 --- a/apps/OpenSign/src/components/pdf/PdfHeader.js +++ b/apps/OpenSign/src/components/pdf/PdfHeader.js @@ -418,11 +418,7 @@ function Header({ {templateId && (

This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + senderEmail + @@ -1510,8 +1510,17 @@ function PdfRequestFiles(props) { ); if (userRes?.data?.result) { - setRes(userRes.data.result); - await SendOtp(); + setPublicRes(userRes.data.result); + const isEnableOTP = pdfDetails?.[0]?.IsEnableOTP || false; + if (isEnableOTP) { + await SendOtp(); + } else { + setIsPublicContact(false); + setIsPublicTemplate(false); + setDocumentId(userRes.data?.result?.docId); + const contactId = userRes.data.result?.contactId; + setSignerObjectId(contactId); + } } else { console.log("error in public-sign to create user details"); setIsAlert({ @@ -1553,7 +1562,7 @@ function PdfRequestFiles(props) { const SendOtp = async () => { try { - const params = { email: contact.email, docId: res.docId }; + const params = { email: contact.email, docId: publicRes?.docId }; const Otp = await axios.post( `${localStorage.getItem("baseUrl")}/functions/SendOTPMailV1`, params, @@ -1619,17 +1628,13 @@ function PdfRequestFiles(props) { JSON.stringify(contractUserDetails) ); } - localStorage.setItem("username", _user.name); localStorage.setItem("accesstoken", _user.sessionToken); setLoading(false); - // navigate(`/load/recipientSignPdf/${res?.docId}/${res?.contactId}`); - // document.getElementById("my_modal").close(); setIsPublicContact(false); setIsPublicTemplate(false); setIsLoading({ isLoad: false }); - setDocumentId(res?.docId); - getDocumentDetails(res?.docId); + setDocumentId(publicRes?.docId); } } catch (error) { console.log("err ", error); diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index 819351290..aa31b6942 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -1121,7 +1121,7 @@ function PlaceHolderSign() { receiver_phone: signerMail[i]?.Phone || "", expiry_date: localExpireDate, company_name: orgName, - signing_url: `Sign here` + signing_url: `Sign here` }; replaceVar = replaceMailVaribles( requestSubject, @@ -1155,7 +1155,7 @@ function PlaceHolderSign() { orgName + " Expire on " + localExpireDate + - "

This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + senderEmail + diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.js index 42d0fbd9c..eda68d8df 100644 --- a/apps/OpenSign/src/pages/TemplatePlaceholder.js +++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js @@ -508,7 +508,7 @@ const TemplatePlaceholder = () => { const tourAddRole = [ { selector: '[data-tut="reactourAddbtn"]', - content: "You need to add a role before you can add fields for it. ", + content: t("add-user-template"), position: "top", style: { fontSize: "13px" } } diff --git a/apps/OpenSign/src/pages/UserProfile.js b/apps/OpenSign/src/pages/UserProfile.js index 8fba409c0..f05321f98 100644 --- a/apps/OpenSign/src/pages/UserProfile.js +++ b/apps/OpenSign/src/pages/UserProfile.js @@ -611,7 +611,7 @@ function UserProfile() {

{editmode || !extendUser?.[0]?.Tagline ? ( { receiver_phone: userDetails?.Phone || "", expiry_date: localExpireDate, company_name: doc.ExtUserPtr.Company, - signing_url: `Sign here` + signing_url: `Sign here` }; const res = replaceMailVaribles(subject, "", variables); @@ -740,7 +740,7 @@ const ReportTable = (props) => { receiver_phone: userDetails?.Phone || "", expiry_date: localExpireDate, company_name: doc.ExtUserPtr.Company, - signing_url: `Sign here` + signing_url: `Sign here` }; const res = replaceMailVaribles("", body, variables); @@ -781,7 +781,7 @@ const ReportTable = (props) => { receiver_phone: user?.signerPtr?.Phone || "", expiry_date: localExpireDate, company_name: doc?.ExtUserPtr?.Company || "", - signing_url: `Sign here` + signing_url: `Sign here` }; const subject = @@ -1511,14 +1511,14 @@ const ReportTable = (props) => { {t("public-url-copy")}
- - copytoProfileLink() - } + {publicUrl()} - +
{
)} diff --git a/apps/OpenSign/src/script/locales/en/translation.json b/apps/OpenSign/src/script/locales/en/translation.json index 3e9970d37..f96845408 100644 --- a/apps/OpenSign/src/script/locales/en/translation.json +++ b/apps/OpenSign/src/script/locales/en/translation.json @@ -265,10 +265,10 @@ "make-template-public-alert": "Are you sure you want to make this template public?", "make-template-private-alert": "Are you sure you want to make this template private? This will remove it from your public profile.", "public-role": "Public role", - "public-url": "Public URL", + "public-url": "Public profile needed", "public-url-copy": "Here’s your public URL: ", "public-url-copy-mssg": "Copy it or share it with the signer, and you will be able to see all your publicly set templates.", - "add-public-url-alert": "Please add your public URL, and you will be able to make a public template.", + "add-public-url-alert": "Please complete your OpenSign public profile setup. Once done, you’ll be able to make templates public. This process only needs to be completed once.", "share-with-alert": "You cannot share a template if any roles already have contacts assigned. Please remove all contact assignments from the roles before sharing the template.", "share-with": "Share with", "team-not-found": "Team not found", @@ -672,5 +672,6 @@ "document-logs": "Document logs", "server-down": "Unable to connect to the OpenSign server. If you are self-hosting OpenSign, please ensure that all the steps in the documentation have been followed correctly. If you're running OpenSign locally, you might be accessing it through an incorrect port number.", "admin-exists": "Admin already exists. Please login to the application using admin credentials in order to manage users.", - "public-tour-message": "Please make template public to copy public URL" + "public-tour-message":"The template needs to be public before you can generate a shareable link.", + "add-user-template": "You need to add a role before you can add fields for it." } diff --git a/apps/OpenSign/src/script/locales/fr/translation.json b/apps/OpenSign/src/script/locales/fr/translation.json index 6b3cde993..b83b915b7 100644 --- a/apps/OpenSign/src/script/locales/fr/translation.json +++ b/apps/OpenSign/src/script/locales/fr/translation.json @@ -264,10 +264,10 @@ "make-template-public-alert": "Êtes-vous sûr de vouloir rendre ce modèle public ?", "make-template-private-alert": "Êtes-vous sûr de vouloir rendre ce modèle privé ? Cela le supprimera de votre profil public.", "public-role": "Rôle public", - "public-url": "URL publique", + "public-url": "Profil public requis", "public-url-copy": "Voici votre URL publique : ", "public-url-copy-mssg": "copiez-la ou partagez-le avec le signataire et vous pouvoir voir tous vos paramètres publics modèles.", - "add-public-url-alert": "Veuillez ajouter votre URL publique et vous pourra rendre public modèle.", + "add-public-url-alert": "Veuillez terminer la configuration de votre profil public OpenSign. Une fois cela fait, vous pourrez rendre les modèles publics. Ce processus ne doit être effectué qu’une seule fois.", "share-with-alert": "Vous ne pouvez pas partager un modèle si des contacts sont déjà attribués à des rôles. Veuillez supprimer toutes les attributions de contacts des rôles avant de partager le modèle.", "share-with": "Partager avec", "team-not-found": "Équipe introuvable", @@ -671,5 +671,6 @@ "document-logs": "Journaux de documents", "server-down": "Impossible de se connecter au serveur OpenSign. Si vous hébergez vous-même OpenSign, veuillez vous assurer que toutes les étapes de la documentation ont été correctement suivies. Si vous exécutez OpenSign localement, vous y accédez peut-être via un numéro de port incorrect.", "admin-exists": "L'administrateur existe déjà. Veuillez vous connecter à l'application en utilisant les informations d'identification de l'administrateur afin de gérer les utilisateurs.", - "public-tour-message": "Veuillez rendre le modèle public pour copier l'URL publique" + "public-tour-message": "Le modèle doit être public avant que vous puissiez générer un lien partageable.", + "add-user-template":"Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. " } diff --git a/apps/OpenSignServer/cloud/customRoute/autoReminder.js b/apps/OpenSignServer/cloud/customRoute/autoReminder.js index 05fc0cd25..a93c4291d 100644 --- a/apps/OpenSignServer/cloud/customRoute/autoReminder.js +++ b/apps/OpenSignServer/cloud/customRoute/autoReminder.js @@ -53,7 +53,7 @@ async function sendMail(doc, signer) { receiver_phone: signer?.Phone || '', expiry_date: localExpireDate, company_name: doc?.ExtUserPtr?.Company || '', - signing_url: `Sign here`, + signing_url: `Sign here`, }; const mail = replaceMailVaribles(subject, body, variables); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js index ec344b130..d931b02d8 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js @@ -196,8 +196,9 @@ export default async function createDocumentWithTemplate(request, response) { if (TimeToCompleteDays) { object.set('TimeToCompleteDays', TimeToCompleteDays); } - const enableOTP = request.body?.enableOTP === true ? true : false; - const IsEnableOTP = enableOTP || template?.IsEnableOTP || false; + const enableOTP = request.body?.enableOTP; + const IsEnableOTP = + enableOTP !== undefined ? enableOTP : template?.IsEnableOTP || false; object.set('IsEnableOTP', IsEnableOTP); object.set('CreatedBy', template.CreatedBy); object.set('ExtUserPtr', { @@ -268,7 +269,7 @@ export default async function createDocumentWithTemplate(request, response) { orgName + " Expires on " + localExpireDate + - "

This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + sender + diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js index 29404049c..59c681c1e 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js @@ -325,7 +325,7 @@ export default async function createDocumentwithCoordinate(request, response) { orgName + " Expires on " + localExpireDate + - "

This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + sender + diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js index 794fc8943..b72d00528 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js @@ -86,7 +86,7 @@ export default async function resendMail(request, response) { orgName + " Expires on " + localExpireDate + - "

This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + sender + diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js index 81a3fa5d3..f2ea62ce6 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js @@ -48,10 +48,10 @@ export default async function updateDocument(request, response) { objectId: request?.body?.folderId, }); } - - if (request.body?.enableOTP) { + if (request.body?.enableOTP !== undefined) { updateQuery.set('IsEnableOTP', request.body?.enableOTP); } + const updatedRes = await updateQuery.save(null, { useMasterKey: true }); if (updatedRes) { if (request.posthog) { diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js index 735e699aa..87bbcf11b 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js @@ -48,7 +48,7 @@ export default async function updateTemplate(request, response) { objectId: request?.body?.folderId, }); } - if (request.body?.enableOTP) { + if (request.body?.enableOTP !== undefined) { updateQuery.set('IsEnableOTP', request.body?.enableOTP); } const updatedRes = await updateQuery.save(null, { useMasterKey: true }); diff --git a/apps/OpenSignServer/cloud/parsefunction/PublicUserLinkContactToDoc.js b/apps/OpenSignServer/cloud/parsefunction/PublicUserLinkContactToDoc.js index 0b103d83b..00c40e762 100644 --- a/apps/OpenSignServer/cloud/parsefunction/PublicUserLinkContactToDoc.js +++ b/apps/OpenSignServer/cloud/parsefunction/PublicUserLinkContactToDoc.js @@ -168,7 +168,7 @@ const sendMailToAllSigners = async docId => { receiver_phone: signerMail[i]?.Phone || '', expiry_date: localExpireDate, company_name: orgName, - signing_url: `Sign here`, + signing_url: `Sign here`, }; replaceVar = replaceMailVaribles(requestSubject, htmlReqBody, variables); } diff --git a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js index 3df13cc65..dad7b197f 100644 --- a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js +++ b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js @@ -95,7 +95,7 @@ async function sendMail(document, sessionToken) { orgName + " Expires on " + localExpireDate + - "

This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + sender + diff --git a/apps/OpenSignServer/index.js b/apps/OpenSignServer/index.js index 88569decf..26b16b5f9 100644 --- a/apps/OpenSignServer/index.js +++ b/apps/OpenSignServer/index.js @@ -24,8 +24,9 @@ if (useLocal !== 'true') { try { const spacesEndpoint = new AWS.Endpoint(process.env.DO_ENDPOINT); const s3Options = { - bucket: process.env.DO_SPACE, // globalConfig.S3FilesAdapter.bucket, + bucket: process.env.DO_SPACE, baseUrl: process.env.DO_BASEURL, + fileAcl: 'none', region: process.env.DO_REGION, directAccess: true, preserveFileName: true, diff --git a/apps/OpenSignServer/package-lock.json b/apps/OpenSignServer/package-lock.json index 991518ba6..cd5e58bb6 100644 --- a/apps/OpenSignServer/package-lock.json +++ b/apps/OpenSignServer/package-lock.json @@ -25,7 +25,7 @@ "googleapis": "^144.0.0", "jsonschema": "^1.4.1", "mailgun.js": "^10.2.3", - "mongoose": "^8.6.3", + "mongoose": "^8.7.0", "multer": "^1.4.5-lts.1", "multer-s3": "^3.0.1", "node-forge": "^1.3.1", @@ -8247,13 +8247,13 @@ } }, "node_modules/mongoose": { - "version": "8.6.3", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.6.3.tgz", - "integrity": "sha512-++yRmm7hjMbqVA/8WeiygTnEfrFbiy+OBjQi49GFJIvCQuSYE56myyQWo4j5hbpcHjhHQU8NukMNGTwAWFWjIw==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.7.0.tgz", + "integrity": "sha512-rUCSF1mMYQXjXYdqEQLLlMD3xbcj2j1/hRn+9VnVj7ipzru/UoUZxlj/hWmteKMAh4EFnDZ+BIrmma9l/0Hi1g==", "dependencies": { "bson": "^6.7.0", "kareem": "2.6.3", - "mongodb": "6.8.0", + "mongodb": "6.9.0", "mpath": "0.9.0", "mquery": "5.0.0", "ms": "2.1.3", @@ -8325,9 +8325,9 @@ } }, "node_modules/mongoose/node_modules/mongodb": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.8.0.tgz", - "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz", + "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", "bson": "^6.7.0", diff --git a/apps/OpenSignServer/package.json b/apps/OpenSignServer/package.json index 75d6c529f..2c7a31874 100644 --- a/apps/OpenSignServer/package.json +++ b/apps/OpenSignServer/package.json @@ -34,7 +34,7 @@ "googleapis": "^144.0.0", "jsonschema": "^1.4.1", "mailgun.js": "^10.2.3", - "mongoose": "^8.6.3", + "mongoose": "^8.7.0", "multer": "^1.4.5-lts.1", "multer-s3": "^3.0.1", "node-forge": "^1.3.1",