Skip to content

🔥 The free & Open Source DocuSign alternative

fix: teams are not available in dropdown when creating user

prafull-opensignlabs572ec3658ed1
diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.js
index f4a3460b0..ff269fc55 100644
--- a/apps/OpenSign/src/components/AddUser.js
+++ b/apps/OpenSign/src/components/AddUser.js
@@ -35,15 +35,7 @@ const AddUser = (props) => {
const getTeamList = async () => {
setFormdata((prev) => ({ ...prev, password: generatePassword(12) }));
- const extUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
- const team = new Parse.Query("contracts_Teams");
- team.equalTo("OrganizationId", {
- __type: "Pointer",
- className: "contracts_Organizations",
- objectId: extUser.OrganizationId.objectId
- });
- team.notEqualTo("IsActive", false);
- const teamRes = await team.find();
+ const teamRes = await Parse.Cloud.run("getteams");
if (teamRes.length > 0) {
const _teamRes = JSON.parse(JSON.stringify(teamRes));
setTeamList(_teamRes);
diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js
index c37d296a8..89f748c31 100644
--- a/apps/OpenSign/src/layout/HomeLayout.js
+++ b/apps/OpenSign/src/layout/HomeLayout.js
@@ -40,7 +40,7 @@ const HomeLayout = () => {
try {
// Use the session token to validate the user
const userQuery = new Parse.Query(Parse.User);
- const user = await userQuery.get(Parse.User.current().id, {
+ const user = await userQuery.get(Parse?.User?.current()?.id, {
sessionToken: localStorage.getItem("accesstoken")
});
if (user) {
@@ -246,7 +246,7 @@ const HomeLayout = () => {
const handleLoginBtn = () => {
try {
- Parse.User.logOut();
+ Parse?.User?.logOut();
} catch (err) {
console.log("err ", err);
} finally {
diff --git a/apps/OpenSign/src/primitives/ValidateRoute.js b/apps/OpenSign/src/primitives/ValidateRoute.js
index 9c4f01e07..2beb48d8b 100644
--- a/apps/OpenSign/src/primitives/ValidateRoute.js
+++ b/apps/OpenSign/src/primitives/ValidateRoute.js
@@ -7,24 +7,26 @@ const ValidateRoute = () => {
try {
// Use the session token to validate the user
const userQuery = new Parse.Query(Parse.User);
- const user = await userQuery.get(Parse.User.current().id, {
+ const user = await userQuery.get(Parse?.User?.current()?.id, {
sessionToken: localStorage.getItem("accesstoken")
});
if (!user) {
handlelogout();
}
} catch (error) {
+ console.log("err in validate route", error);
handlelogout();
}
})();
}, []);
const handlelogout = async () => {
try {
- Parse.User.logOut();
+ // if (Parse?.User?.current()) {
+ // Parse?.User?.logOut();
+ // }
localStorage.removeItem("accesstoken");
} catch (err) {
console.log("err ", err);
- } finally {
localStorage.removeItem("accesstoken");
}
};