🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
fix: correct email validation in forms
prafull-opensignlabs8eef17834dd7
diff --git a/apps/OpenSign/src/components/AddSigner.js b/apps/OpenSign/src/components/AddSigner.jsindex 4f874669d..315808dc2 100644--- a/apps/OpenSign/src/components/AddSigner.js+++ b/apps/OpenSign/src/components/AddSigner.js@@ -2,6 +2,7 @@ import React, { useState, useEffect } from "react";import Parse from "parse";import Loader from "../primitives/Loader";import { useTranslation } from "react-i18next";+import { emailRegex } from "../constant/const";const AddSigner = (props) => {const { t } = useTranslation();@@ -47,139 +48,143 @@ const AddSigner = (props) => {const handleSubmit = async (e) => {e.preventDefault();e.stopPropagation();- setIsLoader(true);- if (localStorage.getItem("TenantId")) {- try {- const user = Parse.User.current();- const query = new Parse.Query("contracts_Contactbook");- query.equalTo("CreatedBy", user);- query.notEqualTo("IsDeleted", true);- query.equalTo("Email", email);- const res = await query.first();- // console.log(res);- if (!res) {- const contactQuery = new Parse.Object("contracts_Contactbook");- contactQuery.set("Name", name);- if (phone) {- contactQuery.set("Phone", phone);- }- contactQuery.set("Email", email);- contactQuery.set("UserRole", "contracts_Guest");-- contactQuery.set("TenantId", {- __type: "Pointer",- className: "partners_Tenant",- objectId: localStorage.getItem("TenantId")- });-- try {- const _users = Parse.Object.extend("User");- const _user = new _users();- _user.set("name", name);- _user.set("username", email);- _user.set("email", email);- _user.set("password", email);+ if (!emailRegex.test(email)) {+ alert("Please enter a valid email address.");+ } else {+ setIsLoader(true);+ if (localStorage.getItem("TenantId")) {+ try {+ const user = Parse.User.current();+ const query = new Parse.Query("contracts_Contactbook");+ query.equalTo("CreatedBy", user);+ query.notEqualTo("IsDeleted", true);+ query.equalTo("Email", email);+ const res = await query.first();+ // console.log(res);+ if (!res) {+ const contactQuery = new Parse.Object("contracts_Contactbook");+ contactQuery.set("Name", name);if (phone) {- _user.set("phone", phone);+ contactQuery.set("Phone", phone);}- const user = await _user.save();- if (user) {- const currentUser = Parse.User.current();- contactQuery.set(- "CreatedBy",- Parse.User.createWithoutData(currentUser.id)- );+ contactQuery.set("Email", email);+ contactQuery.set("UserRole", "contracts_Guest");- contactQuery.set("UserId", user);- const acl = new Parse.ACL();- acl.setPublicReadAccess(true);- acl.setPublicWriteAccess(true);- acl.setReadAccess(currentUser.id, true);- acl.setWriteAccess(currentUser.id, true);+ contactQuery.set("TenantId", {+ __type: "Pointer",+ className: "partners_Tenant",+ objectId: localStorage.getItem("TenantId")+ });- contactQuery.setACL(acl);+ try {+ const _users = Parse.Object.extend("User");+ const _user = new _users();+ _user.set("name", name);+ _user.set("username", email);+ _user.set("email", email);+ _user.set("password", email);+ if (phone) {+ _user.set("phone", phone);+ }+ const user = await _user.save();+ if (user) {+ const currentUser = Parse.User.current();+ contactQuery.set(+ "CreatedBy",+ Parse.User.createWithoutData(currentUser.id)+ );- const res = await contactQuery.save();+ contactQuery.set("UserId", user);+ const acl = new Parse.ACL();+ acl.setPublicReadAccess(true);+ acl.setPublicWriteAccess(true);+ acl.setReadAccess(currentUser.id, true);+ acl.setWriteAccess(currentUser.id, true);- const parseData = JSON.parse(JSON.stringify(res));- if (props.details) {- props.details({- value: parseData[props.valueKey],- label: parseData[props.displayKey]- });- }- if (props.closePopup) {- props.closePopup();- }- if (props.handleUserData) {- props.handleUserData(parseData);- }+ contactQuery.setACL(acl);- setIsLoader(false);- // Reset the form fields- setAddYourself(false);- setName("");- setPhone("");- setEmail("");- }- } catch (err) {- console.log("err ", err);- if (err.code === 202) {- const params = { email: email };- const userRes = await Parse.Cloud.run("getUserId", params);- const currentUser = Parse.User.current();- contactQuery.set(- "CreatedBy",- Parse.User.createWithoutData(currentUser.id)- );+ const res = await contactQuery.save();- contactQuery.set("UserId", {- __type: "Pointer",- className: "_User",- objectId: userRes.id- });- const acl = new Parse.ACL();- acl.setPublicReadAccess(true);- acl.setPublicWriteAccess(true);- acl.setReadAccess(currentUser.id, true);- acl.setWriteAccess(currentUser.id, true);+ const parseData = JSON.parse(JSON.stringify(res));+ if (props.details) {+ props.details({+ value: parseData[props.valueKey],+ label: parseData[props.displayKey]+ });+ }+ if (props.closePopup) {+ props.closePopup();+ }+ if (props.handleUserData) {+ props.handleUserData(parseData);+ }- contactQuery.setACL(acl);- const res = await contactQuery.save();+ setIsLoader(false);+ // Reset the form fields+ setAddYourself(false);+ setName("");+ setPhone("");+ setEmail("");+ }+ } catch (err) {+ console.log("err ", err);+ if (err.code === 202) {+ const params = { email: email };+ const userRes = await Parse.Cloud.run("getUserId", params);+ const currentUser = Parse.User.current();+ contactQuery.set(+ "CreatedBy",+ Parse.User.createWithoutData(currentUser.id)+ );- const parseData = JSON.parse(JSON.stringify(res));- if (props.details) {- props.details({- value: parseData[props.valueKey],- label: parseData[props.displayKey]+ contactQuery.set("UserId", {+ __type: "Pointer",+ className: "_User",+ objectId: userRes.id});+ const acl = new Parse.ACL();+ acl.setPublicReadAccess(true);+ acl.setPublicWriteAccess(true);+ acl.setReadAccess(currentUser.id, true);+ acl.setWriteAccess(currentUser.id, true);++ contactQuery.setACL(acl);+ const res = await contactQuery.save();++ const parseData = JSON.parse(JSON.stringify(res));+ if (props.details) {+ props.details({+ value: parseData[props.valueKey],+ label: parseData[props.displayKey]+ });+ }+ if (props.closePopup) {+ props.closePopup();+ }+ if (props.handleUserData) {+ props.handleUserData(parseData);+ }+ setIsLoader(false);+ // Reset the form fields+ setAddYourself(false);+ setName("");+ setPhone("");+ setEmail("");}- if (props.closePopup) {- props.closePopup();- }- if (props.handleUserData) {- props.handleUserData(parseData);- }- setIsLoader(false);- // Reset the form fields- setAddYourself(false);- setName("");- setPhone("");- setEmail("");}+ } else {+ alert(t("add-signer-alert"));+ setIsLoader(false);}- } else {- alert(t("add-signer-alert"));+ } catch (err) {+ console.log("err in fetch contact", err);setIsLoader(false);+ alert(t("something-went-wrong-mssg"));}- } catch (err) {- console.log("err in fetch contact", err);+ } else {setIsLoader(false);alert(t("something-went-wrong-mssg"));}- } else {- setIsLoader(false);- alert(t("something-went-wrong-mssg"));}};diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.jsindex c20e8fc4f..b19048d88 100644--- a/apps/OpenSign/src/components/AddUser.js+++ b/apps/OpenSign/src/components/AddUser.js@@ -3,7 +3,7 @@ import Parse from "parse";import Title from "./Title";import Loader from "../primitives/Loader";import { copytoData, fetchSubscriptionInfo } from "../constant/Utils";-import { isEnableSubscription } from "../constant/const";+import { emailRegex, isEnableSubscription } from "../constant/const";import { useTranslation } from "react-i18next";function generatePassword(length) {const characters =@@ -115,149 +115,172 @@ const AddUser = (props) => {const handleSubmit = async (e) => {e.preventDefault();e.stopPropagation();- const localUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];- setIsFormLoader(true);- const res = await checkUserExist();- if (res) {- props.setIsAlert({ type: "danger", msg: t("user-already-exist") });- setIsFormLoader(false);- setTimeout(() => props.setIsAlert({ type: "success", msg: "" }), 1000);+ if (!emailRegex.test(formdata.email)) {+ alert("Please enter a valid email address.");} else {- try {- const extUser = new Parse.Object("contracts_Users");- extUser.set("Name", formdata.name);- if (formdata.phone) {- extUser.set("Phone", formdata.phone);- }- extUser.set("Email", formdata.email);- extUser.set("UserRole", `contracts_${formdata.role}`);- if (formdata?.team) {- extUser.set("TeamIds", [- {- __type: "Pointer",- className: "contracts_Teams",- objectId: formdata.team- }- ]);- }- if (localUser && localUser.OrganizationId) {- extUser.set("OrganizationId", {- __type: "Pointer",- className: "contracts_Organizations",- objectId: localUser.OrganizationId.objectId- });- }- if (localUser && localUser.Company) {- extUser.set("Company", localUser.Company);- }-- if (localStorage.getItem("TenantId")) {- extUser.set("TenantId", {- __type: "Pointer",- className: "partners_Tenant",- objectId: localStorage.getItem("TenantId")- });- }-+ const localUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];+ setIsFormLoader(true);+ const res = await checkUserExist();+ if (res) {+ props.setIsAlert({ type: "danger", msg: t("user-already-exist") });+ setIsFormLoader(false);+ setTimeout(() => props.setIsAlert({ type: "success", msg: "" }), 1000);+ } else {try {- const _users = Parse.Object.extend("User");- const _user = new _users();- _user.set("name", formdata.name);- _user.set("username", formdata.email);- _user.set("email", formdata.email);- _user.set("password", formdata.password);+ const extUser = new Parse.Object("contracts_Users");+ extUser.set("Name", formdata.name);if (formdata.phone) {- _user.set("phone", formdata.phone);+ extUser.set("Phone", formdata.phone);+ }+ extUser.set("Email", formdata.email);+ extUser.set("UserRole", `contracts_${formdata.role}`);+ if (formdata?.team) {+ extUser.set("TeamIds", [+ {+ __type: "Pointer",+ className: "contracts_Teams",+ objectId: formdata.team+ }+ ]);+ }+ if (localUser && localUser.OrganizationId) {+ extUser.set("OrganizationId", {+ __type: "Pointer",+ className: "contracts_Organizations",+ objectId: localUser.OrganizationId.objectId+ });+ }+ if (localUser && localUser.Company) {+ extUser.set("Company", localUser.Company);}- const user = await _user.save();- if (user) {- const currentUser = Parse.User.current();- extUser.set(- "CreatedBy",- Parse.User.createWithoutData(currentUser.id)- );+ if (localStorage.getItem("TenantId")) {+ extUser.set("TenantId", {+ __type: "Pointer",+ className: "partners_Tenant",+ objectId: localStorage.getItem("TenantId")+ });+ }- extUser.set("UserId", user);- const acl = new Parse.ACL();- acl.setPublicReadAccess(true);- acl.setPublicWriteAccess(true);- acl.setReadAccess(currentUser.id, true);- acl.setWriteAccess(currentUser.id, true);+ try {+ const _users = Parse.Object.extend("User");+ const _user = new _users();+ _user.set("name", formdata.name);+ _user.set("username", formdata.email);+ _user.set("email", formdata.email);+ _user.set("password", formdata.password);+ if (formdata.phone) {+ _user.set("phone", formdata.phone);+ }- extUser.setACL(acl);+ const user = await _user.save();+ if (user) {+ const currentUser = Parse.User.current();+ extUser.set(+ "CreatedBy",+ Parse.User.createWithoutData(currentUser.id)+ );- const res = await extUser.save();+ extUser.set("UserId", user);+ const acl = new Parse.ACL();+ acl.setPublicReadAccess(true);+ acl.setPublicWriteAccess(true);+ acl.setReadAccess(currentUser.id, true);+ acl.setWriteAccess(currentUser.id, true);- const parseData = JSON.parse(JSON.stringify(res));+ extUser.setACL(acl);- if (props.closePopup) {- props.closePopup();- }- if (props.handleUserData) {- if (formdata?.team) {- const team = teamList.find((x) => x.objectId === formdata.team);- parseData.TeamIds = parseData.TeamIds.map((y) =>- y.objectId === team.objectId ? team : y- );+ const res = await extUser.save();++ const parseData = JSON.parse(JSON.stringify(res));++ if (props.closePopup) {+ props.closePopup();+ }+ if (props.handleUserData) {+ if (formdata?.team) {+ const team = teamList.find(+ (x) => x.objectId === formdata.team+ );+ parseData.TeamIds = parseData.TeamIds.map((y) =>+ y.objectId === team.objectId ? team : y+ );+ }+ props.handleUserData(parseData);}- props.handleUserData(parseData);- }- setIsFormLoader(false);- setFormdata({ name: "", email: "", phone: "", team: "", role: "" });- }- } catch (err) {- console.log("err ", err);- if (err.code === 202) {- const params = { email: formdata.email };- const userRes = await Parse.Cloud.run("getUserId", params);- const currentUser = Parse.User.current();- extUser.set(- "CreatedBy",- Parse.User.createWithoutData(currentUser.id)- );+ setIsFormLoader(false);+ setFormdata({+ name: "",+ email: "",+ phone: "",+ team: "",+ role: ""+ });+ }+ } catch (err) {+ console.log("err ", err);+ if (err.code === 202) {+ const params = { email: formdata.email };+ const userRes = await Parse.Cloud.run("getUserId", params);+ const currentUser = Parse.User.current();+ extUser.set(+ "CreatedBy",+ Parse.User.createWithoutData(currentUser.id)+ );- extUser.set("UserId", {- __type: "Pointer",- className: "_User",- objectId: userRes.id- });- const acl = new Parse.ACL();- acl.setPublicReadAccess(true);- acl.setPublicWriteAccess(true);- acl.setReadAccess(currentUser.id, true);- acl.setWriteAccess(currentUser.id, true);+ extUser.set("UserId", {+ __type: "Pointer",+ className: "_User",+ objectId: userRes.id+ });+ const acl = new Parse.ACL();+ acl.setPublicReadAccess(true);+ acl.setPublicWriteAccess(true);+ acl.setReadAccess(currentUser.id, true);+ acl.setWriteAccess(currentUser.id, true);- extUser.setACL(acl);- const res = await extUser.save();+ extUser.setACL(acl);+ const res = await extUser.save();- const parseData = JSON.parse(JSON.stringify(res));- if (props.closePopup) {- props.closePopup();- }- if (props.handleUserData) {- if (formdata?.team) {- const team = teamList.find((x) => x.objectId === formdata.team);- parseData.TeamIds = parseData.TeamIds.map((y) =>- y.objectId === team.objectId ? team : y- );+ const parseData = JSON.parse(JSON.stringify(res));+ if (props.closePopup) {+ props.closePopup();+ }+ if (props.handleUserData) {+ if (formdata?.team) {+ const team = teamList.find(+ (x) => x.objectId === formdata.team+ );+ parseData.TeamIds = parseData.TeamIds.map((y) =>+ y.objectId === team.objectId ? team : y+ );+ }+ props.handleUserData(parseData);}- props.handleUserData(parseData);+ setIsFormLoader(false);+ setFormdata({+ name: "",+ email: "",+ phone: "",+ team: "",+ role: ""+ });}- setIsFormLoader(false);- setFormdata({ name: "", email: "", phone: "", team: "", role: "" });}+ } catch (err) {+ console.log("err", err);+ setIsFormLoader(false);+ props.setIsAlert({+ type: "danger",+ msg: t("something-went-wrong-mssg")+ });+ } finally {+ setTimeout(+ () => props.setIsAlert({ type: "success", msg: "" }),+ 1500+ );}- } catch (err) {- console.log("err", err);- setIsFormLoader(false);- props.setIsAlert({- type: "danger",- msg: t("something-went-wrong-mssg")- });- } finally {- setTimeout(() => props.setIsAlert({ type: "success", msg: "" }), 1500);}}};diff --git a/apps/OpenSign/src/components/pdf/SelectLanguage.js b/apps/OpenSign/src/components/pdf/SelectLanguage.jsindex ff9846e66..7faf86c3d 100644--- a/apps/OpenSign/src/components/pdf/SelectLanguage.js+++ b/apps/OpenSign/src/components/pdf/SelectLanguage.js@@ -9,15 +9,13 @@ function SelectLanguage(props) {{ value: "es", text: "Española" },{ value: "fr", text: "Français" }];- const [lang, setLang] = useState(i18next.language || "en");+ const defaultLanguage = i18next.language || "en";+ const [lang, setLang] = useState(defaultLanguage);// This function put query that helps to change the languageconst handleChangeLang = (e) => {setLang(e.target.value);i18n.changeLanguage(e.target.value);- props?.updateExtUser &&- props.updateExtUser({- language: e.target.value- });+ props?.updateExtUser && props.updateExtUser({ language: e.target.value });};return (<div@@ -32,9 +30,7 @@ function SelectLanguage(props) {!props.isProfile ? " md:w-[15%] w-[50%]" : "w-[180px]"} op-select op-select-bordered bg-white op-select-sm `}>- <option disabled selected>- select- </option>+ <option disabled>select</option>{languages.map((item) => {return (<option key={item.value} value={item.value}>diff --git a/apps/OpenSign/src/pages/AddAdmin.js b/apps/OpenSign/src/pages/AddAdmin.jsindex 505e08814..6dc83ac1c 100644--- a/apps/OpenSign/src/pages/AddAdmin.js+++ b/apps/OpenSign/src/pages/AddAdmin.js@@ -12,6 +12,7 @@ import { showTenant } from "../redux/reducers/ShowTenant";import Loader from "../primitives/Loader";import Title from "../components/Title";import { useTranslation } from "react-i18next";+import { emailRegex } from "../constant/const";const AddAdmin = () => {const { t, i18n } = useTranslation();@@ -84,77 +85,81 @@ const AddAdmin = () => {const handleSubmit = async (event) => {event.preventDefault();- if (lengthValid && caseDigitValid && specialCharValid) {- clearStorage();- setState({ loading: true });- const userDetails = {- name: name,- email: email,- phone: phone,- company: company,- jobTitle: jobTitle- };- localStorage.setItem("userDetails", JSON.stringify(userDetails));- try {- event.preventDefault();- const user = new Parse.User();- user.set("name", name);- user.set("email", email);- user.set("password", password);- user.set("phone", phone);- user.set("username", email);- const userRes = await user.save();- if (userRes) {- const params = {- userDetails: {- jobTitle: jobTitle,- company: company,- name: name,- email: email,- phone: phone,- role: "contracts_Admin"- }- };- try {- const usersignup = await Parse.Cloud.run("addadmin", params);- if (usersignup) {- if (isSubscribeNews) {- subscribeNewsletter();+ if (!emailRegex.test(email)) {+ alert("Please enter a valid email address.");+ } else {+ if (lengthValid && caseDigitValid && specialCharValid) {+ clearStorage();+ setState({ loading: true });+ const userDetails = {+ name: name,+ email: email,+ phone: phone,+ company: company,+ jobTitle: jobTitle+ };+ localStorage.setItem("userDetails", JSON.stringify(userDetails));+ try {+ event.preventDefault();+ const user = new Parse.User();+ user.set("name", name);+ user.set("email", email);+ user.set("password", password);+ user.set("phone", phone);+ user.set("username", email);+ const userRes = await user.save();+ if (userRes) {+ const params = {+ userDetails: {+ jobTitle: jobTitle,+ company: company,+ name: name,+ email: email,+ phone: phone,+ role: "contracts_Admin"}- handleNavigation(userRes.getSessionToken());- }- } catch (err) {- alert(err.message);- setState({ loading: false });- }- }- } catch (error) {- console.log("err ", error);- if (error.code === 202) {- const params = { email: email };- const res = await Parse.Cloud.run("getUserDetails", params);- // console.log("Res ", res);- if (res) {- alert(t("already-exists-this-username"));- setState({ loading: false });- } else {- // console.log("state.email ", email);+ };try {- await Parse.User.requestPasswordReset(email).then(- async function (res) {- if (res.data === undefined) {- alert(t("verification-code-sent"));- }+ const usersignup = await Parse.Cloud.run("addadmin", params);+ if (usersignup) {+ if (isSubscribeNews) {+ subscribeNewsletter();}- );+ handleNavigation(userRes.getSessionToken());+ }} catch (err) {- console.log(err);+ alert(err.message);+ setState({ loading: false });+ }+ }+ } catch (error) {+ console.log("err ", error);+ if (error.code === 202) {+ const params = { email: email };+ const res = await Parse.Cloud.run("getUserDetails", params);+ // console.log("Res ", res);+ if (res) {+ alert(t("already-exists-this-username"));+ setState({ loading: false });+ } else {+ // console.log("state.email ", email);+ try {+ await Parse.User.requestPasswordReset(email).then(+ async function (res) {+ if (res.data === undefined) {+ alert(t("verification-code-sent"));+ }+ }+ );+ } catch (err) {+ console.log(err);+ }+ setState({ loading: false });}+ } else {+ alert(error.message);setState({ loading: false });}- } else {- alert(error.message);- setState({ loading: false });}}}diff --git a/apps/OpenSign/src/pages/ForgetPassword.js b/apps/OpenSign/src/pages/ForgetPassword.jsindex 91260c5d6..89f38d908 100644--- a/apps/OpenSign/src/pages/ForgetPassword.js+++ b/apps/OpenSign/src/pages/ForgetPassword.js@@ -7,7 +7,7 @@ import Alert from "../primitives/Alert";import { appInfo } from "../constant/appinfo";import { useDispatch } from "react-redux";import { fetchAppInfo } from "../redux/reducers/infoReducer";-import { isEnableSubscription } from "../constant/const";+import { emailRegex, isEnableSubscription } from "../constant/const";import { getAppLogo } from "../constant/Utils";import { useTranslation } from "react-i18next";@@ -36,18 +36,22 @@ function ForgotPassword() {const handleSubmit = async (event) => {event.preventDefault();- localStorage.setItem("appLogo", appInfo.applogo);- localStorage.setItem("userSettings", JSON.stringify(appInfo.settings));- if (state.email) {- const username = state.email;- try {- await Parse.User.requestPasswordReset(username);- setSentStatus("success");- } catch (err) {- console.log("err ", err.code);- setSentStatus("failed");- } finally {- setTimeout(() => setSentStatus(""), 1000);+ if (!emailRegex.test(state.email)) {+ alert("Please enter a valid email address.");+ } else {+ localStorage.setItem("appLogo", appInfo.applogo);+ localStorage.setItem("userSettings", JSON.stringify(appInfo.settings));+ if (state.email) {+ const username = state.email;+ try {+ await Parse.User.requestPasswordReset(username);+ setSentStatus("success");+ } catch (err) {+ console.log("err ", err.code);+ setSentStatus("failed");+ } finally {+ setTimeout(() => setSentStatus(""), 1000);+ }}}};diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.jsindex 97ddded91..7d38a1846 100644--- a/apps/OpenSign/src/pages/Login.js+++ b/apps/OpenSign/src/pages/Login.js@@ -9,7 +9,7 @@ import { NavLink, useNavigate, useLocation } from "react-router-dom";import login_img from "../assets/images/login_img.svg";import { useWindowSize } from "../hook/useWindowSize";import ModalUi from "../primitives/ModalUi";-import { isEnableSubscription } from "../constant/const";+import { emailRegex, isEnableSubscription } from "../constant/const";import Alert from "../primitives/Alert";import { appInfo } from "../constant/appinfo";import { fetchAppInfo } from "../redux/reducers/infoReducer";@@ -89,167 +89,174 @@ function Login() {const handleSubmit = async (event) => {localStorage.removeItem("accesstoken");event.preventDefault();- const { email, password } = state;- if (email && password) {- try {- setState({ ...state, loading: true });- localStorage.setItem("appLogo", appInfo.applogo);- // Pass the username and password to logIn function- const user = await Parse.User.logIn(email, password);- if (user) {- let _user = user.toJSON();- localStorage.setItem("UserInformation", JSON.stringify(_user));- localStorage.setItem("userEmail", email);- localStorage.setItem("accesstoken", _user.sessionToken);- localStorage.setItem("scriptId", true);- if (_user.ProfilePic) {- localStorage.setItem("profileImg", _user.ProfilePic);- } else {- localStorage.setItem("profileImg", "");- }- // Check extended class user role and tenentId- try {- const userSettings = appInfo.settings;- await Parse.Cloud.run("getUserDetails")- .then(async (extUser) => {- if (extUser) {- // console.log("extUser", extUser, extUser?.get("IsDisabled"));- const IsDisabled = extUser?.get("IsDisabled") || false;- if (!IsDisabled) {- const userRole = extUser?.get("UserRole");- const menu =- userRole &&- userSettings.find((menu) => menu.role === userRole);- if (menu) {- const _currentRole = userRole;- const redirectUrl =- location?.state?.from ||- `/${menu.pageType}/${menu.pageId}`;- let _role = _currentRole.replace("contracts_", "");- localStorage.setItem("_user_role", _role);- const checkLanguage = extUser?.get("Language");- if (checkLanguage) {- checkLanguage && i18n.changeLanguage(checkLanguage);- }+ if (!emailRegex.test(state.email)) {+ alert("Please enter a valid email address.");+ } else {+ const { email, password } = state;+ if (email && password) {+ try {+ setState({ ...state, loading: true });+ localStorage.setItem("appLogo", appInfo.applogo);+ // Pass the username and password to logIn function+ const user = await Parse.User.logIn(email, password);+ if (user) {+ let _user = user.toJSON();+ localStorage.setItem("UserInformation", JSON.stringify(_user));+ localStorage.setItem("userEmail", email);+ localStorage.setItem("accesstoken", _user.sessionToken);+ localStorage.setItem("scriptId", true);+ if (_user.ProfilePic) {+ localStorage.setItem("profileImg", _user.ProfilePic);+ } else {+ localStorage.setItem("profileImg", "");+ }+ // Check extended class user role and tenentId+ try {+ const userSettings = appInfo.settings;+ await Parse.Cloud.run("getUserDetails")+ .then(async (extUser) => {+ if (extUser) {+ // console.log("extUser", extUser, extUser?.get("IsDisabled"));+ const IsDisabled = extUser?.get("IsDisabled") || false;+ if (!IsDisabled) {+ const userRole = extUser?.get("UserRole");+ const menu =+ userRole &&+ userSettings.find((menu) => menu.role === userRole);+ if (menu) {+ const _currentRole = userRole;+ const redirectUrl =+ location?.state?.from ||+ `/${menu.pageType}/${menu.pageId}`;+ let _role = _currentRole.replace("contracts_", "");+ localStorage.setItem("_user_role", _role);+ const checkLanguage = extUser?.get("Language");+ if (checkLanguage) {+ checkLanguage && i18n.changeLanguage(checkLanguage);+ }- const results = [extUser];- const extUser_str = JSON.stringify(results);+ const results = [extUser];+ const extUser_str = JSON.stringify(results);- localStorage.setItem("Extand_Class", extUser_str);- const extInfo = JSON.parse(JSON.stringify(extUser));- localStorage.setItem("userEmail", extInfo.Email);- localStorage.setItem("username", extInfo.Name);- if (extInfo?.TenantId) {- const tenant = {- Id: extInfo?.TenantId?.objectId || "",- Name: extInfo?.TenantId?.TenantName || ""- };- localStorage.setItem("TenantId", tenant?.Id);- dispatch(showTenant(tenant?.Name));- localStorage.setItem("TenantName", tenant?.Name);- }- localStorage.setItem("PageLanding", menu.pageId);- localStorage.setItem("defaultmenuid", menu.menuId);- localStorage.setItem("pageType", menu.pageType);- if (isEnableSubscription) {- const LocalUserDetails = {- name: results[0].get("Name"),- email: results[0].get("Email"),- phone: results[0]?.get("Phone") || "",- company: results[0].get("Company")- };- localStorage.setItem(- "userDetails",- JSON.stringify(LocalUserDetails)- );- const res = await fetchSubscription();- const plan = res.plan;- const billingDate = res.billingDate;- if (plan === "freeplan") {- setState({ ...state, loading: false });- navigate(redirectUrl);- } else if (billingDate) {- if (new Date(billingDate) > new Date()) {- localStorage.removeItem("userDetails");- // Redirect to the appropriate URL after successful login setState({ ...state, loading: false });+ localStorage.setItem("Extand_Class", extUser_str);+ const extInfo = JSON.parse(JSON.stringify(extUser));+ localStorage.setItem("userEmail", extInfo.Email);+ localStorage.setItem("username", extInfo.Name);+ if (extInfo?.TenantId) {+ const tenant = {+ Id: extInfo?.TenantId?.objectId || "",+ Name: extInfo?.TenantId?.TenantName || ""+ };+ localStorage.setItem("TenantId", tenant?.Id);+ dispatch(showTenant(tenant?.Name));+ localStorage.setItem("TenantName", tenant?.Name);+ }+ localStorage.setItem("PageLanding", menu.pageId);+ localStorage.setItem("defaultmenuid", menu.menuId);+ localStorage.setItem("pageType", menu.pageType);+ if (isEnableSubscription) {+ const LocalUserDetails = {+ name: results[0].get("Name"),+ email: results[0].get("Email"),+ phone: results[0]?.get("Phone") || "",+ company: results[0].get("Company")+ };+ localStorage.setItem(+ "userDetails",+ JSON.stringify(LocalUserDetails)+ );+ const res = await fetchSubscription();+ const plan = res.plan;+ const billingDate = res.billingDate;+ if (plan === "freeplan") {setState({ ...state, loading: false });navigate(redirectUrl);+ } else if (billingDate) {+ if (new Date(billingDate) > new Date()) {+ localStorage.removeItem("userDetails");+ // Redirect to the appropriate URL after successful login setState({ ...state, loading: false });+ setState({ ...state, loading: false });+ navigate(redirectUrl);+ } else {+ setState({ ...state, loading: false });+ handlePaidRoute(plan);+ }} else {setState({ ...state, loading: false });handlePaidRoute(plan);}} else {setState({ ...state, loading: false });- handlePaidRoute(plan);+ // Redirect to the appropriate URL after successful login+ navigate(redirectUrl);}} else {setState({ ...state, loading: false });- // Redirect to the appropriate URL after successful login- navigate(redirectUrl);+ setIsModal(true);}} else {+ setState({+ ...state,+ loading: false,+ alertType: "danger",+ alertMsg:+ "You don't have access, please contact the admin."+ });+ logOutUser();+ }+ } else {+ if (isEnableSubscription) {setState({ ...state, loading: false });setIsModal(true);+ } else {+ setState({ ...state, loading: false });+ setState({+ ...state,+ loading: false,+ alertType: "danger",+ alertMsg: "User not found."+ });+ logOutUser();}- } else {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg:- "You don't have access, please contact the admin."- });- logOutUser();}- } else {- if (isEnableSubscription) {- setState({ ...state, loading: false });- setIsModal(true);- } else {- setState({ ...state, loading: false });- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: "User not found."- });- logOutUser();- }- }- })- .catch((error) => {- // const payload = { sessionToken: user.getSessionToken() };- // handleSubmitbtn(payload);- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: `Something went wrong.`+ })+ .catch((error) => {+ // const payload = { sessionToken: user.getSessionToken() };+ // handleSubmitbtn(payload);+ setState({+ ...state,+ loading: false,+ alertType: "danger",+ alertMsg: `Something went wrong.`+ });+ setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);+ console.error("Error while fetching Follow", error);});- setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);- console.error("Error while fetching Follow", error);+ } catch (error) {+ setState({+ ...state,+ loading: false,+ alertType: "danger",+ alertMsg: `${error.message}`});- } catch (error) {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: `${error.message}`- });- console.log(error);- setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);+ console.log(error);+ setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);+ }}+ } catch (error) {+ setState({+ ...state,+ loading: false,+ alertType: "danger",+ alertMsg: "Invalid username or password!"+ });+ console.error("Error while logging in user", error);+ } finally {+ setTimeout(+ () => setState((prev) => ({ ...prev, alertMsg: "" })),+ 2000+ );}- } catch (error) {- setState({- ...state,- loading: false,- alertType: "danger",- alertMsg: "Invalid username or password!"- });- console.error("Error while logging in user", error);- } finally {- setTimeout(() => setState((prev) => ({ ...prev, alertMsg: "" })), 2000);}}};diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.jsindex a0b84c848..f53de62a0 100644--- a/apps/OpenSign/src/pages/PdfRequestFiles.js+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js@@ -1,5 +1,10 @@import React, { useState, useRef, useEffect } from "react";-import { isEnableSubscription, isStaging, themeColor } from "../constant/const";+import {+ emailRegex,+ isEnableSubscription,+ isStaging,+ themeColor+} from "../constant/const";import { PDFDocument } from "pdf-lib";import "../styles/signature.css";import Parse from "parse";@@ -1554,64 +1559,68 @@ function PdfRequestFiles(props) {const handlePublicUser = async (e) => {e.preventDefault();setLoading(true);- try {- const params = {- ...contact,- templateid: pdfDetails[0]?.objectId,- role: pdfDetails[0]?.PublicRole[0]- };- const userRes = await axios.post(- `${localStorage.getItem(- "baseUrl"- )}/functions/publicuserlinkcontacttodoc`,- params,- {- headers: {- "Content-Type": "application/json",- "X-Parse-Application-Id": localStorage.getItem("parseAppId")+ if (!emailRegex.test(contact.email)) {+ alert("Please enter a valid email address.");+ } else {+ try {+ const params = {+ ...contact,+ templateid: pdfDetails[0]?.objectId,+ role: pdfDetails[0]?.PublicRole[0]+ };+ const userRes = await axios.post(+ `${localStorage.getItem(+ "baseUrl"+ )}/functions/publicuserlinkcontacttodoc`,+ params,+ {+ headers: {+ "Content-Type": "application/json",+ "X-Parse-Application-Id": localStorage.getItem("parseAppId")+ }}- }- );+ );- if (userRes?.data?.result) {- setPublicRes(userRes.data.result);- const isEnableOTP = pdfDetails?.[0]?.IsEnableOTP || false;- if (isEnableOTP) {- await SendOtp();+ if (userRes?.data?.result) {+ 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 {- setIsPublicContact(false);- setIsPublicTemplate(false);- setDocumentId(userRes.data?.result?.docId);- const contactId = userRes.data.result?.contactId;- setSignerObjectId(contactId);+ console.log("error in public-sign to create user details");+ setIsAlert({+ title: "Error",+ isShow: true,+ alertMessage: t("something-went-wrong-mssg")+ });+ }+ } catch (e) {+ console.log("e", e);+ if (+ e?.response?.data?.error === "Insufficient Credit" ||+ e?.response?.data?.error === "Plan expired"+ ) {+ handleCloseOtp();+ setIsAlert({+ title: t("insufficient-credits"),+ isShow: true,+ alertMessage: t("insufficient-credits-mssg")+ });+ } else {+ handleCloseOtp();+ setIsAlert({+ title: "Error",+ isShow: true,+ alertMessage: t("something-went-wrong-mssg")+ });}- } else {- console.log("error in public-sign to create user details");- setIsAlert({- title: "Error",- isShow: true,- alertMessage: t("something-went-wrong-mssg")- });- }- } catch (e) {- console.log("e", e);- if (- e?.response?.data?.error === "Insufficient Credit" ||- e?.response?.data?.error === "Plan expired"- ) {- handleCloseOtp();- setIsAlert({- title: t("insufficient-credits"),- isShow: true,- alertMessage: t("insufficient-credits-mssg")- });- } else {- handleCloseOtp();- setIsAlert({- title: "Error",- isShow: true,- alertMessage: t("something-went-wrong-mssg")- });}}};diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.jsindex 651ebe348..af4cec8f6 100644--- a/apps/OpenSign/src/pages/PlaceHolderSign.js+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js@@ -2056,6 +2056,7 @@ function PlaceHolderSign() {{/* pdf header which contain funish back button */}<Header+ completeBtnTitle={t("next")}isPlaceholder={true}pageNumber={pageNumber}allPages={allPages}diff --git a/apps/OpenSign/src/pages/Signup.js b/apps/OpenSign/src/pages/Signup.jsindex b3040d42a..787e166ab 100644--- a/apps/OpenSign/src/pages/Signup.js+++ b/apps/OpenSign/src/pages/Signup.js@@ -10,7 +10,7 @@ import { appInfo } from "../constant/appinfo";import { useDispatch } from "react-redux";import { fetchAppInfo } from "../redux/reducers/infoReducer";import { showTenant } from "../redux/reducers/ShowTenant";-import { isEnableSubscription } from "../constant/const";+import { emailRegex, isEnableSubscription } from "../constant/const";import {getAppLogo,openInNewTab,@@ -83,92 +83,96 @@ const Signup = () => {};const handleSubmit = (event) => {event.preventDefault();- if (lengthValid && caseDigitValid && specialCharValid) {- clearStorage();- setState({ loading: true });- const userDetails = {- name: name,- email: email,- phone: phone,- company: company,- jobTitle: jobTitle- };- localStorage.setItem("userDetails", JSON.stringify(userDetails));- try {- event.preventDefault();- var user = new Parse.User();- user.set("name", name);- user.set("email", email);- user.set("password", password);- user.set("phone", phone);- user.set("username", email);- let res = user.save();- res- .then(async (r) => {- if (r) {- let roleData = appInfo.settings;- if (roleData && roleData.length > 0) {- const params = {- userDetails: {- jobTitle: jobTitle,- company: company,- name: name,- email: email,- phone: phone,- role: appInfo.defaultRole- }- };- try {- const usersignup = await Parse.Cloud.run(- "usersignup",- params- );- if (usersignup) {- const param = new URLSearchParams(location.search);- const isFreeplan =- param?.get("subscription") === "freeplan";- if (isFreeplan) {- await handleFreePlan(r.id);+ if (!emailRegex.test(email)) {+ alert("Please enter a valid email address.");+ } else {+ if (lengthValid && caseDigitValid && specialCharValid) {+ clearStorage();+ setState({ loading: true });+ const userDetails = {+ name: name,+ email: email,+ phone: phone,+ company: company,+ jobTitle: jobTitle+ };+ localStorage.setItem("userDetails", JSON.stringify(userDetails));+ try {+ event.preventDefault();+ var user = new Parse.User();+ user.set("name", name);+ user.set("email", email);+ user.set("password", password);+ user.set("phone", phone);+ user.set("username", email);+ let res = user.save();+ res+ .then(async (r) => {+ if (r) {+ let roleData = appInfo.settings;+ if (roleData && roleData.length > 0) {+ const params = {+ userDetails: {+ jobTitle: jobTitle,+ company: company,+ name: name,+ email: email,+ phone: phone,+ role: appInfo.defaultRole+ }+ };+ try {+ const usersignup = await Parse.Cloud.run(+ "usersignup",+ params+ );+ if (usersignup) {+ const param = new URLSearchParams(location.search);+ const isFreeplan =+ param?.get("subscription") === "freeplan";+ if (isFreeplan) {+ await handleFreePlan(r.id);+ }+ handleNavigation(r.getSessionToken(), isFreeplan);}- handleNavigation(r.getSessionToken(), isFreeplan);+ } catch (err) {+ alert(err.message);+ setState({ loading: false });}- } catch (err) {- alert(err.message);- setState({ loading: false });}}- }- })- .catch(async (err) => {- if (err.code === 202) {- const params = { email: email };- const res = await Parse.Cloud.run("getUserDetails", params);- // console.log("Res ", res);- if (res) {- alert(t("user-already-exist-name"));- setState({ loading: false });- } else {- // console.log("state.email ", email);- try {- await Parse.User.requestPasswordReset(email).then(- async function (res1) {- if (res1.data === undefined) {- alert(t("verification-code-sent"));+ })+ .catch(async (err) => {+ if (err.code === 202) {+ const params = { email: email };+ const res = await Parse.Cloud.run("getUserDetails", params);+ // console.log("Res ", res);+ if (res) {+ alert(t("user-already-exist-name"));+ setState({ loading: false });+ } else {+ // console.log("state.email ", email);+ try {+ await Parse.User.requestPasswordReset(email).then(+ async function (res1) {+ if (res1.data === undefined) {+ alert(t("verification-code-sent"));+ }}- }- );- } catch (err) {- console.log(err);+ );+ } catch (err) {+ console.log(err);+ }+ setState({ loading: false });}+ } else {+ alert(err.message);setState({ loading: false });}- } else {- alert(err.message);- setState({ loading: false });- }- });- } catch (error) {- console.log("err ", error);+ });+ } catch (error) {+ console.log("err ", error);+ }}}};diff --git a/apps/OpenSign/src/pages/UpdateExistUserAdmin.js b/apps/OpenSign/src/pages/UpdateExistUserAdmin.jsindex aa5592ff6..c3b9aed01 100644--- a/apps/OpenSign/src/pages/UpdateExistUserAdmin.js+++ b/apps/OpenSign/src/pages/UpdateExistUserAdmin.js@@ -5,6 +5,7 @@ import { NavLink, useNavigate } from "react-router-dom";import Alert from "../primitives/Alert";import Title from "../components/Title";import { useTranslation } from "react-i18next";+import { emailRegex } from "../constant/const";const UpdateExistUserAdmin = () => {const { t } = useTranslation();const navigate = useNavigate();@@ -35,33 +36,37 @@ const UpdateExistUserAdmin = () => {const handleSubmit = async (e) => {e.preventDefault();e.stopPropagation();- setIsSubmitLoading(true);- try {- const updateUserAsAdmin = await Parse.Cloud.run(- "updateuserasadmin",- formdata- );- // console.log("updateUserAsAdmin ", updateUserAsAdmin);- if (updateUserAsAdmin === "admin_created") {- setIsAlert({ type: "success", msg: t("admin-created") });- navigate("/");- }- } catch (err) {- console.log("err in updateuserasadmin", err.code);- if (err.code === 404) {- setIsAlert((prev) => ({ ...prev, msg: t("invalid-masterkey") }));- } else if (err.code === 101) {- setIsAlert((prev) => ({ ...prev, msg: t("user-not-found") }));- } else if (err.code === 137) {- setIsAlert((prev) => ({ ...prev, msg: t("admin-exists") }));- } else {- setErrMsg(t("something-went-wrong-mssg"));+ if (!emailRegex.test(formdata.email)) {+ alert("Please enter a valid email address.");+ } else {+ setIsSubmitLoading(true);+ try {+ const updateUserAsAdmin = await Parse.Cloud.run(+ "updateuserasadmin",+ formdata+ );+ // console.log("updateUserAsAdmin ", updateUserAsAdmin);+ if (updateUserAsAdmin === "admin_created") {+ setIsAlert({ type: "success", msg: t("admin-created") });+ navigate("/");+ }+ } catch (err) {+ console.log("err in updateuserasadmin", err.code);+ if (err.code === 404) {+ setIsAlert((prev) => ({ ...prev, msg: t("invalid-masterkey") }));+ } else if (err.code === 101) {+ setIsAlert((prev) => ({ ...prev, msg: t("user-not-found") }));+ } else if (err.code === 137) {+ setIsAlert((prev) => ({ ...prev, msg: t("admin-exists") }));+ } else {+ setErrMsg(t("something-went-wrong-mssg"));+ }+ } finally {+ setIsSubmitLoading(false);+ setTimeout(() => {+ setIsAlert(() => ({ type: "danger", msg: "" }));+ }, 2000);}- } finally {- setIsSubmitLoading(false);- setTimeout(() => {- setIsAlert(() => ({ type: "danger", msg: "" }));- }, 2000);}};return (diff --git a/apps/OpenSign/src/primitives/AddContact.js b/apps/OpenSign/src/primitives/AddContact.jsindex 2414c0c86..708753f41 100644--- a/apps/OpenSign/src/primitives/AddContact.js+++ b/apps/OpenSign/src/primitives/AddContact.js@@ -3,6 +3,7 @@ import Loader from "./Loader";import { useTranslation } from "react-i18next";import axios from "axios";import { getTenantDetails } from "../constant/Utils";+import { emailRegex } from "../constant/const";const AddContact = (props) => {const { t } = useTranslation();const [name, setName] = useState("");@@ -52,54 +53,58 @@ const AddContact = (props) => {const handleSubmit = async (e) => {e.preventDefault();e.stopPropagation();- setIsLoader(true);- const user = JSON.parse(- localStorage.getItem(- `Parse/${localStorage.getItem("parseAppId")}/currentUser`- )- );- const userId = user?.objectId || "";- const tenantDetails = await getTenantDetails(userId, props.jwttoken);- const tenantId = tenantDetails?.objectId || "";- if (tenantId) {- try {- const baseURL = localStorage.getItem("baseUrl");- const url = `${baseURL}functions/savecontact`;- const token = props?.jwttoken- ? { jwttoken: props?.jwttoken }- : { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };- const data = { name, email, phone, tenantId };- const headers = {- "Content-Type": "application/json",- "X-Parse-Application-Id": localStorage.getItem("parseAppId"),- ...token- };- const axiosRes = await axios.post(url, data, { headers });- const contactRes = axiosRes?.data?.result || {};- if (contactRes?.objectId) {- props.details(contactRes);- if (props.closePopup) {- props.closePopup();- setIsLoader(false);- // Reset the form fields- setAddYourself(false);- setName("");- setPhone("");- setEmail("");+ if (!emailRegex.test(email)) {+ alert("Please enter a valid email address.");+ } else {+ setIsLoader(true);+ const user = JSON.parse(+ localStorage.getItem(+ `Parse/${localStorage.getItem("parseAppId")}/currentUser`+ )+ );+ const userId = user?.objectId || "";+ const tenantDetails = await getTenantDetails(userId, props.jwttoken);+ const tenantId = tenantDetails?.objectId || "";+ if (tenantId) {+ try {+ const baseURL = localStorage.getItem("baseUrl");+ const url = `${baseURL}functions/savecontact`;+ const token = props?.jwttoken+ ? { jwttoken: props?.jwttoken }+ : { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };+ const data = { name, email, phone, tenantId };+ const headers = {+ "Content-Type": "application/json",+ "X-Parse-Application-Id": localStorage.getItem("parseAppId"),+ ...token+ };+ const axiosRes = await axios.post(url, data, { headers });+ const contactRes = axiosRes?.data?.result || {};+ if (contactRes?.objectId) {+ props.details(contactRes);+ if (props.closePopup) {+ props.closePopup();+ setIsLoader(false);+ // Reset the form fields+ setAddYourself(false);+ setName("");+ setPhone("");+ setEmail("");+ }+ }+ } catch (err) {+ console.log("Err", err);+ setIsLoader(false);+ if (err?.response?.data?.error?.includes("already exists")) {+ alert(t("add-signer-alert"));+ } else {+ alert(t("something-went-wrong-mssg"));}}- } catch (err) {- console.log("Err", err);+ } else {setIsLoader(false);- if (err?.response?.data?.error?.includes("already exists")) {- alert(t("add-signer-alert"));- } else {- alert(t("something-went-wrong-mssg"));- }+ alert(t("something-went-wrong-mssg"));}- } else {- setIsLoader(false);- alert(t("something-went-wrong-mssg"));}};diff --git a/apps/OpenSignServer/Utils.js b/apps/OpenSignServer/Utils.jsindex 336397e1b..c2c66ebb3 100644--- a/apps/OpenSignServer/Utils.js+++ b/apps/OpenSignServer/Utils.js@@ -128,11 +128,14 @@ export const updateMailCount = async (extUserId, plan, monthchange) => {export function formatWidgetOptions(type, options) {const colorsArr = ['red', 'black', 'blue', 'yellow'];+ const fontSizes = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];const status = options?.required === true ? 'required' : 'optional' || 'required';const defaultValue = options?.default || '';const values = options?.values || [];const color = options?.color ? options.color : 'black';const fontColor = colorsArr.includes(color) ? color : 'black';+ const size = options?.size ? parseInt(options.size) : 12;+ const fontSize = fontSizes.includes(size) ? size : 12;switch (type) {case 'signature':return { name: 'signature', status: 'required' };@@ -148,13 +151,29 @@ export function formatWidgetOptions(type, options) {name: options.name || 'email',validation: { type: 'email' },fontColor: fontColor,+ fontSize: fontSize,};case 'name':- return { status: status, name: options.name || 'name', fontColor: fontColor };+ return {+ status: status,+ name: options.name || 'name',+ fontColor: fontColor,+ fontSize: fontSize,+ };case 'job title':- return { status: status, name: options.name || 'job title', fontColor: fontColor };+ return {+ status: status,+ name: options.name || 'job title',+ fontColor: fontColor,+ fontSize: fontSize,+ };case 'company':- return { status: status, name: options.name || 'company', fontColor: fontColor };+ return {+ status: status,+ name: options.name || 'company',+ fontColor: fontColor,+ fontSize: fontSize,+ };case 'date': {let today = new Date();let dd = String(today.getDate()).padStart(2, '0');@@ -169,6 +188,7 @@ export function formatWidgetOptions(type, options) {response: defaultValue || today,validation: { format: dateFormat || 'dd-MM-yyyy', type: 'date-format' },fontColor: fontColor,+ fontSize: fontSize,};}case 'textbox':@@ -179,6 +199,7 @@ export function formatWidgetOptions(type, options) {hint: options.hint,validation: { type: 'regex', pattern: options?.regularexpression || '/^[a-zA-Z0-9s]+$/' },fontColor: fontColor,+ fontSize: fontSize,};case 'checkbox': {const arr = options?.values;@@ -199,6 +220,7 @@ export function formatWidgetOptions(type, options) {},defaultValue: selectedvalues || [],fontColor: fontColor,+ fontSize: fontSize,};}case 'radio button': {@@ -210,6 +232,7 @@ export function formatWidgetOptions(type, options) {isHideLabel: options?.hidelabel || false,defaultValue: defaultValue,fontColor: fontColor,+ fontSize: fontSize,};}case 'dropdown':@@ -219,6 +242,7 @@ export function formatWidgetOptions(type, options) {values: values,defaultValue: defaultValue,fontColor: fontColor,+ fontSize: fontSize,};default:break;