From eaf18d991576771ccbc3975a6c7a9358b0da8de9 Mon Sep 17 00:00:00 2001
From: Frank <frank@anoma.ly>
Date: Tue, 13 Jan 2026 17:51:20 -0500
Subject: wip: black

---
 .../console/app/src/routes/auth/[...callback].ts   | 41 ++++++++++++++++++++++
 packages/console/app/src/routes/auth/authorize.ts  | 12 +++----
 packages/console/app/src/routes/auth/callback.ts   | 40 ---------------------
 3 files changed, 45 insertions(+), 48 deletions(-)
 create mode 100644 packages/console/app/src/routes/auth/[...callback].ts
 delete mode 100644 packages/console/app/src/routes/auth/callback.ts

(limited to 'packages/console/app/src/routes/auth')

diff --git a/packages/console/app/src/routes/auth/[...callback].ts b/packages/console/app/src/routes/auth/[...callback].ts
new file mode 100644
index 000000000..36a9c5194
--- /dev/null
+++ b/packages/console/app/src/routes/auth/[...callback].ts
@@ -0,0 +1,41 @@
+import { redirect } from "@solidjs/router"
+import type { APIEvent } from "@solidjs/start/server"
+import { AuthClient } from "~/context/auth"
+import { useAuthSession } from "~/context/auth"
+
+export async function GET(input: APIEvent) {
+  const url = new URL(input.request.url)
+
+  try {
+    const code = url.searchParams.get("code")
+    if (!code) throw new Error("No code found")
+    const result = await AuthClient.exchange(code, `${url.origin}${url.pathname}`)
+    if (result.err) throw new Error(result.err.message)
+    const decoded = AuthClient.decode(result.tokens.access, {} as any)
+    if (decoded.err) throw new Error(decoded.err.message)
+    const session = await useAuthSession()
+    const id = decoded.subject.properties.accountID
+    await session.update((value) => {
+      return {
+        ...value,
+        account: {
+          ...value.account,
+          [id]: {
+            id,
+            email: decoded.subject.properties.email,
+          },
+        },
+        current: id,
+      }
+    })
+    return redirect(url.pathname === "/auth/callback" ? "/auth" : url.pathname.replace("/auth/callback", ""))
+  } catch (e: any) {
+    return new Response(
+      JSON.stringify({
+        error: e.message,
+        cause: Object.fromEntries(url.searchParams.entries()),
+      }),
+      { status: 500 },
+    )
+  }
+}
diff --git a/packages/console/app/src/routes/auth/authorize.ts b/packages/console/app/src/routes/auth/authorize.ts
index 6be94b146..0f0651ae3 100644
--- a/packages/console/app/src/routes/auth/authorize.ts
+++ b/packages/console/app/src/routes/auth/authorize.ts
@@ -3,12 +3,8 @@ import { AuthClient } from "~/context/auth"
 
 export async function GET(input: APIEvent) {
   const url = new URL(input.request.url)
-  // TODO
-  // input.request.url http://localhost:3001/auth/authorize?continue=/black/subscribe
-  const result = await AuthClient.authorize(
-    new URL("/callback/subscribe?foo=bar", input.request.url).toString(),
-    "code",
-  )
-  // result.url https://auth.frank.dev.opencode.ai/authorize?client_id=app&redirect_uri=http%3A%2F%2Flocalhost%3A3001%2Fauth%2Fcallback&response_type=code&state=0d3fc834-bcbc-42dc-83ab-c25c2c43c7e3
-  return Response.redirect(result.url + "&continue=" + url.searchParams.get("continue"), 302)
+  const cont = url.searchParams.get("continue") ?? ""
+  const callbackUrl = new URL(`./callback${cont}`, input.request.url)
+  const result = await AuthClient.authorize(callbackUrl.toString(), "code")
+  return Response.redirect(result.url, 302)
 }
diff --git a/packages/console/app/src/routes/auth/callback.ts b/packages/console/app/src/routes/auth/callback.ts
deleted file mode 100644
index 9b7296791..000000000
--- a/packages/console/app/src/routes/auth/callback.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { redirect } from "@solidjs/router"
-import type { APIEvent } from "@solidjs/start/server"
-import { AuthClient } from "~/context/auth"
-import { useAuthSession } from "~/context/auth"
-
-export async function GET(input: APIEvent) {
-  const url = new URL(input.request.url)
-  try {
-    const code = url.searchParams.get("code")
-    if (!code) throw new Error("No code found")
-    const result = await AuthClient.exchange(code, `${url.origin}${url.pathname}`)
-    if (result.err) throw new Error(result.err.message)
-    const decoded = AuthClient.decode(result.tokens.access, {} as any)
-    if (decoded.err) throw new Error(decoded.err.message)
-    const session = await useAuthSession()
-    const id = decoded.subject.properties.accountID
-    await session.update((value) => {
-      return {
-        ...value,
-        account: {
-          ...value.account,
-          [id]: {
-            id,
-            email: decoded.subject.properties.email,
-          },
-        },
-        current: id,
-      }
-    })
-    return redirect("/auth")
-  } catch (e: any) {
-    return new Response(
-      JSON.stringify({
-        error: e.message,
-        cause: Object.fromEntries(url.searchParams.entries()),
-      }),
-      { status: 500 },
-    )
-  }
-}
-- 
cgit v1.2.3