Handle undefined body

In the latest Express it seems the body is undefined when no data is
passed (instead of being empty).

Author: code-asher

src/node/http.ts

@@ -319,8 +319,8 @@ export const getCookieOptions = (req: express.Request): express.CookieOptions =>
   // URL of that page) and the relative path to the root as given to it by the
   // backend.  Using these two we can determine the true absolute root.
   const url = new URL(
-    req.query.base || req.body.base || "/",
-    req.query.href || req.body.href || "http://" + (req.headers.host || "localhost"),
+    req.query.base || req.body?.base || "/",
+    req.query.href || req.body?.href || "http://" + (req.headers.host || "localhost"),
   )
   return {
     domain: getCookieDomain(url.host, req.args["proxy-domain"]),

src/node/routes/login.ts

@@ -68,8 +68,8 @@ router.get("/", async (req, res) => {
   res.send(await getRoot(req))
 })
 
-router.post<{}, string, { password: string; base?: string }, { to?: string }>("/", async (req, res) => {
-  const password = sanitizeString(req.body.password)
+router.post<{}, string, { password?: string; base?: string } | undefined, { to?: string }>("/", async (req, res) => {
+  const password = sanitizeString(req.body?.password)
   const hashedPasswordFromArgs = req.args["hashed-password"]
 
   try {

src/node/vscodeSocket.ts

@@ -20,11 +20,11 @@ export interface EditorSessionEntry {
 }
 
 interface DeleteSessionRequest {
-  socketPath: string
+  socketPath?: string
 }
 
 interface AddSessionRequest {
-  entry: EditorSessionEntry
+  entry?: EditorSessionEntry
 }
 
 interface GetSessionResponse {
@@ -40,8 +40,8 @@ export async function makeEditorSessionManagerServer(
   // eslint-disable-next-line import/no-named-as-default-member
   router.use(express.json())
 
-  router.get("/session", async (req, res) => {
-    const filePath = req.query.filePath as string
+  router.get<{}, GetSessionResponse | string | unknown, undefined, { filePath?: string }>("/session", async (req, res) => {
+    const filePath = req.query.filePath
     if (!filePath) {
       res.status(HttpCode.BadRequest).send("filePath is required")
       return
@@ -55,22 +55,24 @@ export async function makeEditorSessionManagerServer(
     }
   })
 
-  router.post("/add-session", async (req, res) => {
-    const request = req.body as AddSessionRequest
-    if (!request.entry) {
+  router.post<{}, string, AddSessionRequest | undefined>("/add-session", async (req, res) => {
+    const entry = req.body?.entry
+    if (!entry) {
       res.status(400).send("entry is required")
+      return
     }
-    editorSessionManager.addSession(request.entry)
-    res.status(200).send()
+    editorSessionManager.addSession(entry)
+    res.status(200).send("session added")
   })
 
-  router.post("/delete-session", async (req, res) => {
-    const request = req.body as DeleteSessionRequest
-    if (!request.socketPath) {
+  router.post<{}, string, DeleteSessionRequest | undefined>("/delete-session", async (req, res) => {
+    const socketPath = req.body?.socketPath
+    if (!socketPath) {
       res.status(400).send("socketPath is required")
+      return
     }
-    editorSessionManager.deleteSession(request.socketPath)
-    res.status(200).send()
+    editorSessionManager.deleteSession(socketPath)
+    res.status(200).send("session deleted")
   })
 
   const server = http.createServer(router)

test/unit/node/routes/login.test.ts

@@ -68,13 +68,10 @@ describe("login", () => {
       }
     })
 
-    it("should return HTML with 'Missing password' message", async () => {
+    it("should return 'Missing password' without body", async () => {
       const resp = await codeServer().fetch("/login", { method: "POST" })
-
-      expect(resp.status).toBe(200)
-
       const htmlContent = await resp.text()
-
+      expect(resp.status).toBe(200)
       expect(htmlContent).toContain("Missing password")
     })