Fix more merge conflicts and continue cleaning up integrations frontend

frontend/pages/api/bot/getBot.ts

@@ -1,4 +1,8 @@
-import SecurityClient from "~/utilities/SecurityClient.js";
+import SecurityClient from "~/utilities/SecurityClient";
+
+interface Props {
+  workspaceId: string;
+}
 
 /**
  * This function fetches the bot for a project
@@ -6,7 +10,7 @@ import SecurityClient from "~/utilities/SecurityClient.js";
  * @param {String} obj.workspaceId
  * @returns
  */
-const getBot = async ({ workspaceId }) => {
+const getBot = async ({ workspaceId }: Props) => {
   return SecurityClient.fetchCall(
       "/api/v1/bot/" + workspaceId,
     {
@@ -16,7 +20,7 @@ const getBot = async ({ workspaceId }) => {
         }
     }
   ).then(async (res) => {
-    if (res.status == 200) {
+    if (res && res.status == 200) {
       return await res.json();
     } else {
       console.log("Failed to get bot for project");

frontend/pages/api/bot/setBotActiveStatus.js

@@ -1,31 +0,0 @@
-import SecurityClient from "~/utilities/SecurityClient.js";
-
-/**
- * This function fetches the bot for a project
- * @param {Object} obj
- * @param {String} obj.workspaceId
- * @returns
- */
-const setBotActiveStatus = async ({ botId, isActive, botKey }) => {
-  return SecurityClient.fetchCall(
-      "/api/v1/bot/" + botId + "/active",
-    {
-        method: "PATCH",
-        headers: {
-        "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-            isActive,
-            botKey
-        })
-    }
-  ).then(async (res) => {
-    if (res.status == 200) {
-      return await res.json();
-    } else {
-      console.log("Failed to get bot for project");
-    }
-  });
-};
-
-export default setBotActiveStatus;

frontend/pages/api/bot/setBotActiveStatus.ts

@@ -0,0 +1,46 @@
+import SecurityClient from "~/utilities/SecurityClient";
+
+interface BotKey {
+  encryptedKey: string;
+  nonce: string;
+}
+
+interface Props {
+  botId: string;
+  isActive: Boolean;
+  botKey: BotKey;
+}
+ 
+/**
+ * This function sets the active status of a bot and shares a copy of
+ * the project key (encrypted under the bot's public key) with the 
+ * project's bot
+ * @param {Object} obj
+ * @param {String} obj.botId
+ * @param {String} obj.isActive
+ * @param {Object} obj.botKey
+ * @returns
+ */
+const setBotActiveStatus = async ({ botId, isActive, botKey }: Props) => {
+  return SecurityClient.fetchCall(
+      "/api/v1/bot/" + botId + "/active",
+    {
+        method: "PATCH",
+        headers: {
+        "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+            isActive,
+            botKey
+        })
+    }
+  ).then(async (res) => {
+    if (res && res.status == 200) {
+      return await res.json();
+    } else {
+      console.log("Failed to get bot for project");
+    }
+  });
+};
+
+export default setBotActiveStatus;