Skip to content

🔥 The free & Open Source DocuSign alternative

refactor: remove mulitple initialization of parse

prafull-opensignlabscc0ff1f5e787
diff --git a/apps/OpenSign/src/App.js b/apps/OpenSign/src/App.js
index 3ad4546fe..5f195fb3b 100644
--- a/apps/OpenSign/src/App.js
+++ b/apps/OpenSign/src/App.js
@@ -43,8 +43,8 @@ function App() {
: window.location.origin + "/api/app";
const appName = "contracts";
try {
- localStorage.setItem("BaseUrl12", `${baseurl}/`);
- localStorage.setItem("AppID12", appId);
+ localStorage.setItem("baseUrl", `${baseurl}/`);
+ localStorage.setItem("parseAppId", appId);
localStorage.setItem("domain", appName);
setIsLoading(false);
} catch (error) {
diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.js
index 5861f6be6..67d6095e0 100644
--- a/apps/OpenSign/src/components/AddUser.js
+++ b/apps/OpenSign/src/components/AddUser.js
@@ -12,8 +12,6 @@ const AddUser = (props) => {
const [isUserExist, setIsUserExist] = useState(false);
const parseBaseUrl = localStorage.getItem("baseUrl");
const parseAppId = localStorage.getItem("parseAppId");
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
const checkUserExist = async () => {
try {
diff --git a/apps/OpenSign/src/components/AppendFormInForm.js b/apps/OpenSign/src/components/AppendFormInForm.js
index 4f757e5bf..9fb2723f1 100644
--- a/apps/OpenSign/src/components/AppendFormInForm.js
+++ b/apps/OpenSign/src/components/AppendFormInForm.js
@@ -49,8 +49,6 @@ const AppendFormInForm = (props) => {
e.preventDefault();
e.stopPropagation();
setIsLoader(true);
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
try {
const contactQuery = new Parse.Object("contracts_Contactbook");
contactQuery.set("Name", name);
diff --git a/apps/OpenSign/src/components/Header.js b/apps/OpenSign/src/components/Header.js
index 2ed4af269..6306d5135 100644
--- a/apps/OpenSign/src/components/Header.js
+++ b/apps/OpenSign/src/components/Header.js
@@ -11,8 +11,6 @@ const Header = ({ showSidebar }) => {
let applogo = localStorage.getItem("appLogo") || "";
let username = localStorage.getItem("username");
const image = localStorage.getItem("profileImg") || dp;
- const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
- const [parseAppId] = useState(localStorage.getItem("parseAppId"));
const [isOpen, setIsOpen] = useState(false);
@@ -22,8 +20,6 @@ const Header = ({ showSidebar }) => {
const closeDropdown = () => {
setIsOpen(false);
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
Parse.User.logOut();
let appdata = localStorage.getItem("userSettings");
let applogo = localStorage.getItem("appLogo");
@@ -32,8 +28,8 @@ const Header = ({ showSidebar }) => {
let PageLanding = localStorage.getItem("PageLanding");
let domain = localStorage.getItem("domain");
let _appName = localStorage.getItem("_appName");
- let baseUrl = localStorage.getItem("BaseUrl12");
- let appid = localStorage.getItem("AppID12");
+ let baseUrl = localStorage.getItem("baseUrl");
+ let appid = localStorage.getItem("parseAppId");
localStorage.clear();
@@ -44,8 +40,8 @@ const Header = ({ showSidebar }) => {
localStorage.setItem("PageLanding", PageLanding);
localStorage.setItem("domain", domain);
localStorage.setItem("userSettings", appdata);
- localStorage.setItem("BaseUrl12", baseUrl);
- localStorage.setItem("AppID12", appid);
+ localStorage.setItem("baseUrl", baseUrl);
+ localStorage.setItem("parseAppId", appid);
navigation("/");
};
diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.js
index bd44d7f0d..96e97c1b0 100644
--- a/apps/OpenSign/src/components/LoginGoogle.js
+++ b/apps/OpenSign/src/components/LoginGoogle.js
@@ -48,8 +48,8 @@ const GoogleSignInBtn = ({
if (Parse.User.current()) {
await Parse.User.logOut();
}
- let baseUrl = localStorage.getItem("BaseUrl12");
- let appid = localStorage.getItem("AppID12");
+ let baseUrl = localStorage.getItem("baseUrl");
+ let appid = localStorage.getItem("parseAppId");
let applogo = localStorage.getItem("appLogo");
let domain = localStorage.getItem("domain");
let appversion = localStorage.getItem("appVersion");
@@ -63,8 +63,8 @@ const GoogleSignInBtn = ({
localStorage.clear();
- localStorage.setItem("BaseUrl12", baseUrl);
- localStorage.setItem("AppID12", appid);
+ localStorage.setItem("baseUrl", baseUrl);
+ localStorage.setItem("parseAppId", appid);
localStorage.setItem("appLogo", applogo);
localStorage.setItem("domain", domain);
localStorage.setItem("appversion", appversion);
@@ -191,8 +191,8 @@ const GoogleSignInBtn = ({
let PageLanding = localStorage.getItem("PageLanding");
let domain = localStorage.getItem("domain");
let _appName = localStorage.getItem("_appName");
- let baseUrl = localStorage.getItem("BaseUrl12");
- let appid = localStorage.getItem("AppID12");
+ let baseUrl = localStorage.getItem("baseUrl");
+ let appid = localStorage.getItem("parseAppId");
localStorage.clear();
@@ -203,8 +203,8 @@ const GoogleSignInBtn = ({
localStorage.setItem("PageLanding", PageLanding);
localStorage.setItem("domain", domain);
localStorage.setItem("userSettings", appdata);
- localStorage.setItem("BaseUrl12", baseUrl);
- localStorage.setItem("AppID12", appid);
+ localStorage.setItem("baseUrl", baseUrl);
+ localStorage.setItem("parseAppId", appid);
};
return (
<div style={{ position: "relative" }}>
diff --git a/apps/OpenSign/src/components/dashboard/DashboardCard.js b/apps/OpenSign/src/components/dashboard/DashboardCard.js
index 08d2a8904..bc131213f 100644
--- a/apps/OpenSign/src/components/dashboard/DashboardCard.js
+++ b/apps/OpenSign/src/components/dashboard/DashboardCard.js
@@ -24,9 +24,6 @@ const DashboardCard = (props) => {
};
let body = {};
let currentUser;
-
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
let currentUser1 = Parse.User.current();
currentUser = currentUser1.id;
let res;
@@ -82,8 +79,6 @@ const DashboardCard = (props) => {
} else {
setLoading(true);
try {
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
const currentUser = Parse.User.current();
let reg1 = /(\#.*?\#)/gi; // eslint-disable-line
let _query = props.Data.query;
@@ -223,8 +218,6 @@ const DashboardCard = (props) => {
if (restr.includes("#")) {
try {
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
const currentUser = Parse.User.current();
let res;
if (localStorage.getItem("Extand_Class")) {
diff --git a/apps/OpenSign/src/components/dashboard/DashboardReport.js b/apps/OpenSign/src/components/dashboard/DashboardReport.js
index ddb832024..e29ef149b 100644
--- a/apps/OpenSign/src/components/dashboard/DashboardReport.js
+++ b/apps/OpenSign/src/components/dashboard/DashboardReport.js
@@ -45,18 +45,16 @@ function DashboardReport(props) {
setActions(json.actions);
setReportName(json.reportName);
setHeading(json.heading);
- Parse.serverURL = localStorage.getItem("BaseUrl12");
- Parse.initialize(localStorage.getItem("AppID12"));
const currentUser = Parse.User.current().id;
const headers = {
"Content-Type": "application/json",
- "X-Parse-Application-Id": localStorage.getItem("AppID12"),
+ "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
sessiontoken: localStorage.getItem("accesstoken")
};
try {
const params = { reportId: id, skip: skipUserRecord, limit: limit };
- const url = `${localStorage.getItem("BaseUrl12")}/functions/getReport`;
+ const url = `${localStorage.getItem("baseUrl")}/functions/getReport`;
const res = await axios.post(url, params, {
headers: headers,
signal: abortController.signal // is used to cancel fetch query
diff --git a/apps/OpenSign/src/components/pdf/Header.js b/apps/OpenSign/src/components/pdf/Header.js
index 626671581..d2c64c7c5 100644
--- a/apps/OpenSign/src/components/pdf/Header.js
+++ b/apps/OpenSign/src/components/pdf/Header.js
@@ -433,7 +433,7 @@ function Header({
{recipient ? (
pdfUrl || isAlreadySign.mssg ? (
<div style={{ display: "flex", flexDirection: "row" }}>
- {pdfDetails[0] && pdfDetails.length > 0 && (
+ {pdfDetails && pdfDetails.length > 0 && (
<CertificateComponent />
)}
<button
diff --git a/apps/OpenSign/src/components/sidebar/Menu.js b/apps/OpenSign/src/components/sidebar/Menu.js
index c767ff673..b692b56c9 100644
--- a/apps/OpenSign/src/components/sidebar/Menu.js
+++ b/apps/OpenSign/src/components/sidebar/Menu.js
@@ -10,7 +10,7 @@ const Menu = ({ item, isOpen, closeSidebar }) => {
? `/${item.pageType}/${item.objectId}`
: `/${item.objectId}`
}
- className="mx-auto flex items-center hover:bg-[#eef1f5] p-3 lg:p-4"
+ className="mx-auto flex items-center hover:bg-[#eef1f5] p-3 lg:p-4 cursor-pointer"
onClick={closeSidebar}
tabIndex={isOpen ? 0 : -1}
role="menuitem"
diff --git a/apps/OpenSign/src/components/sidebar/Sidebar.js b/apps/OpenSign/src/components/sidebar/Sidebar.js
index 1ee1efc0c..62b41aa44 100644
--- a/apps/OpenSign/src/components/sidebar/Sidebar.js
+++ b/apps/OpenSign/src/components/sidebar/Sidebar.js
@@ -1,8 +1,8 @@
import React, { useState, useEffect } from "react";
-import Menu from './Menu';
+import Menu from "./Menu";
import Submenu from "./SubMenu";
-import SocialMedia from './SocialMedia';
+import SocialMedia from "./SocialMedia";
import Parse from "parse";
import dp from "../../assets/images/dp.png";
@@ -20,16 +20,10 @@ const Sidebar = ({ isOpen, closeSidebar }) => {
}, []);
const menuItem = async () => {
- const parseBaseUrl = localStorage.getItem("baseUrl");
- const parseAppId = localStorage.getItem("parseAppId");
-
try {
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
var sideMenu = Parse.Object.extend("w_menu");
var query = new Parse.Query(sideMenu);
query.equalTo("objectId", localStorage.getItem("defaultmenuid"));
-
const results = await query.first();
const resultjson = results.toJSON();
let result = resultjson;
@@ -37,7 +31,6 @@ const Sidebar = ({ isOpen, closeSidebar }) => {
} catch (e) {
console.error("Problem", e);
}
-
};
return (
@@ -47,7 +40,11 @@ const Sidebar = ({ isOpen, closeSidebar }) => {
>
<div className="flex px-2 py-3 gap-2 items-center shadow-md">
<div className="w-[75px] h-[75px] rounded-full ring-[2px] ring-offset-2 ring-gray-400 overflow-hidden">
- <img className="w-full h-full object-cover" src={image} alt="Profile" />
+ <img
+ className="w-full h-full object-cover"
+ src={image}
+ alt="Profile"
+ />
</div>
<div>
<p className="text-[14px] font-bold">{username}</p>
@@ -57,14 +54,27 @@ const Sidebar = ({ isOpen, closeSidebar }) => {
</div>
</div>
<nav aria-label="OpenSign Sidebar Navigation">
- <ul className="text-sm" role="menubar" aria-label="OpenSign Sidebar Navigation">
- {menuList.map((item) => (
+ <ul
+ className="text-sm"
+ role="menubar"
+ aria-label="OpenSign Sidebar Navigation"
+ >
+ {menuList.map((item) =>
!item.children ? (
- <Menu key={item.title} item={item} isOpen={isOpen} closeSidebar={closeSidebar} />
+ <Menu
+ key={item.title}
+ item={item}
+ isOpen={isOpen}
+ closeSidebar={closeSidebar}
+ />
) : (
- <Submenu key={item.title} item={item} closeSidebar={closeSidebar} />
+ <Submenu
+ key={item.title}
+ item={item}
+ closeSidebar={closeSidebar}
+ />
)
- ))}
+ )}
</ul>
</nav>
<footer className="mt-4 flex justify-center items-center text-[25px] text-black gap-3">
diff --git a/apps/OpenSign/src/components/sidebar/SubMenu.js b/apps/OpenSign/src/components/sidebar/SubMenu.js
index d4af05c68..01dd6362f 100644
--- a/apps/OpenSign/src/components/sidebar/SubMenu.js
+++ b/apps/OpenSign/src/components/sidebar/SubMenu.js
@@ -39,7 +39,7 @@ const Submenu = ({ item, closeSidebar }) => {
? `/${childItem.pageType}/${childItem.objectId}`
: `/${childItem.objectId}`
}
- className="block pl-6 md:pl-8 py-2 text-sm text-gray-700 hover:bg-blue-500 hover:text-white"
+ className="block pl-6 md:pl-8 py-2 text-sm text-gray-700 hover:bg-blue-500 hover:text-white cursor-pointer"
onClick={closeSidebar}
role="menuitem"
tabIndex={submenuOpen ? 0 : -1}
diff --git a/apps/OpenSign/src/constant/appinfo.js b/apps/OpenSign/src/constant/appinfo.js
index e379ee3e1..5467b55b9 100644
--- a/apps/OpenSign/src/constant/appinfo.js
+++ b/apps/OpenSign/src/constant/appinfo.js
@@ -3,7 +3,8 @@ export const appInfo = {
appTitle: "contracts",
applogo: logo,
appname: "contracts",
- baseurl: process.env.REACT_APP_SERVERURL
+ appId: process.env.REACT_APP_APPID ? process.env.REACT_APP_APPID : "opensign",
+ baseUrl: process.env.REACT_APP_SERVERURL
? process.env.REACT_APP_SERVERURL
: window.location.origin + "/api/app",
defaultRole: "contracts_User",
diff --git a/apps/OpenSign/src/constant/saveFileSize.js b/apps/OpenSign/src/constant/saveFileSize.js
index 8fd678da1..56927ff05 100644
--- a/apps/OpenSign/src/constant/saveFileSize.js
+++ b/apps/OpenSign/src/constant/saveFileSize.js
@@ -1,9 +1,6 @@
import axios from "axios";
-import Parse from "parse";
-const parseAppId = localStorage.getItem("AppID12");
-const serverUrl = localStorage.getItem("BaseUrl12");
-Parse.serverURL = serverUrl;
-Parse.initialize(parseAppId);
+const parseAppId = localStorage.getItem("parseAppId");
+const serverUrl = localStorage.getItem("baseUrl");
export const SaveFileSize = async (size, imageUrl) => {
//checking server url and save file's size
diff --git a/apps/OpenSign/src/index.js b/apps/OpenSign/src/index.js
index 9dad5e112..0acf4043a 100644
--- a/apps/OpenSign/src/index.js
+++ b/apps/OpenSign/src/index.js
@@ -14,6 +14,15 @@ import {
} from "react-dnd-multi-backend";
import DragElement from "./components/pdf/DragElement";
import TagManager from "react-gtm-module";
+import Parse from "parse";
+const appId = process.env.REACT_APP_APPID
+ ? process.env.REACT_APP_APPID
+ : "opensign";
+const serverUrl = process.env.REACT_APP_SERVERURL
+ ? process.env.REACT_APP_SERVERURL
+ : window.location.origin + "/api/app";
+Parse.initialize(appId);
+Parse.serverURL = serverUrl;
const HTML5toTouch = {
backends: [
diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js
index 5fbf2f84f..662ddf4af 100644
--- a/apps/OpenSign/src/layout/HomeLayout.js
+++ b/apps/OpenSign/src/layout/HomeLayout.js
@@ -110,7 +110,7 @@ const HomeLayout = () => {
// console.log("closeTour");
setIsTour(false);
const serverUrl = localStorage.getItem("baseUrl");
- const appId = localStorage.getItem("AppID12");
+ const appId = localStorage.getItem("parseAppId");
const extUserClass = localStorage.getItem("extended_class");
const json = JSON.parse(localStorage.getItem("Extand_Class"));
const extUserId = json && json.length > 0 && json[0].objectId;
diff --git a/apps/OpenSign/src/primitives/AddUser.js b/apps/OpenSign/src/primitives/AddUser.js
index 7e62ae6b7..42ff14115 100644
--- a/apps/OpenSign/src/primitives/AddUser.js
+++ b/apps/OpenSign/src/primitives/AddUser.js
@@ -11,9 +11,6 @@ const AddUser = (props) => {
const [isUserExist, setIsUserExist] = useState(false);
const parseBaseUrl = localStorage.getItem("baseUrl");
const parseAppId = localStorage.getItem("parseAppId");
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
-
useEffect(() => {
checkUserExist();
}, []);
@@ -50,8 +47,6 @@ const AddUser = (props) => {
e.preventDefault();
e.stopPropagation();
setIsLoader(true);
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
try {
const contactQuery = new Parse.Object("contracts_Contactbook");
contactQuery.set("Name", name);
diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js
index a2b11348a..136275a35 100644
--- a/apps/OpenSign/src/primitives/GetReportDisplay.js
+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js
@@ -219,7 +219,7 @@ const ReportTable = ({
const res = await axios.put(url + item.objectId, body, {
headers: {
"Content-Type": "application/json",
- "X-Parse-Application-Id": localStorage.getItem("AppID12"),
+ "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
"X-Parse-Session-Token": localStorage.getItem("accesstoken")
}
});
diff --git a/apps/OpenSign/src/primitives/SelectSigners.js b/apps/OpenSign/src/primitives/SelectSigners.js
index c70fc8660..96f0bd1af 100644
--- a/apps/OpenSign/src/primitives/SelectSigners.js
+++ b/apps/OpenSign/src/primitives/SelectSigners.js
@@ -18,11 +18,6 @@ const SelectSigners = (props) => {
const [selected, setSelected] = useState();
const [userData, setUserData] = useState({});
const [isError, setIsError] = useState(false);
- const parseBaseUrl = localStorage.getItem("baseUrl");
- const parseAppId = localStorage.getItem("parseAppId");
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
-
// `handleOptions` is used to set just save from quick form to selected option in dropdown
const handleOptions = (item) => {
setSelected(item);
diff --git a/apps/OpenSign/src/redux/actions/index.js b/apps/OpenSign/src/redux/actions/index.js
index 3e9e2816a..d04799bfd 100644
--- a/apps/OpenSign/src/redux/actions/index.js
+++ b/apps/OpenSign/src/redux/actions/index.js
@@ -3,38 +3,19 @@ import axios from "axios";
import { appInfo } from "../../constant/appinfo";
//For fetching application Information
-export const fetchAppInfo = (str, burl, app_id) => async (dispatch) => {
- Parse.serverURL = burl;
- Parse.initialize(app_id);
-
- const response = appInfo;
- let _base = ""; // Define _base here and initialize it to an empty string
- if (response && response.baseurl) {
- _base = response.baseurl.charAt(response.baseurl.length - 1);
- }
- localStorage.removeItem("baseUrl");
- localStorage.setItem("_appName", response.appname);
- localStorage.setItem("_app_objectId", response.objectId);
- if (_base === "/") {
- localStorage.setItem("baseUrl", response.baseurl);
- } else {
- localStorage.setItem("baseUrl", `${response.baseurl}/`);
- }
- localStorage.setItem("appLogo", response.applogo);
- localStorage.setItem("appVersion", response.version);
- if (response.enableWebNotification) {
- localStorage.setItem(
- "enableWebNotification",
- response.enableWebNotification
- );
- }
- localStorage.setItem("parseAppId", app_id);
+export const fetchAppInfo = () => async (dispatch) => {
+ localStorage.setItem("_appName", appInfo.appname);
+ localStorage.setItem("_app_objectId", appInfo.objectId);
+ localStorage.setItem("baseUrl", `${appInfo.baseUrl}/`);
+ localStorage.setItem("parseAppId", appInfo.appId);
+ localStorage.setItem("appLogo", appInfo.applogo);
+ localStorage.setItem("appVersion", appInfo.version);
localStorage.removeItem("userSettings");
- localStorage.setItem("userSettings", JSON.stringify(response.settings));
- localStorage.setItem("appTitle", response.appTitle);
- localStorage.setItem("fev_Icon", response.fev_Icon);
+ localStorage.setItem("userSettings", JSON.stringify(appInfo.settings));
+ localStorage.setItem("appTitle", appInfo.appTitle);
+ localStorage.setItem("fev_Icon", appInfo.fev_Icon);
// console.log("response ", response);
- dispatch({ type: "FATCH_APPINFO", payload: response });
+ dispatch({ type: "FATCH_APPINFO", payload: appInfo });
};
//for simple login
@@ -43,8 +24,6 @@ export const login = (username, password) => async (dispatch) => {
let baseUrl = localStorage.getItem("baseUrl");
let parseAppId = localStorage.getItem("parseAppId");
try {
- Parse.serverURL = baseUrl;
- Parse.initialize(parseAppId);
await Parse.User.logIn(username, password).then(
async function (res1) {
var resultjson = res1.toJSON();
@@ -110,7 +89,6 @@ export const login = (username, password) => async (dispatch) => {
localStorage.setItem("defaultmenuid", defaultmenuid);
localStorage.setItem("pageType", pageType);
localStorage.setItem("extended_class", element.extended_class);
- localStorage.setItem("userpointer", element.userpointer);
let _role = userGroup.replace(
`${localStorage.getItem("domain")}_`,
""
@@ -165,12 +143,7 @@ export const login = (username, password) => async (dispatch) => {
//for reset password
export const forgetPassword = (username) => async () => {
- // let res = {};
- let baseUrl = localStorage.getItem("BaseUrl12");
- let parseAppId = localStorage.getItem("AppID12");
try {
- Parse.serverURL = baseUrl;
- Parse.initialize(parseAppId);
await Parse.User.requestPasswordReset(username).then(
async function (res1) {
// var resultjson = res1;
diff --git a/apps/OpenSign/src/routes/ChangePassword.js b/apps/OpenSign/src/routes/ChangePassword.js
index 79fcd1431..c815558da 100644
--- a/apps/OpenSign/src/routes/ChangePassword.js
+++ b/apps/OpenSign/src/routes/ChangePassword.js
@@ -11,8 +11,6 @@ function ChangePassword() {
evt.preventDefault();
try {
if (newpassword === confirmpassword) {
- Parse.serverURL = localStorage.getItem("baseUrl");
- Parse.initialize(localStorage.getItem("parseAppId"));
Parse.User.logIn(localStorage.getItem("userEmail"), currentpassword)
.then(async (user) => {
if (user) {
diff --git a/apps/OpenSign/src/routes/Dashboard.js b/apps/OpenSign/src/routes/Dashboard.js
index e381cf364..0b53c4246 100644
--- a/apps/OpenSign/src/routes/Dashboard.js
+++ b/apps/OpenSign/src/routes/Dashboard.js
@@ -12,8 +12,6 @@ const Dashboard = (props) => {
const [dashboard, setdashboard] = useState([]);
const [classnameArray, setclassnameArray] = useState([]);
const [loading, setloading] = useState(false);
- const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
- const [parseAppId] = useState(localStorage.getItem("parseAppId"));
const [defaultQuery, setDefaultQuery] = useState("");
useEffect(() => {
@@ -32,8 +30,6 @@ const Dashboard = (props) => {
const getDashboard = async (id) => {
setloading(true);
try {
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
var forms = Parse.Object.extend("w_dashboard");
var query = new Parse.Query(forms);
query.equalTo("objectId", id);
diff --git a/apps/OpenSign/src/routes/ForgetPassword.js b/apps/OpenSign/src/routes/ForgetPassword.js
index e77ee1149..dddc5cb9a 100644
--- a/apps/OpenSign/src/routes/ForgetPassword.js
+++ b/apps/OpenSign/src/routes/ForgetPassword.js
@@ -37,11 +37,7 @@ function ForgotPassword(props) {
);
if (state.email) {
const username = state.email;
- let baseUrl = localStorage.getItem("BaseUrl12");
- let parseAppId = localStorage.getItem("AppID12");
try {
- Parse.serverURL = baseUrl;
- Parse.initialize(parseAppId);
await Parse.User.requestPasswordReset(username);
setSentStatus("success");
} catch (err) {
@@ -54,7 +50,7 @@ function ForgotPassword(props) {
};
useEffect(() => {
- props.fetchAppInfo(localStorage.getItem("domain"));
+ props.fetchAppInfo();
resize();
window.addEventListener("resize", resize);
return () => window.removeEventListener("resize", resize);
diff --git a/apps/OpenSign/src/routes/Form.js b/apps/OpenSign/src/routes/Form.js
index b58ed9590..87f505ddb 100644
--- a/apps/OpenSign/src/routes/Form.js
+++ b/apps/OpenSign/src/routes/Form.js
@@ -74,14 +74,6 @@ const Forms = (props) => {
};
const handleFileUpload = async (file) => {
- const url = process.env.REACT_APP_SERVERURL
- ? process.env.REACT_APP_SERVERURL
- : window.location.origin + "/api/app";
- const appId = process.env.REACT_APP_APPID
- ? process.env.REACT_APP_APPID
- : "opensign";
- Parse.serverURL = url;
- Parse.initialize(appId);
setfileload(true);
const fileName = file.name;
const name = sanitizeFileName(fileName);
diff --git a/apps/OpenSign/src/routes/Login.js b/apps/OpenSign/src/routes/Login.js
index dfe3003aa..bcca50fe5 100644
--- a/apps/OpenSign/src/routes/Login.js
+++ b/apps/OpenSign/src/routes/Login.js
@@ -44,11 +44,7 @@ function Login(props) {
setState({ ...state, loading: true });
GetLoginData();
}
- props.fetchAppInfo(
- localStorage.getItem("domain"),
- localStorage.getItem("BaseUrl12"),
- localStorage.getItem("AppID12")
- );
+ props.fetchAppInfo();
// eslint-disable-next-line
}, []);
const handleChange = (event) => {
@@ -67,8 +63,6 @@ function Login(props) {
let parseAppId = localStorage.getItem("parseAppId");
localStorage.setItem("appLogo", props.appInfo.applogo);
localStorage.setItem("appName", props.appInfo.appname);
- Parse.serverURL = localStorage.getItem("baseUrl");
- Parse.initialize(localStorage.getItem("parseAppId"));
// Pass the username and password to logIn function
await Parse.User.logIn(email, password)
.then(async (user) => {
@@ -149,11 +143,6 @@ function Login(props) {
"extended_class",
element.extended_class
);
- localStorage.setItem(
- "userpointer",
- element.userpointer
- );
-
const currentUser = Parse.User.current();
await Parse.Cloud.run("getUserDetails", {
email: currentUser.get("email")
@@ -397,8 +386,8 @@ function Login(props) {
setState({ ...state, thirdpartyLoader: value });
};
const thirdpartyLoginfn = async (sessionToken, billingDate) => {
- const baseUrl = localStorage.getItem("BaseUrl12");
- const parseAppId = localStorage.getItem("AppID12");
+ const baseUrl = localStorage.getItem("baseUrl");
+ const parseAppId = localStorage.getItem("parseAppId");
const res = await axios.get(baseUrl + "users/me", {
headers: {
"X-Parse-Session-Token": sessionToken,
@@ -486,7 +475,6 @@ function Login(props) {
"extended_class",
element.extended_class
);
- localStorage.setItem("userpointer", element.userpointer);
const currentUser = Parse.User.current();
await Parse.Cloud.run("getUserDetails", {
email: currentUser.get("email")
@@ -672,8 +660,6 @@ function Login(props) {
const GetLoginData = async () => {
setState({ ...state, loading: true });
try {
- Parse.serverURL = localStorage.getItem("baseUrl");
- Parse.initialize(localStorage.getItem("parseAppId"));
const user = await Parse.User.become(localStorage.getItem("accesstoken"));
let _usss = user.toJSON();
localStorage.setItem("UserInformation", JSON.stringify(_usss));
@@ -910,8 +896,8 @@ function Login(props) {
let PageLanding = localStorage.getItem("PageLanding");
let domain = localStorage.getItem("domain");
let _appName = localStorage.getItem("_appName");
- let baseUrl = localStorage.getItem("BaseUrl12");
- let appid = localStorage.getItem("AppID12");
+ let baseUrl = localStorage.getItem("baseUrl");
+ let appid = localStorage.getItem("parseAppId");
localStorage.clear();
@@ -922,8 +908,8 @@ function Login(props) {
localStorage.setItem("PageLanding", PageLanding);
localStorage.setItem("domain", domain);
localStorage.setItem("userSettings", appdata);
- localStorage.setItem("BaseUrl12", baseUrl);
- localStorage.setItem("AppID12", appid);
+ localStorage.setItem("baseUrl", baseUrl);
+ localStorage.setItem("parseAppId", appid);
};
return (
<div className="bg-white">
diff --git a/apps/OpenSign/src/routes/Pgsignup.js b/apps/OpenSign/src/routes/Pgsignup.js
index f3d12437d..2577011c4 100644
--- a/apps/OpenSign/src/routes/Pgsignup.js
+++ b/apps/OpenSign/src/routes/Pgsignup.js
@@ -7,15 +7,11 @@ import { connect } from "react-redux";
import Title from "../components/Title";
import { useNavigate, useLocation } from "react-router-dom";
-const appId = localStorage.getItem("AppID12");
-const server = localStorage.getItem("BaseUrl12");
-Parse.serverURL = server;
-Parse.initialize(appId);
const PgSignUp = (props) => {
const navigate = useNavigate();
const location = useLocation();
- const [parseBaseUrl] = useState(localStorage.getItem("BaseUrl12"));
- const [parseAppId] = useState(localStorage.getItem("AppID12"));
+ const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
+ const [parseAppId] = useState(localStorage.getItem("parseAppId"));
const [formData, setFormData] = useState({
password: "",
confirmPassword: ""
@@ -29,11 +25,7 @@ const PgSignUp = (props) => {
// below useEffect is used to fetch App data and save to redux state
useEffect(() => {
// Parse.User.logOut()
- props.fetchAppInfo(
- localStorage.getItem("domain"),
- localStorage.getItem("BaseUrl12"),
- localStorage.getItem("AppID12")
- );
+ props.fetchAppInfo();
handleSignedUpUser();
// eslint-disable-next-line
}, []);
@@ -224,8 +216,8 @@ const PgSignUp = (props) => {
};
const handleNavigation = async (sessionToken) => {
- const baseUrl = localStorage.getItem("BaseUrl12");
- const parseAppId = localStorage.getItem("AppID12");
+ const baseUrl = localStorage.getItem("baseUrl");
+ const parseAppId = localStorage.getItem("parseAppId");
const res = await axios.get(baseUrl + "users/me", {
headers: {
"X-Parse-Session-Token": sessionToken,
@@ -299,8 +291,6 @@ const PgSignUp = (props) => {
"extended_class",
element.extended_class
);
- localStorage.setItem("userpointer", element.userpointer);
-
const currentUser = Parse.User.current();
await Parse.Cloud.run("getUserDetails", {
email: currentUser.get("email")
@@ -407,11 +397,11 @@ const PgSignUp = (props) => {
localStorage.setItem("pageType", element.pageType);
setIsLoader(false);
const redirectUrl =
- location?.state?.from ||
- `/${element.pageType}/${element.pageId}`;
+ location?.state?.from ||
+ `/${element.pageType}/${element.pageId}`;
- // Redirect to the appropriate URL after successful login
- navigate(redirectUrl);
+ // Redirect to the appropriate URL after successful login
+ navigate(redirectUrl);
}
},
(error) => {
diff --git a/apps/OpenSign/src/routes/PlaceHolderSign.js b/apps/OpenSign/src/routes/PlaceHolderSign.js
index de66823c2..9e3817004 100644
--- a/apps/OpenSign/src/routes/PlaceHolderSign.js
+++ b/apps/OpenSign/src/routes/PlaceHolderSign.js
@@ -702,11 +702,6 @@ function PlaceHolderSign() {
containerWH
);
- const parseBaseUrl = localStorage.getItem("baseUrl");
- const parseAppId = localStorage.getItem("parseAppId");
- Parse.initialize(parseAppId);
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
const fileName = sanitizeFileName(pdfDetails[0].Name) + ".pdf";
const pdfFile = new Parse.File(fileName, { base64: pdfBytes });
diff --git a/apps/OpenSign/src/routes/Report.js b/apps/OpenSign/src/routes/Report.js
index b47be1f34..1868dab8e 100644
--- a/apps/OpenSign/src/routes/Report.js
+++ b/apps/OpenSign/src/routes/Report.js
@@ -53,18 +53,16 @@ const Report = () => {
setHeading(json.heading);
setReportName(json.reportName);
setForm(json.form);
- Parse.serverURL = localStorage.getItem("BaseUrl12");
- Parse.initialize(localStorage.getItem("AppID12"));
const currentUser = Parse.User.current().id;
const headers = {
"Content-Type": "application/json",
- "X-Parse-Application-Id": localStorage.getItem("AppID12"),
+ "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
sessiontoken: localStorage.getItem("accesstoken")
};
try {
const params = { reportId: id, skip: skipUserRecord, limit: limit };
- const url = `${localStorage.getItem("BaseUrl12")}/functions/getReport`;
+ const url = `${localStorage.getItem("baseUrl")}/functions/getReport`;
const res = await axios.post(url, params, {
headers: headers,
signal: abortController.signal // is used to cancel fetch query
diff --git a/apps/OpenSign/src/routes/Signup.js b/apps/OpenSign/src/routes/Signup.js
index eed8f4bae..51a79ce47 100644
--- a/apps/OpenSign/src/routes/Signup.js
+++ b/apps/OpenSign/src/routes/Signup.js
@@ -16,8 +16,6 @@ const Signup = (props) => {
const [phone, setPhone] = useState("");
const [password, setPassword] = useState("");
const [email, setEmail] = useState("");
- const [parseBaseUrl] = useState(localStorage.getItem("baseUrl"));
- const [parseAppId] = useState(localStorage.getItem("parseAppId"));
const [company, setCompany] = useState("");
const [jobTitle, setJobTitle] = useState("");
const [state, setState] = useState({
@@ -37,8 +35,8 @@ const Signup = (props) => {
if (Parse.User.current()) {
await Parse.User.logOut();
}
- let baseUrl = localStorage.getItem("BaseUrl12");
- let appid = localStorage.getItem("AppID12");
+ let baseUrl = localStorage.getItem("baseUrl");
+ let appid = localStorage.getItem("parseAppId");
let applogo = localStorage.getItem("appLogo");
let domain = localStorage.getItem("domain");
let appversion = localStorage.getItem("appVersion");
@@ -52,8 +50,8 @@ const Signup = (props) => {
localStorage.clear();
- localStorage.setItem("BaseUrl12", baseUrl);
- localStorage.setItem("AppID12", appid);
+ localStorage.setItem("baseUrl", baseUrl);
+ localStorage.setItem("parseAppId", appid);
localStorage.setItem("appLogo", applogo);
localStorage.setItem("domain", domain);
localStorage.setItem("appversion", appversion);
@@ -81,8 +79,6 @@ const Signup = (props) => {
};
localStorage.setItem("userDetails", JSON.stringify(userDetails));
try {
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
event.preventDefault();
var user = new Parse.User();
user.set("name", name);
@@ -130,12 +126,8 @@ const Signup = (props) => {
alert("User already exists with this username!");
setState({ loading: false });
} else {
- let baseUrl = localStorage.getItem("BaseUrl12");
- let parseAppId = localStorage.getItem("AppID12");
// console.log("state.email ", email);
try {
- Parse.serverURL = baseUrl;
- Parse.initialize(parseAppId);
await Parse.User.requestPasswordReset(email).then(
async function (res1) {
if (res1.data === undefined) {
@@ -162,8 +154,8 @@ const Signup = (props) => {
};
const handleNavigation = async (sessionToken) => {
- const baseUrl = localStorage.getItem("BaseUrl12");
- const parseAppId = localStorage.getItem("AppID12");
+ const baseUrl = localStorage.getItem("baseUrl");
+ const parseAppId = localStorage.getItem("parseAppId");
const res = await axios.get(baseUrl + "users/me", {
headers: {
"X-Parse-Session-Token": sessionToken,
@@ -237,8 +229,6 @@ const Signup = (props) => {
"extended_class",
element.extended_class
);
- localStorage.setItem("userpointer", element.userpointer);
-
await Parse.Cloud.run("getUserDetails", {
email: email
}).then(
@@ -443,11 +433,7 @@ const Signup = (props) => {
}
};
useEffect(() => {
- props.fetchAppInfo(
- localStorage.getItem("domain"),
- localStorage.getItem("BaseUrl12"),
- localStorage.getItem("AppID12")
- );
+ props.fetchAppInfo();
// eslint-disable-next-line
}, []);
diff --git a/apps/OpenSign/src/routes/UserProfile.js b/apps/OpenSign/src/routes/UserProfile.js
index 756e128a2..186415e98 100644
--- a/apps/OpenSign/src/routes/UserProfile.js
+++ b/apps/OpenSign/src/routes/UserProfile.js
@@ -20,9 +20,6 @@ function UserProfile() {
const [percentage, setpercentage] = useState(0);
const [isDisableDocId, setIsDisableDocId] = useState(false);
- Parse.serverURL = parseBaseUrl;
- Parse.initialize(parseAppId);
-
useEffect(() => {
const extClass = localStorage.getItem("Extand_Class");
const jsonSender = JSON.parse(extClass);
diff --git a/apps/OpenSignServer/databases/migrations/20240306123606-add_fields_contracts_users_cjs.cjs b/apps/OpenSignServer/databases/migrations/20240306123606-add_fields_contracts_users_cjs.cjs
new file mode 100644
index 000000000..2875ef34e
--- /dev/null
+++ b/apps/OpenSignServer/databases/migrations/20240306123606-add_fields_contracts_users_cjs.cjs
@@ -0,0 +1,50 @@
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.up = async Parse => {
+ // TODO: set className here
+ const className = 'contracts_Users';
+ const schema = new Parse.Schema(className);
+ schema.addBoolean('HeaderDocId');
+ schema.addString('Webhook');
+ return schema.update();
+};
+
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.down = async Parse => {
+ // TODO: set className here
+ const className = 'contracts_Users';
+ const schema = new Parse.Schema(className);
+
+ schema.addString('Name');
+ schema.addString('Phone');
+ schema.addString('JobTitle');
+ schema.addString('Email');
+ schema.addString('Company');
+ schema.addString('UserRole');
+ schema.addObject('Plan');
+ schema.addString('Customer_id');
+ schema.addString('Subscription_id');
+ schema.addDate('Next_billing_date');
+ schema.addBoolean('IsContactEntry');
+ schema.addBoolean('ShareWithTeam');
+ schema.addPointer('TenantId', 'partners_Tenant');
+ schema.addPointer('UserId', '_User');
+ schema.addPointer('CreatedBy', '_User');
+ schema.addArray('TourStatus');
+ schema.setCLP({
+ get: {},
+ find: {},
+ count: {},
+ create: { '*': true },
+ update: { '*': true },
+ delete: {},
+ addField: {},
+ });
+
+ return schema.update();
+};