π₯ The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
fix: make phone field optional for contact
prafull-opensignlabs6f50de1ef1a3
diff --git a/apps/OpenSign/src/components/AddSigner.js b/apps/OpenSign/src/components/AddSigner.jsindex 0e0c4e025..c99eff406 100644--- a/apps/OpenSign/src/components/AddSigner.js+++ b/apps/OpenSign/src/components/AddSigner.js@@ -23,7 +23,7 @@ const AddSigner = (props) => {);if (savedUserDetails && addYourself) {setName(savedUserDetails.name);- setPhone(savedUserDetails.phone);+ setPhone(savedUserDetails?.phone || "");setEmail(savedUserDetails.email);}}, [addYourself]);@@ -79,11 +79,9 @@ const AddSigner = (props) => {_user.set("name", name);_user.set("username", email);_user.set("email", email);+ _user.set("password", email);if (phone) {_user.set("phone", phone);- _user.set("password", phone);- } else {- _user.set("password", email);}const user = await _user.save();if (user) {diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.jsindex d812a1cd0..8d40db895 100644--- a/apps/OpenSign/src/components/AddUser.js+++ b/apps/OpenSign/src/components/AddUser.js@@ -62,8 +62,10 @@ const AddUser = (props) => {_user.set("name", name);_user.set("username", email);_user.set("email", email);- _user.set("phone", phone);- _user.set("password", phone);+ _user.set("password", email);+ if (phone) {+ _user.set("phone", phone);+ }const user = await _user.save();if (user) {diff --git a/apps/OpenSign/src/components/LoginFacebook.js b/apps/OpenSign/src/components/LoginFacebook.jsindex 033208d57..f9ca16a30 100644--- a/apps/OpenSign/src/components/LoginFacebook.js+++ b/apps/OpenSign/src/components/LoginFacebook.js@@ -49,7 +49,7 @@ const LoginFacebook = ({const extRes = await Parse.Cloud.run("getUserDetails", params);// console.log("extRes ", extRes);if (extRes) {- const params = { ...details, Phone: extRes.get("Phone") };+ const params = { ...details, Phone: extRes?.get("Phone") || "" };const payload = await Parse.Cloud.run("facebooksign", params);// console.log("payload ", payload);if (payload && payload.sessiontoken) {@@ -59,7 +59,7 @@ const LoginFacebook = ({const LocalUserDetails = {name: details.Name,email: details.Email,- phone: extRes.get("Phone"),+ phone: extRes?.get("Phone") || "",company: extRes.get("Company")};localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));@@ -75,7 +75,7 @@ const LoginFacebook = ({const handleSubmitbtn = async () => {if (userDetails.Phone && userDetails.Company) {setThirdpartyLoader(true);- const params = { ...fBDetails, Phone: userDetails.Phone };+ const params = { ...fBDetails, Phone: userDetails?.Phone || "" };const payload = await Parse.Cloud.run("facebooksign", params);// console.log("payload ", payload);@@ -85,7 +85,7 @@ const LoginFacebook = ({name: userDetails.Name,email: userDetails.Email,// "passsword":userDetails.Phone,- phone: userDetails.Phone,+ phone: userDetails?.Phone || "",role: "contracts_User",company: userDetails.Company}@@ -96,7 +96,7 @@ const LoginFacebook = ({const LocalUserDetails = {name: userDetails.Name,email: userDetails.Email,- phone: userDetails.Phone,+ phone: userDetails?.Phone || "",company: userDetails.Company};localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.jsindex 469352b52..7bb53017b 100644--- a/apps/OpenSign/src/components/LoginGoogle.js+++ b/apps/OpenSign/src/components/LoginGoogle.js@@ -110,7 +110,7 @@ const GoogleSignInBtn = ({const extRes = await Parse.Cloud.run("getUserDetails", params);// console.log("extRes ", extRes);if (extRes) {- const params = { ...details, Phone: extRes.get("Phone") };+ const params = { ...details, Phone: extRes?.get("Phone") || "" };const payload = await Parse.Cloud.run("googlesign", params);// console.log("payload ", payload);if (payload && payload.sessiontoken) {@@ -121,7 +121,7 @@ const GoogleSignInBtn = ({const LocalUserDetails = {name: details.Name,email: details.Gmail,- phone: extRes.get("Phone"),+ phone: extRes?.get("Phone") || "",company: extRes.get("Company")};localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));@@ -139,7 +139,7 @@ const GoogleSignInBtn = ({setThirdpartyLoader(true);// e.preventDefault()// console.log("handelSubmit", userDetails);- const params = { ...googleDetails, Phone: userDetails.Phone };+ const params = { ...googleDetails, Phone: userDetails?.Phone };const payload = await Parse.Cloud.run("googlesign", params);// console.log("payload ", payload);@@ -149,7 +149,7 @@ const GoogleSignInBtn = ({name: userDetails.Name,email: userDetails.Email,// "passsword":userDetails.Phone,- phone: userDetails.Phone,+ phone: userDetails?.Phone || "",role: "contracts_User",company: userDetails.Company,jobTitle: userDetails.Destination@@ -161,7 +161,7 @@ const GoogleSignInBtn = ({const LocalUserDetails = {name: userDetails.Name,email: userDetails.Email,- phone: userDetails.Phone,+ phone: userDetails?.Phone || "",company: userDetails.Company// jobTitle: userDetails.JobTitle};diff --git a/apps/OpenSign/src/pages/Pgsignup.js b/apps/OpenSign/src/pages/Pgsignup.jsindex f0310adce..3570e25b5 100644--- a/apps/OpenSign/src/pages/Pgsignup.js+++ b/apps/OpenSign/src/pages/Pgsignup.js@@ -127,7 +127,9 @@ const PgSignUp = () => {user.set("username", zohoRes.data.result.email);user.set("password", obj.password);user.set("email", zohoRes.data.result.email);- user.set("phone", zohoRes.data.result.phone);+ if (zohoRes?.data?.result?.phone) {+ user.set("phone", zohoRes.data.result.phone);+ }user.set("name", zohoRes.data.result.name);const res = await user.signUp();@@ -140,7 +142,7 @@ const PgSignUp = () => {company: zohoRes.data.result.company,name: zohoRes.data.result.name,email: zohoRes.data.result.email,- phone: zohoRes.data.result.phone,+ phone: zohoRes?.data?.result?.phone || "",role: obj.role},subscription: zohoRes.data.result.subscriptiondiff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.jsindex a705d9525..6e9fa46a9 100644--- a/apps/OpenSign/src/pages/PlaceHolderSign.js+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js@@ -1108,10 +1108,10 @@ function PlaceHolderSign() {document_title: documentName,sender_name: senderName,sender_mail: senderEmail,- sender_phone: senderPhone,+ sender_phone: senderPhone || "",receiver_name: signerMail[i].Name,receiver_email: signerMail[i].Email,- receiver_phone: signerMail[i].Phone,+ receiver_phone: signerMail[i]?.Phone || "",expiry_date: localExpireDate,company_name: orgName,signing_url: `<a href=${signPdf}>Sign here</a>`diff --git a/apps/OpenSign/src/pages/UserProfile.js b/apps/OpenSign/src/pages/UserProfile.jsindex 813d8ab52..6b7cd6172 100644--- a/apps/OpenSign/src/pages/UserProfile.js+++ b/apps/OpenSign/src/pages/UserProfile.js@@ -86,7 +86,7 @@ function UserProfile() {await query.get(UserProfile.objectId).then((object) => {object.set("name", name);object.set("ProfilePic", Image);- object.set("phone", phn);+ object.set("phone", phn || "");object.save().then(async (response) => {@@ -95,11 +95,11 @@ function UserProfile() {let rr = JSON.stringify(res);localStorage.setItem("UserInformation", rr);SetName(res.name);- SetPhone(res.phone);+ SetPhone(res?.phone || "");setImage(res.ProfilePic);localStorage.setItem("username", res.name);localStorage.setItem("profileImg", res.ProfilePic);- await updateExtUser({ Name: res.name, Phone: res.phone });+ await updateExtUser({ Name: res.name, Phone: res?.phone || "" });alert("Profile updated successfully.");setEditMode(false);navigate("/dashboard/35KBoSgoAK");@@ -124,7 +124,7 @@ function UserProfile() {const ExtUserId = extData[0].objectId;const body = {- Phone: obj.Phone,+ Phone: obj?.Phone || "",Name: obj.Name,HeaderDocId: isDisableDocId,JobTitle: jobTitle,diff --git a/apps/OpenSign/src/primitives/AddUser.js b/apps/OpenSign/src/primitives/AddUser.jsindex ee24e8ce0..c62fe11eb 100644--- a/apps/OpenSign/src/primitives/AddUser.js+++ b/apps/OpenSign/src/primitives/AddUser.js@@ -21,7 +21,7 @@ const AddUser = (props) => {);if (savedUserDetails && addYourself) {setName(savedUserDetails.name);- setPhone(savedUserDetails.phone);+ setPhone(savedUserDetails?.phone || "");setEmail(savedUserDetails.email);}}, [addYourself]);@@ -68,8 +68,10 @@ const AddUser = (props) => {_user.set("name", name);_user.set("username", email);_user.set("email", email);- _user.set("phone", phone);- _user.set("password", phone);+ if (phone) {+ _user.set("phone", phone);+ }+ _user.set("email", email);const user = await _user.save();if (user) {@@ -245,10 +247,10 @@ const AddUser = (props) => {type="email"id="email"value={email}- onChange={(e) => setEmail(e.target.value)}+ onChange={(e) => setEmail(e.target.value?.toLowerCase())}requireddisabled={addYourself}- className="addUserInput"+ className="addUserInput lowercase"/></div><div className="form-section">diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.jsindex e898384ad..2daf17a70 100644--- a/apps/OpenSign/src/primitives/GetReportDisplay.js+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js@@ -480,10 +480,10 @@ const ReportTable = (props) => {document_title: doc.Name,sender_name: doc.ExtUserPtr.Name,sender_mail: doc.ExtUserPtr.Email,- sender_phone: doc.ExtUserPtr.Phone,+ sender_phone: doc.ExtUserPtr?.Phone || "",receiver_name: userDetails.Name,receiver_email: userDetails.Email,- receiver_phone: userDetails.Phone,+ receiver_phone: userDetails?.Phone || "",expiry_date: localExpireDate,company_name: doc.ExtUserPtr.Company,signing_url: `<a href=${signPdf}>Sign here</a>`@@ -509,10 +509,10 @@ const ReportTable = (props) => {document_title: doc.Name,sender_name: doc.ExtUserPtr.Name,sender_mail: doc.ExtUserPtr.Email,- sender_phone: doc.ExtUserPtr.Phone,+ sender_phone: doc.ExtUserPtr?.Phone || "",receiver_name: userDetails.Name,receiver_email: userDetails.Email,- receiver_phone: userDetails.Phone,+ receiver_phone: userDetails?.Phone || "",expiry_date: localExpireDate,company_name: doc.ExtUserPtr.Company,signing_url: `<a href=${signPdf}>Sign here</a>`@@ -540,10 +540,10 @@ const ReportTable = (props) => {document_title: doc.Name,sender_name: doc.ExtUserPtr.Name,sender_mail: doc.ExtUserPtr.Email,- sender_phone: doc.ExtUserPtr.Phone,+ sender_phone: doc.ExtUserPtr?.Phone || "",receiver_name: user.Name,receiver_email: user.Email,- receiver_phone: user.Phone,+ receiver_phone: user?.Phone || "",expiry_date: localExpireDate,company_name: doc?.ExtUserPtr?.Company || "",signing_url: `<a href=${signPdf}>Sign here</a>`diff --git a/apps/OpenSignServer/cloud/customRoute/autoReminder.js b/apps/OpenSignServer/cloud/customRoute/autoReminder.jsindex de8da2cbd..b8d92606d 100644--- a/apps/OpenSignServer/cloud/customRoute/autoReminder.js+++ b/apps/OpenSignServer/cloud/customRoute/autoReminder.js@@ -46,10 +46,10 @@ async function sendMail(doc, signer, mailcount) {document_title: doc.Name,sender_name: doc.ExtUserPtr.Name,sender_mail: doc.ExtUserPtr.Email,- sender_phone: doc.ExtUserPtr.Phone,+ sender_phone: doc.ExtUserPtr?.Phone || '',receiver_name: signer.Name,receiver_email: signer.Email,- receiver_phone: signer.Phone,+ receiver_phone: signer?.Phone || '',expiry_date: localExpireDate,company_name: doc?.ExtUserPtr?.Company || '',signing_url: `<a href=${signPdf}>Sign here</a>`,diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.jsindex 891cc8f3a..3922e9d94 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js@@ -265,10 +265,10 @@ export default async function createDocumentWithTemplate(request, response) {document_title: template.Name,sender_name: template.ExtUserPtr.Name,sender_mail: template.ExtUserPtr.Email,- sender_phone: template.ExtUserPtr.Phone,+ sender_phone: template.ExtUserPtr?.Phone || '',receiver_name: contactMail[i].name,receiver_email: contactMail[i].email,- receiver_phone: contactMail[i].phone,+ receiver_phone: contactMail[i]?.phone || '',expiry_date: localExpireDate,company_name: orgName,signing_url: signPdf,@@ -314,7 +314,11 @@ export default async function createDocumentWithTemplate(request, response) {name: template?.Name,note: template?.Note || '',description: template?.Description || '',- signers: contact?.map(x => ({ name: x.name, email: x.email, phone: x.phone })),+ signers: contact?.map(x => ({+ name: x.name,+ email: x.email,+ phone: x?.phone || '',+ })),createdAt: res.createdAt,};if (template.ExtUserPtr && template.ExtUserPtr?.Webhook) {diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.jsindex 9be0cd341..ed23e8f64 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createContact.js@@ -3,7 +3,7 @@ export default async function createContact(request, response) {const serverUrl = process.env.SERVER_URL;const appId = process.env.APP_ID;const name = request.body.name;- const phone = request.body.phone;+ const phone = request.body?.phone;const email = request.body.email;const reqToken = request.headers['x-api-token'];if (!reqToken) {@@ -49,7 +49,9 @@ export default async function createContact(request, response) {const contactQuery = new Parse.Object('contracts_Contactbook');contactQuery.set('Name', name);- contactQuery.set('Phone', phone);+ if (phone) {+ contactQuery.set('Phone', phone);+ }contactQuery.set('Email', email);contactQuery.set('UserRole', 'contracts_Guest');if (tenantRes && tenantRes.id) {@@ -65,8 +67,10 @@ export default async function createContact(request, response) {_user.set('name', name);_user.set('username', email);_user.set('email', email);- _user.set('phone', phone);- _user.set('password', phone);+ _user.set('password', email);+ if (phone) {+ _user.set('phone', phone);+ }const user = await _user.save();if (user) {@@ -106,7 +110,7 @@ export default async function createContact(request, response) {objectId: parseRes.objectId,name: parseRes.Name,email: parseRes.Email,- phone: parseRes.Phone,+ phone: parseRes?.Phone || '',createdAt: parseRes.createdAt,updatedAt: parseRes.updatedAt,});@@ -155,7 +159,7 @@ export default async function createContact(request, response) {objectId: parseRes.objectId,name: parseRes.Name,email: parseRes.Email,- phone: parseRes.Phone,+ phone: parseRes?.Phone || '',createdAt: parseRes.createdAt,updatedAt: parseRes.updatedAt,});diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.jsindex ba8971b31..602d92cfa 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js@@ -255,7 +255,7 @@ export default async function createDocumentwithCoordinate(request, response) {name: name,note: note || '',description: description || '',- signers: contact?.map(x => ({ name: x.name, email: x.email, phone: x.phone })),+ signers: contact?.map(x => ({ name: x.name, email: x.email, phone: x?.phone || '' })),createdAt: res.createdAt,};if (parseExtUser && parseExtUser.Webhook) {@@ -325,10 +325,10 @@ export default async function createDocumentwithCoordinate(request, response) {document_title: name,sender_name: parseExtUser.Name,sender_mail: parseExtUser.Email,- sender_phone: parseExtUser.Phone,+ sender_phone: parseExtUser?.Phone || '',receiver_name: contactMail[i].name,receiver_email: contactMail[i].email,- receiver_phone: contactMail[i].phone,+ receiver_phone: contactMail[i]?.phone || '',expiry_date: localExpireDate,company_name: orgName,signing_url: signPdf,diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.jsindex 6bff19bc2..3ee1c6f32 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js@@ -91,7 +91,7 @@ export default async function createTemplatewithCoordinate(request, response) {let createContactUrl = protocol + '/v1/createcontact';for (const [index, element] of parseSigners.entries()) {- if (element?.name && element.phone && element?.email) {+ if (element?.name && element?.email) {const body = {name: element?.name || '',email: element?.email || '',diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/getContact.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/getContact.jsindex e3d288586..81e15f767 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/getContact.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/getContact.js@@ -37,7 +37,7 @@ export default async function getContact(request, response) {objectId: parseRes.objectId,name: parseRes.Name,email: parseRes.Email,- phone: parseRes.Phone,+ phone: parseRes?.Phone || '',createdAt: parseRes.createdAt,updatedAt: parseRes.updatedAt,});diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/getContactList.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/getContactList.jsindex f20682c63..bed33476c 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/getContactList.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/getContactList.js@@ -31,7 +31,7 @@ export default async function getContactList(request, response) {objectId: x.objectId,name: x.Name,email: x.Email,- phone: x.Phone,+ phone: x?.Phone || '',createdAt: x.createdAt,updatedAt: x.updatedAt,}));diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/getUser.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/getUser.jsindex 45776036e..20224a63a 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/getUser.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/getUser.js@@ -37,7 +37,7 @@ export default async function getUser(request, response) {objectId: parseRes.objectId,name: parseRes.Name,email: parseRes.Email,- phone: parseRes.Phone,+ phone: parseRes?.Phone || '',jobTitle: parseRes.JobTitle,company: parseRes.Company,createdAt: parseRes.createdAt,diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.jsindex 1b0686c24..c1df00e8c 100644--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js@@ -97,10 +97,10 @@ export default async function resendMail(request, response) {document_title: title,sender_name: _resDoc.ExtUserPtr.Name,sender_mail: _resDoc.ExtUserPtr.Email,- sender_phone: _resDoc.ExtUserPtr.Phone,+ sender_phone: _resDoc.ExtUserPtr?.Phone || '',receiver_name: contact.Name,receiver_email: contact.Email,- receiver_phone: contact.Phone,+ receiver_phone: contact?.Phone || '',expiry_date: localExpireDate,company_name: orgName,signing_url: signPdf,diff --git a/apps/OpenSignServer/cloud/parsefunction/ContractUsersAftersave.js b/apps/OpenSignServer/cloud/parsefunction/ContractUsersAftersave.jsindex 1306c6b83..a6b41394c 100644--- a/apps/OpenSignServer/cloud/parsefunction/ContractUsersAftersave.js+++ b/apps/OpenSignServer/cloud/parsefunction/ContractUsersAftersave.js@@ -8,7 +8,9 @@ async function ContractUsersAftersave(request) {contactbook.set('Name', request.object.get('Name'));contactbook.set('Email', request.object.get('Email'));contactbook.set('ExtUserPtr', request.object.get('objectId'));- contactbook.set('Phone', request.object.get('Phone'));+ if (request.object?.get('Phone')) {+ contactbook.set('Phone', request.object.get('Phone'));+ }contactbook.set('ExtUserPtr', {__type: 'Pointer',className: 'contracts_Users',diff --git a/apps/OpenSignServer/cloud/parsefunction/FacebookSign.js b/apps/OpenSignServer/cloud/parsefunction/FacebookSign.jsindex 9fe510ead..8b7df821e 100644--- a/apps/OpenSignServer/cloud/parsefunction/FacebookSign.js+++ b/apps/OpenSignServer/cloud/parsefunction/FacebookSign.js@@ -1,4 +1,4 @@-import axios from "axios";+import axios from 'axios';const serverUrl = process.env.SERVER_URL;const APPID = process.env.APP_ID;@@ -18,23 +18,23 @@ export default async function FacebookSign(request) {const userGoogleId = request.params.Id;const userAccessToken = request.params.AccessToken;const userEmail = request.params.Email;- const phone = request.params.Phone;+ const phone = request.params?.Phone || '';const name = request.params.Name;const authData = {facebook: { id: userGoogleId, access_token: userAccessToken },};const userQuery = new Parse.Query(Parse.User);- userQuery.equalTo("email", userEmail);+ userQuery.equalTo('email', userEmail);const res = await userQuery.first({ useMasterKey: true });if (res) {try {const SignIn = await axios.put(- serverUrl + "/users/" + res.id,+ serverUrl + '/users/' + res.id,{ authData: authData },{headers: {- "X-Parse-Application-Id": APPID,- "X-Parse-Master-key": masterKEY,+ 'X-Parse-Application-Id': APPID,+ 'X-Parse-Master-key': masterKEY,},});@@ -42,22 +42,22 @@ export default async function FacebookSign(request) {if (SignIn.data) {// console.log("google Sign in", SignIn);const sessiontoken = SignIn.data.sessionToken;- console.log("Google sessiontoken", sessiontoken);+ console.log('Google sessiontoken', sessiontoken);return {email: userEmail,- message: "User Sign In",+ message: 'User Sign In',sessiontoken: sessiontoken,};}} catch (err) {- console.log("err in user google sign in", err);- return { message: "Internal server error" };+ console.log('err in user google sign in', err);+ return { message: 'Internal server error' };}} else {// console.log("in sign up condition");try {const SignUp = await axios.post(- serverUrl + "/users",+ serverUrl + '/users',{authData: authData,username: userEmail,@@ -67,8 +67,8 @@ export default async function FacebookSign(request) {},{headers: {- "X-Parse-Application-Id": APPID,- "X-Parse-Revocable-Session": "1",+ 'X-Parse-Application-Id': APPID,+ 'X-Parse-Revocable-Session': '1',},});@@ -79,14 +79,14 @@ export default async function FacebookSign(request) {const sessiontoken = SignUp.data.sessionToken;const payload = {email: userEmail,- message: "User Sign Up",+ message: 'User Sign Up',sessiontoken: sessiontoken,};return payload;}} catch (err) {- console.log("err in user google sign up", err);- return { message: "Internal server err" };+ console.log('err in user google sign up', err);+ return { message: 'Internal server err' };}}}diff --git a/apps/OpenSignServer/cloud/parsefunction/GoogleSign.js b/apps/OpenSignServer/cloud/parsefunction/GoogleSign.jsindex 757e2ba51..57a961ce8 100644--- a/apps/OpenSignServer/cloud/parsefunction/GoogleSign.js+++ b/apps/OpenSignServer/cloud/parsefunction/GoogleSign.js@@ -1,4 +1,4 @@-import axios from "axios";+import axios from 'axios';const serverUrl = process.env.SERVER_URL;const APPID = process.env.APP_ID;@@ -9,8 +9,8 @@ const masterKEY = process.env.MASTER_KEY;* @param Id It is google Id* @param TokenId It is google token Id* @param Gmail It is user's gmail with user sign in/sign up- * @param Phone It is user's Phone number- * @param Name It is user's Name+ * @param Phone It is user's Phone number+ * @param Name It is user's Name* @returns if success {email, message, sessiontoken} else on reject {message}*/@@ -18,21 +18,21 @@ export default async function GoogleSign(request) {const userGoogleId = request.params.Id;const userTokenId = request.params.TokenId;const userEmail = request.params.Gmail;- const phone = request.params.Phone;+ const phone = request.params?.Phone || '';const name = request.params.Name;const authData = { google: { id: userGoogleId, id_token: userTokenId } };const userQuery = new Parse.Query(Parse.User);- userQuery.equalTo("email", userEmail);+ userQuery.equalTo('email', userEmail);const res = await userQuery.first({ useMasterKey: true });if (res) {try {const SignIn = await axios.put(- serverUrl + "/users/" + res.id,+ serverUrl + '/users/' + res.id,{ authData: authData },{headers: {- "X-Parse-Application-Id": APPID,- "X-Parse-Master-key": masterKEY,+ 'X-Parse-Application-Id': APPID,+ 'X-Parse-Master-key': masterKEY,},});@@ -40,22 +40,22 @@ export default async function GoogleSign(request) {if (SignIn.data) {// console.log("google Sign in", SignIn);const sessiontoken = SignIn.data.sessionToken;- console.log("Google sessiontoken", sessiontoken);+ console.log('Google sessiontoken', sessiontoken);return {email: userEmail,- message: "User Sign In",+ message: 'User Sign In',sessiontoken: sessiontoken,};}} catch (err) {- console.log("err in user google sign in", err);- return { message: "Internal server error" };+ console.log('err in user google sign in', err);+ return { message: 'Internal server error' };}} else {// console.log("in sign up condition");try {const SignUp = await axios.post(- serverUrl + "/users",+ serverUrl + '/users',{authData: authData,username: userEmail,@@ -65,8 +65,8 @@ export default async function GoogleSign(request) {},{headers: {- "X-Parse-Application-Id": APPID,- "X-Parse-Revocable-Session": "1",+ 'X-Parse-Application-Id': APPID,+ 'X-Parse-Revocable-Session': '1',},});@@ -77,14 +77,14 @@ export default async function GoogleSign(request) {const sessiontoken = SignUp.data.sessionToken;const payload = {email: userEmail,- message: "User Sign Up",+ message: 'User Sign Up',sessiontoken: sessiontoken,};return payload;}} catch (err) {- console.log("err in user google sign up", err);- return { message: "Internal server err" };+ console.log('err in user google sign up', err);+ return { message: 'Internal server err' };}}}diff --git a/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js b/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.jsindex e926877ab..a92b6829c 100644--- a/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js+++ b/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js@@ -47,7 +47,7 @@ export default async function ZohoDetails(request) {userData.data.data.subscription.customer.cd_job_title) ||'';const resData = {- phone: userData.data.data.subscription.contactpersons[0].mobile,+ phone: userData.data.data.subscription.contactpersons[0]?.mobile || '',name: first_name + ' ' + last_name,email: userData.data.data.subscription.contactpersons[0].email,nextBillingDate: userData.data.data.subscription.next_billing_at,diff --git a/apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js b/apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.jsindex ddc7be964..6c433a8fd 100644--- a/apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js+++ b/apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js@@ -208,11 +208,9 @@ export default async function linkContactToDoc(req) {_user.set('name', name);_user.set('username', email);_user.set('email', email);+ _user.set('password', email);if (phone) {_user.set('phone', phone);- _user.set('password', phone);- } else {- _user.set('password', email);}const newUserRes = await _user.save();const contact = {diff --git a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.jsindex 86d5257e8..abd8ab148 100644--- a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js+++ b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js@@ -132,10 +132,10 @@ async function sendCompletedMail(obj) {document_title: pdfName,sender_name: sender.Name,sender_mail: sender.Email,- sender_phone: sender.Phone,+ sender_phone: sender?.Phone || '',receiver_name: sender.Name,receiver_email: sender.Email,- receiver_phone: sender.Phone,+ receiver_phone: sender?.Phone || '',expiry_date: localExpireDate,company_name: sender.Company,};diff --git a/apps/OpenSignServer/cloud/parsefunction/usersignup.js b/apps/OpenSignServer/cloud/parsefunction/usersignup.jsindex 9eebdc2e7..84a7a101e 100644--- a/apps/OpenSignServer/cloud/parsefunction/usersignup.js+++ b/apps/OpenSignServer/cloud/parsefunction/usersignup.js@@ -30,7 +30,9 @@ async function saveUser(userDetails) {user.set('username', userDetails.email);user.set('password', userDetails.password);user.set('email', userDetails.email);- user.set('phone', userDetails.phone);+ if (userDetails?.phone) {+ user.set('phone', userDetails.phone);+ }user.set('name', userDetails.name);const res = await user.signUp();@@ -77,7 +79,9 @@ export default async function usersignup(request) {objectId: user.id,});- partnerQuery.set('ContactNumber', userDetails.phone);+ if (userDetails?.phone) {+ partnerQuery.set('ContactNumber', userDetails.phone);+ }partnerQuery.set('TenantName', userDetails.name);partnerQuery.set('EmailAddress', userDetails.email);partnerQuery.set('IsActive', true);@@ -113,7 +117,9 @@ export default async function usersignup(request) {newObj.set('UserRole', userDetails.role);newObj.set('Email', userDetails.email);newObj.set('Name', userDetails.name);- newObj.set('Phone', userDetails.phone);+ if (userDetails?.phone) {+ newObj.set('Phone', userDetails?.phone);+ }newObj.set('TenantId', {__type: 'Pointer',className: 'partners_Tenant',