fixup! Implement last opened functionality

Author: code-asher

src/node/routes/vscode.ts

@@ -34,27 +34,31 @@ export class CodeServerRouteWrapper {
 
     // Ew means the workspace was closed so clear the last folder/workspace.
     const { query } = await settings.read()
-    if (req.query.ew) {
-      delete query.folder
-      delete query.workspace
-    }
+    if (query) {
+      if (req.query.ew) {
+        delete query.folder
+        delete query.workspace
+      }
 
-    // Redirect to the last folder/workspace if nothing else is opened.
-    if (
-      !req.query.folder &&
-      !req.query.workspace &&
-      (query.folder || query.workspace) &&
-      !req.args["ignore-last-opened"] // This flag disables this behavior.
-    ) {
-      return redirect(req, res, "", {
-        folder: query.folder,
-        workspace: query.workspace,
-      })
+      // Redirect to the last folder/workspace if nothing else is opened.
+      if (
+        !req.query.folder &&
+        !req.query.workspace &&
+        (query.folder || query.workspace) &&
+        !req.args["ignore-last-opened"] // This flag disables this behavior.
+      ) {
+        // Redirect to the same page but with the query parameters attached
+        // (preserving the trailing slash if any).
+        return redirect(req, res, req.baseUrl + (req.originalUrl.endsWith("/") ? "/" : ""), {
+          folder: query.folder,
+          workspace: query.workspace,
+        })
+      }
     }
 
     // Store the query parameters so we can use them on the next load.  This
     // also allows users to create functionality around query parameters.
-    settings.write({ query: req.query })
+    await settings.write({ query: req.query })
 
     next()
   }

src/node/settings.ts

@@ -54,11 +54,7 @@ export interface UpdateSettings {
  * Global code-server settings.
  */
 export interface CoderSettings extends UpdateSettings {
-  lastVisited: {
-    url: string
-    workspace: boolean
-  }
-  query: Query
+  query?: Query
 }
 
 /**