Skip to content

🔥 The free & Open Source DocuSign alternative

feat: add mailProvider parameter in sendmailv3 function and signPdf function

RaktimaNXGd5bc2df20f73
diff --git a/apps/OpenSign/src/components/pdf/EmailComponent.js b/apps/OpenSign/src/components/pdf/EmailComponent.js
index 879ff5fa2..b1e905719 100644
--- a/apps/OpenSign/src/components/pdf/EmailComponent.js
+++ b/apps/OpenSign/src/components/pdf/EmailComponent.js
@@ -16,7 +16,8 @@ function EmailComponent({
pdfName,
sender,
setIsAlert,
- extUserId
+ extUserId,
+ activeMailAdapter
}) {
const [emailList, setEmailList] = useState([]);
const [emailValue, setEmailValue] = useState();
@@ -24,6 +25,7 @@ function EmailComponent({
//function for send email
const sendEmail = async () => {
setIsLoading(true);
+
let sendMail;
for (let i = 0; i < emailList.length; i++) {
try {
@@ -39,6 +41,7 @@ function EmailComponent({
const openSignUrl = "https://www.opensignlabs.com/contact-us";
const themeBGcolor = themeColor;
let params = {
+ mailProvider: activeMailAdapter,
extUserId: extUserId,
pdfName: pdfName,
url: pdfUrl,
diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js
index 17189865a..3ec7bad23 100644
--- a/apps/OpenSign/src/constant/Utils.js
+++ b/apps/OpenSign/src/constant/Utils.js
@@ -537,7 +537,8 @@ export const signPdfFun = async (
signerObjectId,
setIsAlert,
objectId,
- isSubscribed
+ isSubscribed,
+ activeMailAdapter
) => {
let singleSign,
isCustomCompletionMail = false;
@@ -557,6 +558,7 @@ export const signPdfFun = async (
}
singleSign = {
+ mailProvider: activeMailAdapter,
pdfFile: base64Url,
docId: documentId,
userId: signerObjectId,
diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index 0d99d800e..9b83567da 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -24,7 +24,8 @@ import {
radioButtonWidget,
replaceMailVaribles,
fetchSubscription,
- convertPdfArrayBuffer
+ convertPdfArrayBuffer,
+ contractUsers
} from "../constant/Utils";
import Loader from "../primitives/LoaderWithMsg";
import HandleError from "../primitives/HandleError";
@@ -590,6 +591,20 @@ function PdfRequestFiles() {
);
//get ExistUserPtr object id of user class to get tenantDetails
const objectId = pdfDetails?.[0]?.ExtUserPtr?.UserId?.objectId;
+
+ const res = await contractUsers(jsonSender?.email);
+ console.log("res", res);
+ let activeMailAdapter = "";
+ if (res === "Error: Something went wrong!") {
+ setHandleError("Error: Something went wrong!");
+ setIsLoading({
+ isLoad: false
+ });
+ } else if (!res || res?.length === 0) {
+ activeMailAdapter = "";
+ } else if (res[0] && res.length) {
+ activeMailAdapter = res[0]?.active_mail_adapter;
+ }
//function for call to embed signature in pdf and get digital signature pdf
try {
const res = await signPdfFun(
@@ -598,7 +613,8 @@ function PdfRequestFiles() {
signerObjectId,
setIsAlert,
objectId,
- isSubscribed
+ isSubscribed,
+ activeMailAdapter
);
if (res && res.status === "success") {
setPdfUrl(res.data);
@@ -690,6 +706,7 @@ function PdfRequestFiles() {
}
let params = {
+ mailProvider: activeMailAdapter,
extUserId: extUserId,
recipient: user.Email,
subject: requestSubject
diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js
index cd11a1c03..cb8928940 100644
--- a/apps/OpenSign/src/pages/PlaceHolderSign.js
+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js
@@ -123,6 +123,7 @@ function PlaceHolderSign() {
const [requestSubject, setRequestSubject] = useState("");
const [requestBody, setRequestBody] = useState("");
const [pdfArrayBuffer, setPdfArrayBuffer] = useState("");
+ const [activeMailAdapter, setActiveMailAdapter] = useState("");
const [isAlreadyPlace, setIsAlreadyPlace] = useState({
status: false,
message: ""
@@ -406,7 +407,14 @@ function PlaceHolderSign() {
setIsLoading(loadObj);
}
const res = await contractUsers(jsonSender.email);
- if (res[0] && res.length) {
+ if (res === "Error: Something went wrong!") {
+ const loadObj = {
+ isLoad: false
+ };
+ setHandleError("Error: Something went wrong!");
+ setIsLoading(loadObj);
+ } else if (res[0] && res.length) {
+ setActiveMailAdapter(res[0]?.active_mail_adapter);
setSignerUserId(res[0].objectId);
const tourstatus = res[0].TourStatus && res[0].TourStatus;
if (tourstatus && tourstatus.length > 0) {
@@ -422,12 +430,6 @@ function PlaceHolderSign() {
isLoad: false
};
setIsLoading(loadObj);
- } else if (res === "Error: Something went wrong!") {
- const loadObj = {
- isLoad: false
- };
- setHandleError("Error: Something went wrong!");
- setIsLoading(loadObj);
} else if (res.length === 0) {
setHandleError("No Data Found!");
const loadObj = {
@@ -1104,6 +1106,7 @@ function PlaceHolderSign() {
}
let params = {
+ mailProvider: activeMailAdapter,
extUserId: extUserId,
recipient: signerMail[i].Email,
subject: isCustomize
diff --git a/apps/OpenSign/src/pages/SignyourselfPdf.js b/apps/OpenSign/src/pages/SignyourselfPdf.js
index 871b0c426..b14c6934c 100644
--- a/apps/OpenSign/src/pages/SignyourselfPdf.js
+++ b/apps/OpenSign/src/pages/SignyourselfPdf.js
@@ -104,6 +104,7 @@ function SignYourSelf() {
const [extUserId, setExtUserId] = useState("");
const [isCompleted, setIsCompleted] = useState(false);
const [pdfArrayBuffer, setPdfArrayBuffer] = useState("");
+ const [activeMailAdapter, setActiveMailAdapter] = useState("");
const divRef = useRef(null);
const nodeRef = useRef(null);
const [, drop] = useDrop({
@@ -266,7 +267,14 @@ function SignYourSelf() {
setIsLoading(loadObj);
});
const contractUsersRes = await contractUsers(jsonSender.email);
- if (contractUsersRes[0] && contractUsersRes.length > 0) {
+ if (contractUsersRes === "Error: Something went wrong!") {
+ const loadObj = {
+ isLoad: false
+ };
+ setHandleError("Error: Something went wrong!");
+ setIsLoading(loadObj);
+ } else if (contractUsersRes[0] && contractUsersRes.length > 0) {
+ setActiveMailAdapter(contractUsersRes[0]?.active_mail_adapter);
setContractName("_Users");
setSignerUserId(contractUsersRes[0].objectId);
const tourstatuss =
@@ -286,12 +294,6 @@ function SignYourSelf() {
isLoad: false
};
setIsLoading(loadObj);
- } else if (contractUsersRes === "Error: Something went wrong!") {
- const loadObj = {
- isLoad: false
- };
- setHandleError("Error: Something went wrong!");
- setIsLoading(loadObj);
} else if (contractUsersRes.length === 0) {
const contractContactBook = await contactBook(jsonSender.objectId);
if (contractContactBook && contractContactBook.length > 0) {
@@ -615,7 +617,8 @@ function SignYourSelf() {
let singleSign = {
pdfFile: base64Url,
docId: documentId,
- isCustomCompletionMail: isCustomCompletionMail
+ isCustomCompletionMail: isCustomCompletionMail,
+ mailProvider: activeMailAdapter
};
await axios
@@ -1138,6 +1141,7 @@ function SignYourSelf() {
sender={jsonSender}
setIsAlert={setIsAlert}
extUserId={extUserId}
+ activeMailAdapter={activeMailAdapter}
/>
{/* pdf header which contain funish back button */}
<Header