From 5db9108ecd0bb62ef0e80ed725b585fa5ab06263 Mon Sep 17 00:00:00 2001
From: Tyler Gillispie <mrteye@gmail.com>
Date: Sun, 23 Aug 2026 21:24:21 -0700
Subject: [PATCH] test(server): clean up valkey stubbing in server/main.test.ts

---
 server/main.test.ts | 101 +++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 63 deletions(-)

diff --git a/server/main.test.ts b/server/main.test.ts
index 89fdc78..ee0c5cc 100644
--- a/server/main.test.ts
+++ b/server/main.test.ts
@@ -76,40 +76,31 @@ Deno.test("Tier 1 & 2: GET /api/forward-auth - Missing session", async () => {
     headers: { "X-Forwarded-Host": "test.app.local" },
   });
 
-  let valkeyStub: any;
-  if ((valkey.get as any).restore) {
-    valkeyStub = valkey.get as any;
-  } else {
-    valkeyStub = stub(valkey, "get", (key: any) => {
-      const k = String(key);
-      if (k.startsWith("auth:app_by_host:")) {
-        return Promise.resolve(
-          JSON.stringify({ id: "app-id-1", name: "test-app" }),
-        );
-      }
-      return Promise.resolve(null);
-    });
-  }
+  const valkeyStub = stub(valkey, "get", (key: any) => {
+    const k = String(key);
+    if (k.startsWith("auth:app_by_host:")) {
+      return Promise.resolve(
+        JSON.stringify({ id: "app-id-1", name: "test-app" }),
+      );
+    }
+    return Promise.resolve(null);
+  });
+
   const res = await app.request(req);
   assertEquals(res.status, 401);
   valkeyStub.restore();
 });
 
 Deno.test("Tier 1 & 2: GET /api/forward-auth - Expired session", async () => {
-  let valkeyStub: any;
-  if ((valkey.get as any).restore) {
-    valkeyStub = valkey.get as any;
-  } else {
-    valkeyStub = stub(valkey, "get", (key: any) => {
-      const k = String(key);
-      if (k.startsWith("auth:app_by_host:")) {
-        return Promise.resolve(
-          JSON.stringify({ id: "app-id-1", name: "test-app" }),
-        );
-      }
-      return Promise.resolve(null);
-    });
-  }
+  const valkeyStub = stub(valkey, "get", (key: any) => {
+    const k = String(key);
+    if (k.startsWith("auth:app_by_host:")) {
+      return Promise.resolve(
+        JSON.stringify({ id: "app-id-1", name: "test-app" }),
+      );
+    }
+    return Promise.resolve(null);
+  });
 
   const req = new Request("http://localhost/api/forward-auth", {
     headers: {
@@ -131,22 +122,17 @@ Deno.test("Tier 1 & 2: GET /api/forward-auth - Suspended account", async () => {
 
   setMockSql(() => Promise.resolve([mockUser]));
 
-  let valkeyStub: any;
-  if ((valkey.get as any).restore) {
-    valkeyStub = valkey.get as any;
-  } else {
-    valkeyStub = stub(valkey, "get", (key: any) => {
-      const k = String(key);
-      if (k.startsWith("auth:app_by_host:")) {
-        return Promise.resolve(
-          JSON.stringify({ id: "app-id-1", name: "test-app" }),
-        );
-      }
+  const valkeyStub = stub(valkey, "get", (key: any) => {
+    const k = String(key);
+    if (k.startsWith("auth:app_by_host:")) {
       return Promise.resolve(
-        JSON.stringify({ uuid: "user-id-1", username: "alice" }),
+        JSON.stringify({ id: "app-id-1", name: "test-app" }),
       );
-    });
-  }
+    }
+    return Promise.resolve(
+      JSON.stringify({ uuid: "user-id-1", username: "alice" }),
+    );
+  });
 
   const req = new Request("http://localhost/api/forward-auth", {
     headers: {
@@ -177,17 +163,11 @@ Deno.test("Tier 3: ValidateSession ConnectRPC - Default-Deny", async () => {
   });
 
   // Re-define valkey stub
-
-  let valkeyStub: any;
-  if ((valkey.get as any).restore) {
-    valkeyStub = valkey.get as any;
-  } else {
-    valkeyStub = stub(valkey, "get", () => {
-      return Promise.resolve(
-        JSON.stringify({ uuid: "user-1", username: "alice" }),
-      );
-    });
-  }
+  const valkeyStub = stub(valkey, "get", () => {
+    return Promise.resolve(
+      JSON.stringify({ uuid: "user-1", username: "alice" }),
+    );
+  });
 
   let auditCalled = false;
   const originalAudit = auditWrapper.auditLog;
@@ -246,16 +226,11 @@ Deno.test("Tier 3: ValidateSession ConnectRPC - Valid RBAC Grant", async () => {
     }
   });
 
-  let valkeyStub: any;
-  if ((valkey.get as any).restore) {
-    valkeyStub = valkey.get as any;
-  } else {
-    valkeyStub = stub(valkey, "get", () => {
-      return Promise.resolve(
-        JSON.stringify({ uuid: "user-1", username: "alice" }),
-      );
-    });
-  }
+  const valkeyStub = stub(valkey, "get", () => {
+    return Promise.resolve(
+      JSON.stringify({ uuid: "user-1", username: "alice" }),
+    );
+  });
 
   const req = new Request(
     "http://localhost/auth.v1.AuthService/ValidateSession",