Merge branch 'main' of https://github.com/Infisical/infisical into bot

frontend/pages/api/auth/Login1.js

@@ -1,20 +0,0 @@
-/**
- * This is the first step of the login process (pake)
- * @param {*} email
- * @param {*} clientPublicKey
- * @returns
- */
-const login1 = (email, clientPublicKey) => {
-  return fetch("/api/v1/auth/login1", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      email: email,
-      clientPublicKey,
-    }),
-  });
-};
-
-export default login1;

frontend/pages/api/auth/Login1.ts

@@ -0,0 +1,32 @@
+interface Login1 {
+  serverPublicKey: string;
+  salt: string;
+}
+
+/**
+ * This is the first step of the login process (pake)
+ * @param {*} email
+ * @param {*} clientPublicKey
+ * @returns
+ */
+const login1 = async (email: string, clientPublicKey: string) => {
+  const response = await fetch("/api/v1/auth/login1", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      email: email,
+      clientPublicKey,
+    }),
+  });
+  // need precise error handling about the status code
+  if (response?.status === 200) {
+    const data = (await response.json()) as unknown as Login1;
+    return data;
+  }
+
+  throw new Error("Wrong password");
+};
+
+export default login1;

frontend/pages/api/auth/Login2.js

@@ -1,28 +0,0 @@
-/**
- * This is the second step of the login process
- * @param {*} email
- * @param {*} clientPublicKey
- * @returns
- */
-const login2 = (email, clientProof) => {
-  return fetch("/api/v1/auth/login2", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({
-      email: email,
-      clientProof,
-    }),
-    credentials: "include",
-  }).then((res) => {
-    if (res.status == 200) {
-      console.log("User logged in", res);
-      return res;
-    } else {
-      console.log("Failed to log in");
-    }
-  });
-};
-
-export default login2;

frontend/pages/api/auth/Login2.ts

@@ -0,0 +1,36 @@
+interface Login2Response {
+  encryptedPrivateKey: string;
+  iv: string;
+  publicKey: string;
+  tag: string;
+  token: string;
+}
+
+/**
+ * This is the second step of the login process
+ * @param {*} email
+ * @param {*} clientPublicKey
+ * @returns
+ */
+const login2 = async (email: string, clientProof: string) => {
+  const response = await fetch("/api/v1/auth/login2", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({
+      email: email,
+      clientProof,
+    }),
+    credentials: "include",
+  });
+  // need precise error handling about the status code
+  if (response.status == 200) {
+    const data = (await response.json()) as unknown as Login2Response;
+    return data;
+  }
+
+  throw new Error("Password verification failed");
+};
+
+export default login2;

frontend/pages/api/organization/GetOrgUserProjects.js

@@ -6,7 +6,7 @@ import SecurityClient from "~/utilities/SecurityClient";
  * @param {*} res
  * @returns
  */
-const getOrganizationUserProjects = (req, res) => {
+const getOrganizationUserProjects = (req) => {
   return SecurityClient.fetchCall(
     "/api/v1/organization/" + req.orgId + "/my-workspaces",
     {

frontend/pages/api/workspace/getWorkspaces.ts

@@ -1,5 +1,12 @@
 import SecurityClient from "~/utilities/SecurityClient";
 
+interface Workspace {
+  __v: number;
+  _id: string;
+  name: string;
+  organization: string;
+}
+
 /**
  * This route lets us get the workspaces of a certain user
  * @returns
@@ -12,10 +19,11 @@ const getWorkspaces = () => {
     },
   }).then(async (res) => {
     if (res?.status == 200) {
-      return (await res.json()).workspaces;
-    } else {
-      console.log("Failed to get projects");
+      const data = (await res.json()) as unknown as { workspaces: Workspace[] };
+      return data.workspaces;
     }
+
+    throw new Error("Failed to get projects");
   });
 };