From 968af64ee785a8750597e6c8abe7748cf124f53b Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Sat, 10 Dec 2022 22:24:02 +0300
Subject: [PATCH 01/12] refactor: set data as a map instead of list

---
 .../utilities/secrets/getSecretsForProject.js | 15 ++---
 frontend/pages/dashboard/[id].js              | 58 +++++++++----------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/frontend/components/utilities/secrets/getSecretsForProject.js b/frontend/components/utilities/secrets/getSecretsForProject.js
index 7bdac922ff..8b353af7e5 100644
--- a/frontend/components/utilities/secrets/getSecretsForProject.js
+++ b/frontend/components/utilities/secrets/getSecretsForProject.js
@@ -68,13 +68,14 @@ const getSecretsForProject = async ({
     setFileState(tempFileState);
 
     setData(
-      tempFileState.map((line, index) => [
-        guidGenerator(),
-        index,
-        line["key"],
-        line["value"],
-        line["type"],
-      ])
+      tempFileState.map((line, index) => {
+        return {
+          id: guidGenerator(),
+          key: line["key"],
+          value: line["value"],
+          type: line["type"]
+        }
+      })
       // .sort((a, b) =>
       // 	sortMethod == "alphabetical"
       // 		? a[2].localeCompare(b[2])
diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index bec6849ad6..64befe1053 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -74,7 +74,7 @@ const KeyPair = ({
               onChangeHandler={modifyKey}
               type="varName"
               index={keyPair[1]}
-              value={keyPair[2]}
+              value={keyPair.key}
               duplicates={duplicates}
             />
           </div>
@@ -85,7 +85,7 @@ const KeyPair = ({
               onChangeHandler={modifyValue}
               type="value"
               index={keyPair[1]}
-              value={keyPair[3]}
+              value={keyPair.value}
               blurred={isBlurred}
             />
           </div>
@@ -114,7 +114,7 @@ const KeyPair = ({
               <div
                 onClick={() =>
                   modifyVisibility(
-                    keyPair[4] == "personal" ? "shared" : "personal",
+                    keyPair.type == "personal" ? "shared" : "personal",
                     keyPair[1]
                   )
                 }
@@ -122,10 +122,10 @@ const KeyPair = ({
               >
                 <FontAwesomeIcon
                   className="text-lg pl-1.5 pr-3"
-                  icon={keyPair[4] == "personal" ? faPeopleGroup : faPerson}
+                  icon={keyPair.type == "personal" ? faPeopleGroup : faPerson}
                 />
                 <div className="text-sm">
-                  {keyPair[4] == "personal" ? "Make Shared" : "Make Personal"}
+                  {keyPair.type == "personal" ? "Make Shared" : "Make Personal"}
                 </div>
               </div>
               <div
@@ -190,7 +190,7 @@ const KeyPair = ({
         <div className="w-2"></div>
         <div className="opacity-50 hover:opacity-100 duration-200">
           <Button
-            onButtonPressed={() => deleteRow(keyPair[0])}
+            onButtonPressed={() => deleteRow(keyPair.id)}
             color="red"
             size="icon-sm"
             icon={faX}
@@ -322,12 +322,12 @@ export default function Dashboard() {
 
   const deleteRow = (id) => {
     setButtonReady(true);
-    setData(data.filter((row) => row[0] !== id));
+    setData(data.filter((row) => row.id !== id));
   };
 
   const modifyValue = (value, id) => {
     setData((oldData) => {
-      oldData[id][3] = value;
+      oldData[id].value = value;
       return [...oldData];
     });
     setButtonReady(true);
@@ -335,7 +335,7 @@ export default function Dashboard() {
 
   const modifyKey = (value, id) => {
     setData((oldData) => {
-      oldData[id][2] = value;
+      oldData[id].key = value;
       return [...oldData];
     });
     setButtonReady(true);
@@ -343,7 +343,7 @@ export default function Dashboard() {
 
   const modifyVisibility = (value, id) => {
     setData((oldData) => {
-      oldData[id][4] = value;
+      oldData[id].type = value;
       return [...oldData];
     });
     setButtonReady(true);
@@ -369,7 +369,7 @@ export default function Dashboard() {
     // Format the new object with environment variables
     let obj = Object.assign(
       {},
-      ...data.map((row) => ({ [row[2]]: [row[3], row[4]] }))
+      ...data.map((row) => ({ [row.key]: [row.value, row.type] }))
     );
 
     // Checking if any of the secret keys start with a number - if so, don't do anything
@@ -378,9 +378,9 @@ export default function Dashboard() {
       .every((v) => v === false);
     const duplicatesExist =
       data
-        ?.map((item) => item[2])
+        ?.map((item) => item.key)
         .filter(
-          (item, index) => index !== data?.map((item) => item[2]).indexOf(item)
+          (item, index) => index !== data?.map((item) => item.key).indexOf(item)
         ).length > 0;
 
     if (nameErrors) {
@@ -415,7 +415,7 @@ export default function Dashboard() {
       ) {
         let objIntegration = Object.assign(
           {},
-          ...data.map((row) => ({ [row[2]]: row[3] }))
+          ...data.map((row) => ({ [row.key]: row.value }))
         );
         await pushKeysIntegration({
           obj: objIntegration,
@@ -442,7 +442,7 @@ export default function Dashboard() {
 
   // This function downloads the secrets as a .env file
   const download = () => {
-    const file = data.map((item) => [item[2], item[3]].join("=")).join("\n");
+    const file = data.map((item) => [item.key, item.value].join("=")).join("\n");
     const blob = new Blob([file]);
     const fileDownloadUrl = URL.createObjectURL(blob);
     let alink = document.createElement("a");
@@ -648,19 +648,19 @@ export default function Dashboard() {
                     {data
                       .filter(
                         (keyPair) =>
-                          keyPair[2]
+                          keyPair.key
                             .toLowerCase()
                             .includes(searchKeys.toLowerCase()) &&
-                          keyPair[4] == "personal"
+                          keyPair.type == "personal"
                       )
                       .sort((a, b) =>
                         sortMethod == "alphabetical"
-                          ? a[2].localeCompare(b[2])
-                          : b[2].localeCompare(a[2])
+                          ? a.key.localeCompare(b.key)
+                          : b.key.localeCompare(a.key)
                       )
                       ?.map((keyPair, index) => (
                         <KeyPair
-                          key={keyPair[0]}
+                          key={keyPair.id}
                           keyPair={keyPair}
                           deleteRow={deleteCertainRow}
                           modifyValue={listenChangeValue}
@@ -668,11 +668,11 @@ export default function Dashboard() {
                           modifyVisibility={listenChangeVisibility}
                           isBlurred={blurred}
                           duplicates={data
-                            ?.map((item) => item[2])
+                            ?.map((item) => item.key)
                             .filter(
                               (item, index) =>
                                 index !==
-                                data?.map((item) => item[2]).indexOf(item)
+                                data?.map((item) => item.key).indexOf(item)
                             )}
                         />
                       ))}
@@ -702,19 +702,19 @@ export default function Dashboard() {
                     {data
                       .filter(
                         (keyPair) =>
-                          keyPair[2]
+                          keyPair.key
                             .toLowerCase()
                             .includes(searchKeys.toLowerCase()) &&
-                          keyPair[4] == "shared"
+                          keyPair.type == "shared"
                       )
                       .sort((a, b) =>
                         sortMethod == "alphabetical"
-                          ? a[2].localeCompare(b[2])
-                          : b[2].localeCompare(a[2])
+                          ? a.key.localeCompare(b.key)
+                          : b.key.localeCompare(a.key)
                       )
                       ?.map((keyPair, index) => (
                         <KeyPair
-                          key={keyPair[0]}
+                          key={keyPair.id}
                           keyPair={keyPair}
                           deleteRow={deleteCertainRow}
                           modifyValue={listenChangeValue}
@@ -722,11 +722,11 @@ export default function Dashboard() {
                           modifyVisibility={listenChangeVisibility}
                           isBlurred={blurred}
                           duplicates={data
-                            ?.map((item) => item[2])
+                            ?.map((item) => item.key)
                             .filter(
                               (item, index) =>
                                 index !==
-                                data?.map((item) => item[2]).indexOf(item)
+                                data?.map((item) => item.key).indexOf(item)
                             )}
                         />
                       ))}

From c2f5f19f55dc42c8ab8ca1c3610c13c05167bdcf Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Sun, 11 Dec 2022 16:59:32 +0300
Subject: [PATCH 02/12] refactor: instead of the index and we pass the keypair
 id

---
 frontend/pages/dashboard/[id].js | 47 ++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index 64befe1053..495ff7c044 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -45,7 +45,7 @@ import getWorkspaces from "../api/workspace/getWorkspaces";
 /**
  * This component represent a single row for an environemnt variable on the dashboard
  * @param {object} obj
- * @param {String[]} obj.keyPair - data related to the environment variable (index, key, value, public/private)
+ * @param {String[]} obj.keyPair - data related to the environment variable (id, key, value, public/private)
  * @param {function} obj.deleteRow - a function to delete a certain keyPair
  * @param {function} obj.modifyKey - modify the key of a certain environment variable
  * @param {function} obj.modifyValue - modify the value of a certain environment variable
@@ -73,7 +73,7 @@ const KeyPair = ({
             <DashboardInputField
               onChangeHandler={modifyKey}
               type="varName"
-              index={keyPair[1]}
+              id={keyPair.id}
               value={keyPair.key}
               duplicates={duplicates}
             />
@@ -84,7 +84,7 @@ const KeyPair = ({
             <DashboardInputField
               onChangeHandler={modifyValue}
               type="value"
-              index={keyPair[1]}
+              id={keyPair.id}
               value={keyPair.value}
               blurred={isBlurred}
             />
@@ -115,7 +115,7 @@ const KeyPair = ({
                 onClick={() =>
                   modifyVisibility(
                     keyPair.type == "personal" ? "shared" : "personal",
-                    keyPair[1]
+                    keyPair.id
                   )
                 }
                 className="relative flex justify-start items-center cursor-pointer select-none py-2 px-2 rounded-md text-gray-400 hover:bg-white/10 duration-200 hover:text-gray-200 w-full"
@@ -139,7 +139,7 @@ const KeyPair = ({
                       [...Array(randomStringLength)]
                         .map(() => Math.floor(Math.random() * 16).toString(16))
                         .join(""),
-                      keyPair[1]
+                      keyPair.id
                     );
                   }
                 }}
@@ -147,7 +147,7 @@ const KeyPair = ({
               >
                 <FontAwesomeIcon
                   className="text-lg pl-1.5 pr-3"
-                  icon={keyPair[3] == "" ? faPlus : faShuffle}
+                  icon={keyPair.value == "" ? faPlus : faShuffle}
                 />
                 <div className="text-sm justify-between flex flex-row w-full">
                   <p>Generate Random Hex</p>
@@ -269,6 +269,7 @@ export default function Dashboard() {
     setSortMethod(
       sortMethod == "alphabetical" ? "-alphabetical" : "alphabetical"
     );
+    sortValuesHandler()
   };
 
   useEffect(() => {
@@ -397,8 +398,9 @@ export default function Dashboard() {
       });
     }
 
-    // Once "Save changed is clicked", disable that button
+    // Once "Save changed is clicked", disable that button and sort values
     setButtonReady(false);
+    sortValuesHandler()
     pushKeys({ obj, workspaceId: router.query.id, env });
 
     /**
@@ -440,6 +442,21 @@ export default function Dashboard() {
     setBlurred(!blurred);
   };
 
+  const sortValuesHandler = () => {
+    /**
+     * Since react's SetStateActionHandler optimises renders when values don't change 
+     * we have to map and return a new sorted list to force a render.
+     * @returns {sorted list}
+    */
+
+    let sortedData = data.sort((a, b) =>
+      sortMethod == "alphabetical"
+        ? a.key.localeCompare(b.key)
+        : b.key.localeCompare(a.key)
+    ).map((item) => item)
+    setData(sortedData)
+  }
+
   // This function downloads the secrets as a .env file
   const download = () => {
     const file = data.map((item) => [item.key, item.value].join("=")).join("\n");
@@ -652,13 +669,7 @@ export default function Dashboard() {
                             .toLowerCase()
                             .includes(searchKeys.toLowerCase()) &&
                           keyPair.type == "personal"
-                      )
-                      .sort((a, b) =>
-                        sortMethod == "alphabetical"
-                          ? a.key.localeCompare(b.key)
-                          : b.key.localeCompare(a.key)
-                      )
-                      ?.map((keyPair, index) => (
+                      )?.map((keyPair) => (
                         <KeyPair
                           key={keyPair.id}
                           keyPair={keyPair}
@@ -706,13 +717,7 @@ export default function Dashboard() {
                             .toLowerCase()
                             .includes(searchKeys.toLowerCase()) &&
                           keyPair.type == "shared"
-                      )
-                      .sort((a, b) =>
-                        sortMethod == "alphabetical"
-                          ? a.key.localeCompare(b.key)
-                          : b.key.localeCompare(a.key)
-                      )
-                      ?.map((keyPair, index) => (
+                      )?.map((keyPair) => (
                         <KeyPair
                           key={keyPair.id}
                           keyPair={keyPair}

From b3a50d657d7410e435f041f0803b38b421ebdb15 Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Sun, 11 Dec 2022 17:00:25 +0300
Subject: [PATCH 03/12] refactor: call modify fns with id instead of index

---
 .../components/dashboard/DashboardInputField.tsx     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/components/dashboard/DashboardInputField.tsx b/frontend/components/dashboard/DashboardInputField.tsx
index 7a5b4a048d..cda6b381b7 100644
--- a/frontend/components/dashboard/DashboardInputField.tsx
+++ b/frontend/components/dashboard/DashboardInputField.tsx
@@ -7,8 +7,8 @@ import guidGenerator from "../utilities/randomId";
 const REGEX = /([$]{.*?})/g;
 
 interface DashboardInputFieldProps {
-  index: number;
-  onChangeHandler: (value: string, index: number) => void;
+  id: string;
+  onChangeHandler: (value: string, id: string) => void;
   value: string;
   type: "varName" | "value";
   blurred: boolean;
@@ -18,7 +18,7 @@ interface DashboardInputFieldProps {
 /**
  * This component renders the input fields on the dashboard
  * @param {object} obj - the order number of a keyPair
- * @param {number} obj.index - the order number of a keyPair
+ * @param {string} obj.id - the order number of a keyPair
  * @param {function} obj.onChangeHandler - what happens when the input is modified
  * @param {string} obj.type - whether the input field is for a Key Name or for a Key Value
  * @param {string} obj.value - value of the InputField
@@ -28,7 +28,7 @@ interface DashboardInputFieldProps {
  */
 
 const DashboardInputField = ({
-  index,
+  id,
   onChangeHandler,
   type,
   value,
@@ -57,7 +57,7 @@ const DashboardInputField = ({
         >
           <input
             onChange={(e) =>
-              onChangeHandler(e.target.value.toUpperCase(), index)
+              onChangeHandler(e.target.value.toUpperCase(), id)
             }
             type={type}
             value={value}
@@ -87,7 +87,7 @@ const DashboardInputField = ({
         >
           <input
             value={value}
-            onChange={(e) => onChangeHandler(e.target.value, index)}
+            onChange={(e) => onChangeHandler(e.target.value, id)}
             onScroll={syncScroll}
             className={`${
               blurred

From 36372ebef3ac9fec4c1612acde7a739532a78e0b Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Sun, 11 Dec 2022 17:53:49 +0300
Subject: [PATCH 04/12] feat: find keypair by id during mutation

---
 frontend/pages/dashboard/[id].js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index 495ff7c044..6a0822c87a 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -328,7 +328,7 @@ export default function Dashboard() {
 
   const modifyValue = (value, id) => {
     setData((oldData) => {
-      oldData[id].value = value;
+      oldData.find(data => data.id === id).value = value;
       return [...oldData];
     });
     setButtonReady(true);
@@ -336,7 +336,7 @@ export default function Dashboard() {
 
   const modifyKey = (value, id) => {
     setData((oldData) => {
-      oldData[id].key = value;
+      oldData.find(data => data.id === id).key = value;
       return [...oldData];
     });
     setButtonReady(true);
@@ -344,7 +344,7 @@ export default function Dashboard() {
 
   const modifyVisibility = (value, id) => {
     setData((oldData) => {
-      oldData[id].type = value;
+      oldData.find(data => data.id === id).type = value;
       return [...oldData];
     });
     setButtonReady(true);

From fa53a9e41de02971b76828a77ae63051f8cbf18b Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Sun, 11 Dec 2022 17:54:19 +0300
Subject: [PATCH 05/12] refactor: remove unused index values

---
 .../components/utilities/secrets/getSecretsForProject.js  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/components/utilities/secrets/getSecretsForProject.js b/frontend/components/utilities/secrets/getSecretsForProject.js
index 8b353af7e5..31a673d89f 100644
--- a/frontend/components/utilities/secrets/getSecretsForProject.js
+++ b/frontend/components/utilities/secrets/getSecretsForProject.js
@@ -68,7 +68,7 @@ const getSecretsForProject = async ({
     setFileState(tempFileState);
 
     setData(
-      tempFileState.map((line, index) => {
+      tempFileState.map((line) => {
         return {
           id: guidGenerator(),
           key: line["key"],
@@ -76,12 +76,8 @@ const getSecretsForProject = async ({
           type: line["type"]
         }
       })
-      // .sort((a, b) =>
-      // 	sortMethod == "alphabetical"
-      // 		? a[2].localeCompare(b[2])
-      // 		: b[2].localeCompare(a[2])
-      // )
     );
+
     return tempFileState.map((line, index) => [
       guidGenerator(),
       index,

From 864757e428545966935822c2e514191a24bbaabf Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Sun, 11 Dec 2022 17:57:40 +0300
Subject: [PATCH 06/12] fix: add new row as map instead of list, bug fix due to
 updates

---
 frontend/pages/dashboard/[id].js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index 6a0822c87a..e6b59bae2c 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -318,7 +318,12 @@ export default function Dashboard() {
 
   const addRow = () => {
     setIsNew(false);
-    setData([...data, [guidGenerator(), data.length, "", "", "shared"]]);
+    setData([...data, {
+      id:guidGenerator(), 
+      key:"", 
+      value:"", 
+      type:"shared"
+    }]);
   };
 
   const deleteRow = (id) => {

From d456dcef280a7657b2a3c12a10ee0c3ac4a659de Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Sun, 11 Dec 2022 22:25:16 +0300
Subject: [PATCH 07/12] refactor(perf):go back to passing index and using it to
 mutate keypair

---
 .../dashboard/DashboardInputField.tsx         | 12 ++---
 .../utilities/secrets/getSecretsForProject.js |  3 +-
 frontend/pages/dashboard/[id].js              | 54 ++++++++++---------
 3 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/frontend/components/dashboard/DashboardInputField.tsx b/frontend/components/dashboard/DashboardInputField.tsx
index cda6b381b7..986ed3fba8 100644
--- a/frontend/components/dashboard/DashboardInputField.tsx
+++ b/frontend/components/dashboard/DashboardInputField.tsx
@@ -7,8 +7,8 @@ import guidGenerator from "../utilities/randomId";
 const REGEX = /([$]{.*?})/g;
 
 interface DashboardInputFieldProps {
-  id: string;
-  onChangeHandler: (value: string, id: string) => void;
+  position: number;
+  onChangeHandler: (value: string, position: number) => void;
   value: string;
   type: "varName" | "value";
   blurred: boolean;
@@ -18,7 +18,7 @@ interface DashboardInputFieldProps {
 /**
  * This component renders the input fields on the dashboard
  * @param {object} obj - the order number of a keyPair
- * @param {string} obj.id - the order number of a keyPair
+ * @param {number} obj.pos - the order number of a keyPair
  * @param {function} obj.onChangeHandler - what happens when the input is modified
  * @param {string} obj.type - whether the input field is for a Key Name or for a Key Value
  * @param {string} obj.value - value of the InputField
@@ -28,7 +28,7 @@ interface DashboardInputFieldProps {
  */
 
 const DashboardInputField = ({
-  id,
+  position,
   onChangeHandler,
   type,
   value,
@@ -57,7 +57,7 @@ const DashboardInputField = ({
         >
           <input
             onChange={(e) =>
-              onChangeHandler(e.target.value.toUpperCase(), id)
+              onChangeHandler(e.target.value.toUpperCase(), position)
             }
             type={type}
             value={value}
@@ -87,7 +87,7 @@ const DashboardInputField = ({
         >
           <input
             value={value}
-            onChange={(e) => onChangeHandler(e.target.value, id)}
+            onChange={(e) => onChangeHandler(e.target.value, position)}
             onScroll={syncScroll}
             className={`${
               blurred
diff --git a/frontend/components/utilities/secrets/getSecretsForProject.js b/frontend/components/utilities/secrets/getSecretsForProject.js
index 31a673d89f..a4cce35e0b 100644
--- a/frontend/components/utilities/secrets/getSecretsForProject.js
+++ b/frontend/components/utilities/secrets/getSecretsForProject.js
@@ -68,9 +68,10 @@ const getSecretsForProject = async ({
     setFileState(tempFileState);
 
     setData(
-      tempFileState.map((line) => {
+      tempFileState.map((line, index) => {
         return {
           id: guidGenerator(),
+          pos: index,
           key: line["key"],
           value: line["value"],
           type: line["type"]
diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index e6b59bae2c..1182dd56be 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -73,7 +73,7 @@ const KeyPair = ({
             <DashboardInputField
               onChangeHandler={modifyKey}
               type="varName"
-              id={keyPair.id}
+              position={keyPair.pos}
               value={keyPair.key}
               duplicates={duplicates}
             />
@@ -84,7 +84,7 @@ const KeyPair = ({
             <DashboardInputField
               onChangeHandler={modifyValue}
               type="value"
-              id={keyPair.id}
+              position={keyPair.pos}
               value={keyPair.value}
               blurred={isBlurred}
             />
@@ -115,7 +115,7 @@ const KeyPair = ({
                 onClick={() =>
                   modifyVisibility(
                     keyPair.type == "personal" ? "shared" : "personal",
-                    keyPair.id
+                    keyPair.pos
                   )
                 }
                 className="relative flex justify-start items-center cursor-pointer select-none py-2 px-2 rounded-md text-gray-400 hover:bg-white/10 duration-200 hover:text-gray-200 w-full"
@@ -139,7 +139,7 @@ const KeyPair = ({
                       [...Array(randomStringLength)]
                         .map(() => Math.floor(Math.random() * 16).toString(16))
                         .join(""),
-                      keyPair.id
+                      keyPair.pos
                     );
                   }
                 }}
@@ -319,9 +319,10 @@ export default function Dashboard() {
   const addRow = () => {
     setIsNew(false);
     setData([...data, {
-      id:guidGenerator(), 
-      key:"", 
-      value:"", 
+      id:guidGenerator(),
+      pos:data.length,
+      key:"",
+      value:"",
       type:"shared"
     }]);
   };
@@ -331,41 +332,41 @@ export default function Dashboard() {
     setData(data.filter((row) => row.id !== id));
   };
 
-  const modifyValue = (value, id) => {
+  const modifyValue = (value, pos) => {
     setData((oldData) => {
-      oldData.find(data => data.id === id).value = value;
+      oldData[pos].value = value;
       return [...oldData];
     });
     setButtonReady(true);
   };
 
-  const modifyKey = (value, id) => {
+  const modifyKey = (value, pos) => {
     setData((oldData) => {
-      oldData.find(data => data.id === id).key = value;
+      oldData[pos].key = value;
       return [...oldData];
     });
     setButtonReady(true);
   };
 
-  const modifyVisibility = (value, id) => {
+  const modifyVisibility = (value, pos) => {
     setData((oldData) => {
-      oldData.find(data => data.id === id).type = value;
+      oldData[pos].type = value;
       return [...oldData];
     });
     setButtonReady(true);
   };
 
   // For speed purposes and better perforamance, we are using useCallback
-  const listenChangeValue = useCallback((value, id) => {
-    modifyValue(value, id);
+  const listenChangeValue = useCallback((value, pos) => {
+    modifyValue(value, pos);
   }, []);
 
-  const listenChangeKey = useCallback((value, id) => {
-    modifyKey(value, id);
+  const listenChangeKey = useCallback((value, pos) => {
+    modifyKey(value, pos);
   }, []);
 
-  const listenChangeVisibility = useCallback((value, id) => {
-    modifyVisibility(value, id);
+  const listenChangeVisibility = useCallback((value, pos) => {
+    modifyVisibility(value, pos);
   }, []);
 
   /**
@@ -448,17 +449,18 @@ export default function Dashboard() {
   };
 
   const sortValuesHandler = () => {
-    /**
-     * Since react's SetStateActionHandler optimises renders when values don't change 
-     * we have to map and return a new sorted list to force a render.
-     * @returns {sorted list}
-    */
+    console.log(sortMethod)
 
-    let sortedData = data.sort((a, b) =>
+    const sortedData = data.sort((a, b) =>
       sortMethod == "alphabetical"
         ? a.key.localeCompare(b.key)
         : b.key.localeCompare(a.key)
-    ).map((item) => item)
+    ).map((item, index) => {
+      return {
+        ...item, pos:index
+      }
+    })
+
     setData(sortedData)
   }
 

From f94bf1f2065aaf9908c6bc7c990269f694ef8016 Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Sun, 11 Dec 2022 23:31:31 +0300
Subject: [PATCH 08/12] feat:only sort on reorder and cleanup changes

---
 frontend/pages/dashboard/[id].js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index 1182dd56be..187f0c3409 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -266,9 +266,12 @@ export default function Dashboard() {
    * Reorder rows alphabetically or in the opprosite order
    */
   const reorderRows = () => {
-    setSortMethod(
-      sortMethod == "alphabetical" ? "-alphabetical" : "alphabetical"
+    setSortMethod(prevSort =>
+      prevSort == "alphabetical"
+        ? "-alphabetical"
+        : "alphabetical"
     );
+
     sortValuesHandler()
   };
 
@@ -404,9 +407,8 @@ export default function Dashboard() {
       });
     }
 
-    // Once "Save changed is clicked", disable that button and sort values
+    // Once "Save changed is clicked", disable that button
     setButtonReady(false);
-    sortValuesHandler()
     pushKeys({ obj, workspaceId: router.query.id, env });
 
     /**
@@ -449,8 +451,6 @@ export default function Dashboard() {
   };
 
   const sortValuesHandler = () => {
-    console.log(sortMethod)
-
     const sortedData = data.sort((a, b) =>
       sortMethod == "alphabetical"
         ? a.key.localeCompare(b.key)
@@ -600,7 +600,7 @@ export default function Dashboard() {
                     </div>
                     <div className="ml-2 min-w-max flex flex-row items-start justify-start">
                       <Button
-                        onButtonPressed={reorderRows}
+                        onButtonPressed={() => reorderRows()}
                         color="mineshaft"
                         size="icon-md"
                         icon={

From 01982b585f531f84a4d91fc3b9edb4025a3e06f4 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Sun, 11 Dec 2022 17:02:06 -0500
Subject: [PATCH 09/12] Add empty Vercel docs for integration reference

---
 docs/integrations/cloud/vercel.mdx | 5 +++++
 docs/integrations/overview.mdx     | 6 +++---
 docs/mint.json                     | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 docs/integrations/cloud/vercel.mdx

diff --git a/docs/integrations/cloud/vercel.mdx b/docs/integrations/cloud/vercel.mdx
new file mode 100644
index 0000000000..eb09203b57
--- /dev/null
+++ b/docs/integrations/cloud/vercel.mdx
@@ -0,0 +1,5 @@
+---
+title: "Vercel"
+---
+
+Coming soon.
diff --git a/docs/integrations/overview.mdx b/docs/integrations/overview.mdx
index 17c7a7f726..9323f8917e 100644
--- a/docs/integrations/overview.mdx
+++ b/docs/integrations/overview.mdx
@@ -12,7 +12,7 @@ Missing an integration? Throw in a [request](https://github.com/Infisical/infisi
 | [Docker-Compose](/integrations/platforms/docker-compose) | Platform  | Available   |
 | Kubernetes                                               | Platform  | Coming soon |
 | [Heroku](/integrations/cloud/heroku)                     | Cloud     | Available   |
-| Vercel                                                   | Cloud     | Coming soon |
+| [Vercel](/integrations/cloud/vercel)                     | Cloud     | Coming soon |
 | AWS                                                      | Cloud     | Coming soon |
 | GCP                                                      | Cloud     | Coming soon |
 | Azure                                                    | Cloud     | Coming soon |
@@ -31,8 +31,8 @@ Missing an integration? Throw in a [request](https://github.com/Infisical/infisi
 | [Gatsby](/integrations/frameworks/gatsby)                | Framework | Available   |
 | [Remix](/integrations/frameworks/remix)                  | Framework | Available   |
 | [Vite](/integrations/frameworks/vite)                    | Framework | Available   |
-| [Fiber](/integrations/frameworks/fiber)                  | Framework | Coming soon |
+| [Fiber](/integrations/frameworks/fiber)                  | Framework | Available   |
 | [Django](/integrations/frameworks/django)                | Framework | Available   |
 | [Flask](/integrations/frameworks/flask)                  | Framework | Available   |
-| [Laravel](/integrations/frameworks/laravel)              | Framework | Coming soon |
+| [Laravel](/integrations/frameworks/laravel)              | Framework | Available   |
 | [Ruby on Rails](/integrations/frameworks/rails)          | Framework | Available   |
diff --git a/docs/mint.json b/docs/mint.json
index 4fa0436d8b..547291fa5e 100644
--- a/docs/mint.json
+++ b/docs/mint.json
@@ -130,7 +130,8 @@
     {
       "group": "Cloud",
       "pages": [
-        "integrations/cloud/heroku"
+        "integrations/cloud/heroku",
+        "integrations/cloud/vercel"
       ]
     },
     {

From 099ddd6805b1f8c54fcb8c8277b6266f4ba48f49 Mon Sep 17 00:00:00 2001
From: lemmy mwaura <lemminton@gmail.com>
Date: Mon, 12 Dec 2022 01:07:29 +0300
Subject: [PATCH 10/12] fix:quotes - prettier

---
 frontend/pages/dashboard/[id].js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index 4c40258c01..3d3a46c3de 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -45,7 +45,7 @@ import getWorkspaces from '../api/workspace/getWorkspaces';
 /**
  * This component represent a single row for an environemnt variable on the dashboard
  * @param {object} obj
- * @param {String[]} obj.keyPair - data related to the environment variable (id, key, value, public/private)
+ * @param {String[]} obj.keyPair - data related to the environment variable (id, pos, key, value, public/private)
  * @param {function} obj.deleteRow - a function to delete a certain keyPair
  * @param {function} obj.modifyKey - modify the key of a certain environment variable
  * @param {function} obj.modifyValue - modify the value of a certain environment variable
@@ -114,7 +114,7 @@ const KeyPair = ({
               <div
                 onClick={() =>
                   modifyVisibility(
-                    keyPair.type == "personal" ? "shared" : "personal",
+                    keyPair.type == 'personal' ? 'shared' : 'personal',
                     keyPair.pos
                   )
                 }
@@ -122,10 +122,10 @@ const KeyPair = ({
               >
                 <FontAwesomeIcon
                   className="text-lg pl-1.5 pr-3"
-                  icon={keyPair.type == "personal" ? faPeopleGroup : faPerson}
+                  icon={keyPair.type == 'personal' ? faPeopleGroup : faPerson}
                 />
                 <div className="text-sm">
-                  {keyPair.type == "personal" ? "Make Shared" : "Make Personal"}
+                  {keyPair.type == 'personal' ? 'Make Shared' : 'Make Personal'}
                 </div>
               </div>
               <div
@@ -138,7 +138,7 @@ const KeyPair = ({
                     modifyValue(
                       [...Array(randomStringLength)]
                         .map(() => Math.floor(Math.random() * 16).toString(16))
-                        .join(""),
+                        .join(''),
                       keyPair.pos
                     );
                   }
@@ -147,7 +147,7 @@ const KeyPair = ({
               >
                 <FontAwesomeIcon
                   className="text-lg pl-1.5 pr-3"
-                  icon={keyPair.value == "" ? faPlus : faShuffle}
+                  icon={keyPair.value == '' ? faPlus : faShuffle}
                 />
                 <div className="text-sm justify-between flex flex-row w-full">
                   <p>Generate Random Hex</p>
@@ -267,9 +267,9 @@ export default function Dashboard() {
    */
   const reorderRows = () => {
     setSortMethod(prevSort =>
-      prevSort == "alphabetical"
-        ? "-alphabetical"
-        : "alphabetical"
+      prevSort == 'alphabetical'
+        ? '-alphabetical'
+        : 'alphabetical'
     );
 
     sortValuesHandler()
@@ -324,9 +324,9 @@ export default function Dashboard() {
     setData([...data, {
       id:guidGenerator(),
       pos:data.length,
-      key:"",
-      value:"",
-      type:"shared"
+      key:'',
+      value:'',
+      type:'shared'
     }]);
   };
 

From 95a1e9560e89abe65bb9498e5f8fed4af64ca8dc Mon Sep 17 00:00:00 2001
From: Vladyslav Matsiiako <matsiiako@gmail.com>
Date: Sun, 11 Dec 2022 21:28:59 -0500
Subject: [PATCH 11/12] Added automatic secret sorting on the first pull

---
 README.md                                     |  9 ++-
 .../utilities/secrets/getSecretsForProject.ts | 18 ++---
 frontend/pages/dashboard/[id].js              | 69 +++++++++++--------
 frontend/pages/integrations/[id].js           |  2 +-
 4 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index bd0442c938..ba76997f1f 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ To quickly get started, visit our [get started guide](https://infisical.com/docs
 
 ## 🔥 What's cool about this?
 
-Infisical makes secret management simple and end-to-end encrypted by default. We're on a mission to make it more accessible to all developers, <i>not just security teams</i>. 
+Infisical makes secret management simple and end-to-end encrypted by default. We're on a mission to make it more accessible to all developers, <i>not just security teams</i>.
 
 According to a [report](https://www.ekransystem.com/en/blog/secrets-management) in 2019, only 10% of organizations use secret management solutions despite all using digital secrets to some extent.
 
@@ -73,6 +73,7 @@ We are currently working hard to make Infisical more extensive. Need any integra
 Whether it's big or small, we love contributions ❤️ Check out our guide to see how to [get started](https://infisical.com/docs/contributing/overview).
 
 Not sure where to get started? You can:
+
 - [Book a free, non-pressure pairing sessions with one of our teammates](mailto:tony@infisical.com?subject=Pairing%20session&body=I'd%20like%20to%20do%20a%20pairing%20session!)!
 - Join our <a href="https://join.slack.com/t/infisical-users/shared_invite/zt-1kdbk07ro-RtoyEt_9E~fyzGo_xQYP6g">Slack</a>, and ask us any questions there.
 
@@ -81,7 +82,7 @@ Not sure where to get started? You can:
 - [Slack](https://join.slack.com/t/infisical-users/shared_invite/zt-1kdbk07ro-RtoyEt_9E~fyzGo_xQYP6g) (For live discussion with the community and the Infisical team)
 - [GitHub Discussions](https://github.com/Infisical/infisical/discussions) (For help with building and deeper conversations about features)
 - [GitHub Issues](https://github.com/Infisical/infisical-cli/issues) (For any bugs and errors you encounter using Infisical)
-- [Twitter](https://twitter.com/infisical) (Get news fast) 
+- [Twitter](https://twitter.com/infisical) (Get news fast)
 
 ## 🐥 Status
 
@@ -200,7 +201,6 @@ We're currently setting the foundation and building [integrations](https://infis
   </td>
 <td>
 
-
 <table>
   <tbody>
     <tr>
@@ -294,7 +294,6 @@ We're currently setting the foundation and building [integrations](https://infis
 </tr> 
 </table>
 
-
 ## 🏘 Open-source vs. paid
 
 This repo is entirely MIT licensed, with the exception of the `ee` directory which will contain premium enterprise features requiring a Infisical license in the future. We're currently focused on developing non-enterprise offerings first that should suit most use-cases.
@@ -311,4 +310,4 @@ Looking to report a security vulnerability? Please don't post about it in GitHub
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 
-<a href="https://github.com/dangtony98"><img src="https://avatars.githubusercontent.com/u/25857006?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/mv-turtle"><img src="https://avatars.githubusercontent.com/u/78047717?s=96&v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/maidul98"><img src="https://avatars.githubusercontent.com/u/9300960?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/gangjun06"><img src="https://avatars.githubusercontent.com/u/50910815?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/reginaldbondoc"><img src="https://avatars.githubusercontent.com/u/7693108?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/SH5H"><img src="https://avatars.githubusercontent.com/u/25437192?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/asharonbaltazar"><img src="https://avatars.githubusercontent.com/u/58940073?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/edgarrmondragon"><img src="https://avatars.githubusercontent.com/u/16805946?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/arjunyel"><img src="https://avatars.githubusercontent.com/u/11153289?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/adrianmarinwork"><img src="https://avatars.githubusercontent.com/u/118568289?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/hanywang2"><img src="https://avatars.githubusercontent.com/u/44352119?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/tobias-mintlify"><img src="https://avatars.githubusercontent.com/u/110702161?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/0xflotus"><img src="https://avatars.githubusercontent.com/u/26602940?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/wanjohiryan"><img src="https://avatars.githubusercontent.com/u/71614375?v=4" width="50" height="50" alt=""/></a> 
+<a href="https://github.com/dangtony98"><img src="https://avatars.githubusercontent.com/u/25857006?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/mv-turtle"><img src="https://avatars.githubusercontent.com/u/78047717?s=96&v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/maidul98"><img src="https://avatars.githubusercontent.com/u/9300960?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/gangjun06"><img src="https://avatars.githubusercontent.com/u/50910815?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/reginaldbondoc"><img src="https://avatars.githubusercontent.com/u/7693108?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/SH5H"><img src="https://avatars.githubusercontent.com/u/25437192?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/asharonbaltazar"><img src="https://avatars.githubusercontent.com/u/58940073?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/edgarrmondragon"><img src="https://avatars.githubusercontent.com/u/16805946?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/arjunyel"><img src="https://avatars.githubusercontent.com/u/11153289?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/LemmyMwaura"><img src="https://avatars.githubusercontent.com/u/20738858?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/adrianmarinwork"><img src="https://avatars.githubusercontent.com/u/118568289?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/hanywang2"><img src="https://avatars.githubusercontent.com/u/44352119?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/tobias-mintlify"><img src="https://avatars.githubusercontent.com/u/110702161?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/0xflotus"><img src="https://avatars.githubusercontent.com/u/26602940?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/wanjohiryan"><img src="https://avatars.githubusercontent.com/u/71614375?v=4" width="50" height="50" alt=""/></a>
diff --git a/frontend/components/utilities/secrets/getSecretsForProject.ts b/frontend/components/utilities/secrets/getSecretsForProject.ts
index 0bbcdd0d25..3b63f9177a 100644
--- a/frontend/components/utilities/secrets/getSecretsForProject.ts
+++ b/frontend/components/utilities/secrets/getSecretsForProject.ts
@@ -81,17 +81,19 @@ const getSecretsForProject = async ({
           key: line['key'],
           value: line['value'],
           type: line['type']
-        }
+        };
       })
     );
 
-    return tempFileState.map((line, index) => [
-      guidGenerator(),
-      index,
-      line['key'],
-      line['value'],
-      line['type']
-    ]);
+    return tempFileState.map((line, index) => {
+      return {
+        id: guidGenerator(),
+        pos: index,
+        key: line['key'],
+        value: line['value'],
+        type: line['type']
+      };
+    });
   } catch (error) {
     console.log('Something went wrong during accessing or decripting secrets.');
   }
diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index 3d3a46c3de..4bb09c80f4 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -265,14 +265,12 @@ export default function Dashboard() {
   /**
    * Reorder rows alphabetically or in the opprosite order
    */
-  const reorderRows = () => {
-    setSortMethod(prevSort =>
-      prevSort == 'alphabetical'
-        ? '-alphabetical'
-        : 'alphabetical'
+  const reorderRows = (dataToReorder) => {
+    setSortMethod((prevSort) =>
+      prevSort == 'alphabetical' ? '-alphabetical' : 'alphabetical'
     );
 
-    sortValuesHandler()
+    sortValuesHandler(dataToReorder);
   };
 
   useEffect(() => {
@@ -292,13 +290,14 @@ export default function Dashboard() {
         setBlurred(true);
         setWorkspaceId(router.query.id);
 
-        await getSecretsForProject({
+        const dataToSort = await getSecretsForProject({
           env,
           setFileState,
           setIsKeyAvailable,
           setData,
           workspaceId: router.query.id
         });
+        reorderRows(dataToSort);
 
         const user = await getUser();
         setIsNew(
@@ -321,13 +320,16 @@ export default function Dashboard() {
 
   const addRow = () => {
     setIsNew(false);
-    setData([...data, {
-      id:guidGenerator(),
-      pos:data.length,
-      key:'',
-      value:'',
-      type:'shared'
-    }]);
+    setData([
+      ...data,
+      {
+        id: guidGenerator(),
+        pos: data.length,
+        key: '',
+        value: '',
+        type: 'shared'
+      }
+    ]);
   };
 
   const deleteRow = (id) => {
@@ -450,23 +452,28 @@ export default function Dashboard() {
     setBlurred(!blurred);
   };
 
-  const sortValuesHandler = () => {
-    const sortedData = data.sort((a, b) =>
-      sortMethod == 'alphabetical'
-        ? a.key.localeCompare(b.key)
-        : b.key.localeCompare(a.key)
-    ).map((item, index) => {
-      return {
-        ...item, pos:index
-      }
-    })
+  const sortValuesHandler = (dataToSort) => {
+    const sortedData = (dataToSort != 1 ? dataToSort : data)
+      .sort((a, b) =>
+        sortMethod == 'alphabetical'
+          ? a.key.localeCompare(b.key)
+          : b.key.localeCompare(a.key)
+      )
+      .map((item, index) => {
+        return {
+          ...item,
+          pos: index
+        };
+      });
 
-    setData(sortedData)
-  }
+    setData(sortedData);
+  };
 
   // This function downloads the secrets as a .env file
   const download = () => {
-    const file = data.map((item) => [item.key, item.value].join('=')).join('\n');
+    const file = data
+      .map((item) => [item.key, item.value].join('='))
+      .join('\n');
     const blob = new Blob([file]);
     const fileDownloadUrl = URL.createObjectURL(blob);
     let alink = document.createElement('a');
@@ -600,7 +607,7 @@ export default function Dashboard() {
                     </div>
                     <div className="ml-2 min-w-max flex flex-row items-start justify-start">
                       <Button
-                        onButtonPressed={() => reorderRows()}
+                        onButtonPressed={() => reorderRows(1)}
                         color="mineshaft"
                         size="icon-md"
                         icon={
@@ -676,7 +683,8 @@ export default function Dashboard() {
                             .toLowerCase()
                             .includes(searchKeys.toLowerCase()) &&
                           keyPair.type == 'personal'
-                      )?.map((keyPair) => (
+                      )
+                      ?.map((keyPair) => (
                         <KeyPair
                           key={keyPair.id}
                           keyPair={keyPair}
@@ -724,7 +732,8 @@ export default function Dashboard() {
                             .toLowerCase()
                             .includes(searchKeys.toLowerCase()) &&
                           keyPair.type == 'shared'
-                      )?.map((keyPair) => (
+                      )
+                      ?.map((keyPair) => (
                         <KeyPair
                           key={keyPair.id}
                           keyPair={keyPair}
diff --git a/frontend/pages/integrations/[id].js b/frontend/pages/integrations/[id].js
index 0a0a2a9756..dc13d284ce 100644
--- a/frontend/pages/integrations/[id].js
+++ b/frontend/pages/integrations/[id].js
@@ -130,7 +130,7 @@ const Integration = ({ projectIntegration }) => {
                   let obj = Object.assign(
                     {},
                     ...currentSecrets.map((row) => ({
-                      [row[2]]: row[3]
+                      [row.key]: row.value
                     }))
                   );
                   await pushKeysIntegration({

From 6f900644003908ee0e2da204b430839d350e4595 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Mon, 12 Dec 2022 08:31:20 -0500
Subject: [PATCH 12/12] Add required backup key return fields for GET backup
 key

---
 backend/src/controllers/passwordController.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/controllers/passwordController.ts b/backend/src/controllers/passwordController.ts
index 0109dc6a51..b029bc0bee 100644
--- a/backend/src/controllers/passwordController.ts
+++ b/backend/src/controllers/passwordController.ts
@@ -309,7 +309,7 @@ export const getBackupPrivateKey = async (req: Request, res: Response) => {
 	try {
 		backupPrivateKey = await BackupPrivateKey.findOne({
 			user: req.user._id
-		});
+		}).select('+encryptedPrivateKey +iv +tag');
 		
 		if (!backupPrivateKey) throw new Error('Failed to find backup private key');
 	} catch (err) {