Merge pull request #969 from OpenSignLabs/multiuser_issue

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);

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 {

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");
     }
   };