Merge remote-tracking branch 'upstream/main' into feat/39

frontend/pages/users/[id].js

@@ -3,7 +3,6 @@ import Head from "next/head";
 import Image from "next/image";
 import { useRouter } from "next/router";
 import { useTranslation } from "next-i18next";
-import { appWithTranslation } from "next-i18next";
 import { faMagnifyingGlass, faPlus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
@@ -14,29 +13,29 @@ import NavHeader from "~/components/navigation/NavHeader";
 import guidGenerator from "~/utilities/randomId";
 import { getTranslatedServerSideProps } from "~/utilities/withTranslateProps";
 
-import getOrganizationUsers from "../api/organization/GetOrgUsers";
-import getUser from "../api/user/getUser";
+import getOrganizationUsers from '../api/organization/GetOrgUsers';
+import getUser from '../api/user/getUser';
 // import DeleteUserDialog from '~/components/basic/dialog/DeleteUserDialog';
-import addUserToWorkspace from "../api/workspace/addUserToWorkspace";
-import getWorkspaceUsers from "../api/workspace/getWorkspaceUsers";
-import uploadKeys from "../api/workspace/uploadKeys";
+import addUserToWorkspace from '../api/workspace/addUserToWorkspace';
+import getWorkspaceUsers from '../api/workspace/getWorkspaceUsers';
+import uploadKeys from '../api/workspace/uploadKeys';
 
 // #TODO: Update all the workspaceIds
-const crypto = require("crypto");
+const crypto = require('crypto');
 const {
   decryptAssymmetric,
-  encryptAssymmetric,
-} = require("../../components/utilities/cryptography/crypto");
-const nacl = require("tweetnacl");
-nacl.util = require("tweetnacl-util");
+  encryptAssymmetric
+} = require('../../components/utilities/cryptography/crypto');
+const nacl = require('tweetnacl');
+nacl.util = require('tweetnacl-util');
 
 export default function Users() {
   let [isAddOpen, setIsAddOpen] = useState(false);
   // let [isDeleteOpen, setIsDeleteOpen] = useState(false);
   // let [userIdToBeDeleted, setUserIdToBeDeleted] = useState(false);
-  let [email, setEmail] = useState("");
-  const [personalEmail, setPersonalEmail] = useState("");
-  const [searchUsers, setSearchUsers] = useState("");
+  let [email, setEmail] = useState('');
+  const [personalEmail, setPersonalEmail] = useState('');
+  const [searchUsers, setSearchUsers] = useState('');
 
   const { t } = useTranslation();
 
@@ -62,25 +61,25 @@ export default function Users() {
   async function submitAddModal() {
     let result = await addUserToWorkspace(email, router.query.id);
     if (result?.invitee && result?.latestKey) {
-      const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY");
+      const PRIVATE_KEY = localStorage.getItem('PRIVATE_KEY');
 
       // assymmetrically decrypt symmetric key with local private key
       const key = decryptAssymmetric({
         ciphertext: result.latestKey.encryptedKey,
         nonce: result.latestKey.nonce,
         publicKey: result.latestKey.sender.publicKey,
-        privateKey: PRIVATE_KEY,
+        privateKey: PRIVATE_KEY
       });
 
       const { ciphertext, nonce } = encryptAssymmetric({
         plaintext: key,
         publicKey: result.invitee.publicKey,
-        privateKey: PRIVATE_KEY,
+        privateKey: PRIVATE_KEY
       });
 
       uploadKeys(router.query.id, result.invitee._id, ciphertext, nonce);
     }
-    setEmail("");
+    setEmail('');
     setIsAddOpen(false);
     router.reload();
   }
@@ -98,7 +97,7 @@ export default function Users() {
 
     workspaceId = router.query.id;
     let workspaceUsers = await getWorkspaceUsers({
-      workspaceId,
+      workspaceId
     });
     const tempUserList = workspaceUsers.map((user) => ({
       key: guidGenerator(),
@@ -109,16 +108,16 @@ export default function Users() {
       status: user?.status,
       userId: user.user?._id,
       membershipId: user._id,
-      publicKey: user.user?.publicKey,
+      publicKey: user.user?.publicKey
     }));
     setUserList(tempUserList);
     const orgUsers = await getOrganizationUsers({
-      orgId: localStorage.getItem("orgData.id"),
+      orgId: localStorage.getItem('orgData.id')
     });
     setOrgUserList(orgUsers);
     setEmail(
       orgUsers
-        ?.filter((user) => user.status == "accepted")
+        ?.filter((user) => user.status == 'accepted')
         .map((user) => user.user.email)
         .filter(
           (email) => !tempUserList?.map((user1) => user1.email).includes(email)
@@ -152,7 +151,7 @@ export default function Users() {
         submitModal={submitAddModal}
         email={email}
         data={orgUserList
-          ?.filter((user) => user.status == "accepted")
+          ?.filter((user) => user.status == 'accepted')
           .map((user) => user.user.email)
           .filter(
             (email) => !userList?.map((user1) => user1.email).includes(email)