Skip to content

Commit 8eef178

Browse files
prafull-opensignlabsprafull-opensignlabs
committed
fix: correct email validation in forms
1 parent 3db3297 commit 8eef178

File tree

12 files changed

+758
-670
lines changed

12 files changed

+758
-670
lines changed

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

Lines changed: 119 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React, { useState, useEffect } from "react";
22
import Parse from "parse";
33
import Loader from "../primitives/Loader";
44
import { useTranslation } from "react-i18next";
5+
import { emailRegex } from "../constant/const";
56

67
const AddSigner = (props) => {
78
const { t } = useTranslation();
@@ -47,139 +48,143 @@ const AddSigner = (props) => {
4748
const handleSubmit = async (e) => {
4849
e.preventDefault();
4950
e.stopPropagation();
50-
setIsLoader(true);
51-
if (localStorage.getItem("TenantId")) {
52-
try {
53-
const user = Parse.User.current();
54-
const query = new Parse.Query("contracts_Contactbook");
55-
query.equalTo("CreatedBy", user);
56-
query.notEqualTo("IsDeleted", true);
57-
query.equalTo("Email", email);
58-
const res = await query.first();
59-
// console.log(res);
60-
if (!res) {
61-
const contactQuery = new Parse.Object("contracts_Contactbook");
62-
contactQuery.set("Name", name);
63-
if (phone) {
64-
contactQuery.set("Phone", phone);
65-
}
66-
contactQuery.set("Email", email);
67-
contactQuery.set("UserRole", "contracts_Guest");
68-
69-
contactQuery.set("TenantId", {
70-
__type: "Pointer",
71-
className: "partners_Tenant",
72-
objectId: localStorage.getItem("TenantId")
73-
});
74-
75-
try {
76-
const _users = Parse.Object.extend("User");
77-
const _user = new _users();
78-
_user.set("name", name);
79-
_user.set("username", email);
80-
_user.set("email", email);
81-
_user.set("password", email);
51+
if (!emailRegex.test(email)) {
52+
alert("Please enter a valid email address.");
53+
} else {
54+
setIsLoader(true);
55+
if (localStorage.getItem("TenantId")) {
56+
try {
57+
const user = Parse.User.current();
58+
const query = new Parse.Query("contracts_Contactbook");
59+
query.equalTo("CreatedBy", user);
60+
query.notEqualTo("IsDeleted", true);
61+
query.equalTo("Email", email);
62+
const res = await query.first();
63+
// console.log(res);
64+
if (!res) {
65+
const contactQuery = new Parse.Object("contracts_Contactbook");
66+
contactQuery.set("Name", name);
8267
if (phone) {
83-
_user.set("phone", phone);
68+
contactQuery.set("Phone", phone);
8469
}
85-
const user = await _user.save();
86-
if (user) {
87-
const currentUser = Parse.User.current();
88-
contactQuery.set(
89-
"CreatedBy",
90-
Parse.User.createWithoutData(currentUser.id)
91-
);
70+
contactQuery.set("Email", email);
71+
contactQuery.set("UserRole", "contracts_Guest");
9272

93-
contactQuery.set("UserId", user);
94-
const acl = new Parse.ACL();
95-
acl.setPublicReadAccess(true);
96-
acl.setPublicWriteAccess(true);
97-
acl.setReadAccess(currentUser.id, true);
98-
acl.setWriteAccess(currentUser.id, true);
73+
contactQuery.set("TenantId", {
74+
__type: "Pointer",
75+
className: "partners_Tenant",
76+
objectId: localStorage.getItem("TenantId")
77+
});
9978

100-
contactQuery.setACL(acl);
79+
try {
80+
const _users = Parse.Object.extend("User");
81+
const _user = new _users();
82+
_user.set("name", name);
83+
_user.set("username", email);
84+
_user.set("email", email);
85+
_user.set("password", email);
86+
if (phone) {
87+
_user.set("phone", phone);
88+
}
89+
const user = await _user.save();
90+
if (user) {
91+
const currentUser = Parse.User.current();
92+
contactQuery.set(
93+
"CreatedBy",
94+
Parse.User.createWithoutData(currentUser.id)
95+
);
10196

102-
const res = await contactQuery.save();
97+
contactQuery.set("UserId", user);
98+
const acl = new Parse.ACL();
99+
acl.setPublicReadAccess(true);
100+
acl.setPublicWriteAccess(true);
101+
acl.setReadAccess(currentUser.id, true);
102+
acl.setWriteAccess(currentUser.id, true);
103103

104-
const parseData = JSON.parse(JSON.stringify(res));
105-
if (props.details) {
106-
props.details({
107-
value: parseData[props.valueKey],
108-
label: parseData[props.displayKey]
109-
});
110-
}
111-
if (props.closePopup) {
112-
props.closePopup();
113-
}
114-
if (props.handleUserData) {
115-
props.handleUserData(parseData);
116-
}
104+
contactQuery.setACL(acl);
117105

118-
setIsLoader(false);
119-
// Reset the form fields
120-
setAddYourself(false);
121-
setName("");
122-
setPhone("");
123-
setEmail("");
124-
}
125-
} catch (err) {
126-
console.log("err ", err);
127-
if (err.code === 202) {
128-
const params = { email: email };
129-
const userRes = await Parse.Cloud.run("getUserId", params);
130-
const currentUser = Parse.User.current();
131-
contactQuery.set(
132-
"CreatedBy",
133-
Parse.User.createWithoutData(currentUser.id)
134-
);
106+
const res = await contactQuery.save();
135107

136-
contactQuery.set("UserId", {
137-
__type: "Pointer",
138-
className: "_User",
139-
objectId: userRes.id
140-
});
141-
const acl = new Parse.ACL();
142-
acl.setPublicReadAccess(true);
143-
acl.setPublicWriteAccess(true);
144-
acl.setReadAccess(currentUser.id, true);
145-
acl.setWriteAccess(currentUser.id, true);
108+
const parseData = JSON.parse(JSON.stringify(res));
109+
if (props.details) {
110+
props.details({
111+
value: parseData[props.valueKey],
112+
label: parseData[props.displayKey]
113+
});
114+
}
115+
if (props.closePopup) {
116+
props.closePopup();
117+
}
118+
if (props.handleUserData) {
119+
props.handleUserData(parseData);
120+
}
146121

147-
contactQuery.setACL(acl);
148-
const res = await contactQuery.save();
122+
setIsLoader(false);
123+
// Reset the form fields
124+
setAddYourself(false);
125+
setName("");
126+
setPhone("");
127+
setEmail("");
128+
}
129+
} catch (err) {
130+
console.log("err ", err);
131+
if (err.code === 202) {
132+
const params = { email: email };
133+
const userRes = await Parse.Cloud.run("getUserId", params);
134+
const currentUser = Parse.User.current();
135+
contactQuery.set(
136+
"CreatedBy",
137+
Parse.User.createWithoutData(currentUser.id)
138+
);
149139

150-
const parseData = JSON.parse(JSON.stringify(res));
151-
if (props.details) {
152-
props.details({
153-
value: parseData[props.valueKey],
154-
label: parseData[props.displayKey]
140+
contactQuery.set("UserId", {
141+
__type: "Pointer",
142+
className: "_User",
143+
objectId: userRes.id
155144
});
145+
const acl = new Parse.ACL();
146+
acl.setPublicReadAccess(true);
147+
acl.setPublicWriteAccess(true);
148+
acl.setReadAccess(currentUser.id, true);
149+
acl.setWriteAccess(currentUser.id, true);
150+
151+
contactQuery.setACL(acl);
152+
const res = await contactQuery.save();
153+
154+
const parseData = JSON.parse(JSON.stringify(res));
155+
if (props.details) {
156+
props.details({
157+
value: parseData[props.valueKey],
158+
label: parseData[props.displayKey]
159+
});
160+
}
161+
if (props.closePopup) {
162+
props.closePopup();
163+
}
164+
if (props.handleUserData) {
165+
props.handleUserData(parseData);
166+
}
167+
setIsLoader(false);
168+
// Reset the form fields
169+
setAddYourself(false);
170+
setName("");
171+
setPhone("");
172+
setEmail("");
156173
}
157-
if (props.closePopup) {
158-
props.closePopup();
159-
}
160-
if (props.handleUserData) {
161-
props.handleUserData(parseData);
162-
}
163-
setIsLoader(false);
164-
// Reset the form fields
165-
setAddYourself(false);
166-
setName("");
167-
setPhone("");
168-
setEmail("");
169174
}
175+
} else {
176+
alert(t("add-signer-alert"));
177+
setIsLoader(false);
170178
}
171-
} else {
172-
alert(t("add-signer-alert"));
179+
} catch (err) {
180+
console.log("err in fetch contact", err);
173181
setIsLoader(false);
182+
alert(t("something-went-wrong-mssg"));
174183
}
175-
} catch (err) {
176-
console.log("err in fetch contact", err);
184+
} else {
177185
setIsLoader(false);
178186
alert(t("something-went-wrong-mssg"));
179187
}
180-
} else {
181-
setIsLoader(false);
182-
alert(t("something-went-wrong-mssg"));
183188
}
184189
};
185190

0 commit comments

Comments
 (0)