Skip to content

Commit 9bf4940

Browse files
ZathielZathiel
authored
Merge branch 'OpenSignLabs:staging' into staging
2 parents a653df6 + 5ada9a4 commit 9bf4940

25 files changed

+117
-99
lines changed

‎apps/OpenSign/src/components/AddSigner.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const AddSigner = (props) => {
2323
);
2424
if (savedUserDetails && addYourself) {
2525
setName(savedUserDetails.name);
26-
setPhone(savedUserDetails.phone);
26+
setPhone(savedUserDetails?.phone || "");
2727
setEmail(savedUserDetails.email);
2828
}
2929
}, [addYourself]);
@@ -79,11 +79,9 @@ const AddSigner = (props) => {
7979
_user.set("name", name);
8080
_user.set("username", email);
8181
_user.set("email", email);
82+
_user.set("password", email);
8283
if (phone) {
8384
_user.set("phone", phone);
84-
_user.set("password", phone);
85-
} else {
86-
_user.set("password", email);
8785
}
8886
const user = await _user.save();
8987
if (user) {

‎apps/OpenSign/src/components/AddUser.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ const AddUser = (props) => {
6262
_user.set("name", name);
6363
_user.set("username", email);
6464
_user.set("email", email);
65-
_user.set("phone", phone);
66-
_user.set("password", phone);
65+
_user.set("password", email);
66+
if (phone) {
67+
_user.set("phone", phone);
68+
}
6769

6870
const user = await _user.save();
6971
if (user) {

‎apps/OpenSign/src/components/LoginFacebook.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const LoginFacebook = ({
4949
const extRes = await Parse.Cloud.run("getUserDetails", params);
5050
// console.log("extRes ", extRes);
5151
if (extRes) {
52-
const params = { ...details, Phone: extRes.get("Phone") };
52+
const params = { ...details, Phone: extRes?.get("Phone") || "" };
5353
const payload = await Parse.Cloud.run("facebooksign", params);
5454
// console.log("payload ", payload);
5555
if (payload && payload.sessiontoken) {
@@ -59,7 +59,7 @@ const LoginFacebook = ({
5959
const LocalUserDetails = {
6060
name: details.Name,
6161
email: details.Email,
62-
phone: extRes.get("Phone"),
62+
phone: extRes?.get("Phone") || "",
6363
company: extRes.get("Company")
6464
};
6565
localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));
@@ -75,7 +75,7 @@ const LoginFacebook = ({
7575
const handleSubmitbtn = async () => {
7676
if (userDetails.Phone && userDetails.Company) {
7777
setThirdpartyLoader(true);
78-
const params = { ...fBDetails, Phone: userDetails.Phone };
78+
const params = { ...fBDetails, Phone: userDetails?.Phone || "" };
7979
const payload = await Parse.Cloud.run("facebooksign", params);
8080
// console.log("payload ", payload);
8181

@@ -85,7 +85,7 @@ const LoginFacebook = ({
8585
name: userDetails.Name,
8686
email: userDetails.Email,
8787
// "passsword":userDetails.Phone,
88-
phone: userDetails.Phone,
88+
phone: userDetails?.Phone || "",
8989
role: "contracts_User",
9090
company: userDetails.Company
9191
}
@@ -96,7 +96,7 @@ const LoginFacebook = ({
9696
const LocalUserDetails = {
9797
name: userDetails.Name,
9898
email: userDetails.Email,
99-
phone: userDetails.Phone,
99+
phone: userDetails?.Phone || "",
100100
company: userDetails.Company
101101
};
102102
localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));

‎apps/OpenSign/src/components/LoginGoogle.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const GoogleSignInBtn = ({
110110
const extRes = await Parse.Cloud.run("getUserDetails", params);
111111
// console.log("extRes ", extRes);
112112
if (extRes) {
113-
const params = { ...details, Phone: extRes.get("Phone") };
113+
const params = { ...details, Phone: extRes?.get("Phone") || "" };
114114
const payload = await Parse.Cloud.run("googlesign", params);
115115
// console.log("payload ", payload);
116116
if (payload && payload.sessiontoken) {
@@ -121,7 +121,7 @@ const GoogleSignInBtn = ({
121121
const LocalUserDetails = {
122122
name: details.Name,
123123
email: details.Gmail,
124-
phone: extRes.get("Phone"),
124+
phone: extRes?.get("Phone") || "",
125125
company: extRes.get("Company")
126126
};
127127
localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));
@@ -139,7 +139,7 @@ const GoogleSignInBtn = ({
139139
setThirdpartyLoader(true);
140140
// e.preventDefault()
141141
// console.log("handelSubmit", userDetails);
142-
const params = { ...googleDetails, Phone: userDetails.Phone };
142+
const params = { ...googleDetails, Phone: userDetails?.Phone };
143143
const payload = await Parse.Cloud.run("googlesign", params);
144144

145145
// console.log("payload ", payload);
@@ -149,7 +149,7 @@ const GoogleSignInBtn = ({
149149
name: userDetails.Name,
150150
email: userDetails.Email,
151151
// "passsword":userDetails.Phone,
152-
phone: userDetails.Phone,
152+
phone: userDetails?.Phone || "",
153153
role: "contracts_User",
154154
company: userDetails.Company,
155155
jobTitle: userDetails.Destination
@@ -161,7 +161,7 @@ const GoogleSignInBtn = ({
161161
const LocalUserDetails = {
162162
name: userDetails.Name,
163163
email: userDetails.Email,
164-
phone: userDetails.Phone,
164+
phone: userDetails?.Phone || "",
165165
company: userDetails.Company
166166
// jobTitle: userDetails.JobTitle
167167
};

‎apps/OpenSign/src/pages/Pgsignup.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ const PgSignUp = () => {
127127
user.set("username", zohoRes.data.result.email);
128128
user.set("password", obj.password);
129129
user.set("email", zohoRes.data.result.email);
130-
user.set("phone", zohoRes.data.result.phone);
130+
if (zohoRes?.data?.result?.phone) {
131+
user.set("phone", zohoRes.data.result.phone);
132+
}
131133
user.set("name", zohoRes.data.result.name);
132134

133135
const res = await user.signUp();
@@ -140,7 +142,7 @@ const PgSignUp = () => {
140142
company: zohoRes.data.result.company,
141143
name: zohoRes.data.result.name,
142144
email: zohoRes.data.result.email,
143-
phone: zohoRes.data.result.phone,
145+
phone: zohoRes?.data?.result?.phone || "",
144146
role: obj.role
145147
},
146148
subscription: zohoRes.data.result.subscription

‎apps/OpenSign/src/pages/PlaceHolderSign.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,10 +1108,10 @@ function PlaceHolderSign() {
11081108
document_title: documentName,
11091109
sender_name: senderName,
11101110
sender_mail: senderEmail,
1111-
sender_phone: senderPhone,
1111+
sender_phone: senderPhone || "",
11121112
receiver_name: signerMail[i].Name,
11131113
receiver_email: signerMail[i].Email,
1114-
receiver_phone: signerMail[i].Phone,
1114+
receiver_phone: signerMail[i]?.Phone || "",
11151115
expiry_date: localExpireDate,
11161116
company_name: orgName,
11171117
signing_url: `<a href=${signPdf}>Sign here</a>`

‎apps/OpenSign/src/pages/UserProfile.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function UserProfile() {
8686
await query.get(UserProfile.objectId).then((object) => {
8787
object.set("name", name);
8888
object.set("ProfilePic", Image);
89-
object.set("phone", phn);
89+
object.set("phone", phn || "");
9090

9191
object.save().then(
9292
async (response) => {
@@ -95,11 +95,11 @@ function UserProfile() {
9595
let rr = JSON.stringify(res);
9696
localStorage.setItem("UserInformation", rr);
9797
SetName(res.name);
98-
SetPhone(res.phone);
98+
SetPhone(res?.phone || "");
9999
setImage(res.ProfilePic);
100100
localStorage.setItem("username", res.name);
101101
localStorage.setItem("profileImg", res.ProfilePic);
102-
await updateExtUser({ Name: res.name, Phone: res.phone });
102+
await updateExtUser({ Name: res.name, Phone: res?.phone || "" });
103103
alert("Profile updated successfully.");
104104
setEditMode(false);
105105
navigate("/dashboard/35KBoSgoAK");
@@ -124,7 +124,7 @@ function UserProfile() {
124124
const ExtUserId = extData[0].objectId;
125125

126126
const body = {
127-
Phone: obj.Phone,
127+
Phone: obj?.Phone || "",
128128
Name: obj.Name,
129129
HeaderDocId: isDisableDocId,
130130
JobTitle: jobTitle,

‎apps/OpenSign/src/primitives/AddUser.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const AddUser = (props) => {
2121
);
2222
if (savedUserDetails && addYourself) {
2323
setName(savedUserDetails.name);
24-
setPhone(savedUserDetails.phone);
24+
setPhone(savedUserDetails?.phone || "");
2525
setEmail(savedUserDetails.email);
2626
}
2727
}, [addYourself]);
@@ -68,8 +68,10 @@ const AddUser = (props) => {
6868
_user.set("name", name);
6969
_user.set("username", email);
7070
_user.set("email", email);
71-
_user.set("phone", phone);
72-
_user.set("password", phone);
71+
if (phone) {
72+
_user.set("phone", phone);
73+
}
74+
_user.set("email", email);
7375

7476
const user = await _user.save();
7577
if (user) {
@@ -245,10 +247,10 @@ const AddUser = (props) => {
245247
type="email"
246248
id="email"
247249
value={email}
248-
onChange={(e) => setEmail(e.target.value)}
250+
onChange={(e) => setEmail(e.target.value?.toLowerCase())}
249251
required
250252
disabled={addYourself}
251-
className="addUserInput"
253+
className="addUserInput lowercase"
252254
/>
253255
</div>
254256
<div className="form-section">

‎apps/OpenSign/src/primitives/GetReportDisplay.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -480,10 +480,10 @@ const ReportTable = (props) => {
480480
document_title: doc.Name,
481481
sender_name: doc.ExtUserPtr.Name,
482482
sender_mail: doc.ExtUserPtr.Email,
483-
sender_phone: doc.ExtUserPtr.Phone,
483+
sender_phone: doc.ExtUserPtr?.Phone || "",
484484
receiver_name: userDetails.Name,
485485
receiver_email: userDetails.Email,
486-
receiver_phone: userDetails.Phone,
486+
receiver_phone: userDetails?.Phone || "",
487487
expiry_date: localExpireDate,
488488
company_name: doc.ExtUserPtr.Company,
489489
signing_url: `<a href=${signPdf}>Sign here</a>`
@@ -509,10 +509,10 @@ const ReportTable = (props) => {
509509
document_title: doc.Name,
510510
sender_name: doc.ExtUserPtr.Name,
511511
sender_mail: doc.ExtUserPtr.Email,
512-
sender_phone: doc.ExtUserPtr.Phone,
512+
sender_phone: doc.ExtUserPtr?.Phone || "",
513513
receiver_name: userDetails.Name,
514514
receiver_email: userDetails.Email,
515-
receiver_phone: userDetails.Phone,
515+
receiver_phone: userDetails?.Phone || "",
516516
expiry_date: localExpireDate,
517517
company_name: doc.ExtUserPtr.Company,
518518
signing_url: `<a href=${signPdf}>Sign here</a>`
@@ -540,10 +540,10 @@ const ReportTable = (props) => {
540540
document_title: doc.Name,
541541
sender_name: doc.ExtUserPtr.Name,
542542
sender_mail: doc.ExtUserPtr.Email,
543-
sender_phone: doc.ExtUserPtr.Phone,
543+
sender_phone: doc.ExtUserPtr?.Phone || "",
544544
receiver_name: user.Name,
545545
receiver_email: user.Email,
546-
receiver_phone: user.Phone,
546+
receiver_phone: user?.Phone || "",
547547
expiry_date: localExpireDate,
548548
company_name: doc?.ExtUserPtr?.Company || "",
549549
signing_url: `<a href=${signPdf}>Sign here</a>`

‎apps/OpenSignServer/cloud/customRoute/autoReminder.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ async function sendMail(doc, signer, mailcount) {
4646
document_title: doc.Name,
4747
sender_name: doc.ExtUserPtr.Name,
4848
sender_mail: doc.ExtUserPtr.Email,
49-
sender_phone: doc.ExtUserPtr.Phone,
49+
sender_phone: doc.ExtUserPtr?.Phone || '',
5050
receiver_name: signer.Name,
5151
receiver_email: signer.Email,
52-
receiver_phone: signer.Phone,
52+
receiver_phone: signer?.Phone || '',
5353
expiry_date: localExpireDate,
5454
company_name: doc?.ExtUserPtr?.Company || '',
5555
signing_url: `<a href=${signPdf}>Sign here</a>`,

0 commit comments

Comments
 (0)