Skip to content

Commit 0867cf6

Browse files
authored
fix den-v2 desktop auth handoff parity (anomalyco#976)
* fix(den-v2): add desktop auth handoff endpoints * fix(den-db): restore desktop handoff grant table * chore(den): disable github deploy workflows
1 parent 0586025 commit 0867cf6

7 files changed

Lines changed: 197 additions & 385 deletions

File tree

‎.github/workflows/deploy-den-v2.yml‎

Lines changed: 11 additions & 379 deletions
Large diffs are not rendered by default.

‎.github/workflows/deploy-den.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Deploy Den workflow intentionally disabled.
2+
#
3+
# Render is responsible for building and deploying the legacy Den service,
4+
# so this repository workflow should not trigger any deploy automation.
5+
16
name: Deploy Den (disabled)
27

38
on:
@@ -10,8 +15,4 @@ jobs:
1015
steps:
1116
- name: Disabled
1217
run: |
13-
echo "deploy-den.yml is intentionally disabled"
14-
15-
# Historical workflow intentionally commented out.
16-
# The previous Render deployment automation for the legacy Den service
17-
# should not run anymore.
18+
echo "deploy-den.yml is intentionally disabled; Render handles Den deploys"

‎packages/den-db/src/schema.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,22 @@ export const session = AuthSessionTable
102102
export const account = AuthAccountTable
103103
export const verification = AuthVerificationTable
104104

105+
export const DesktopHandoffGrantTable = mysqlTable(
106+
"desktop_handoff_grant",
107+
{
108+
id: varchar("id", { length: 64 }).notNull().primaryKey(),
109+
user_id: denTypeIdColumn("user", "user_id").notNull(),
110+
session_token: text("session_token").notNull(),
111+
expires_at: timestamp("expires_at", { fsp: 3 }).notNull(),
112+
consumed_at: timestamp("consumed_at", { fsp: 3 }),
113+
created_at: timestamp("created_at", { fsp: 3 }).notNull().defaultNow(),
114+
},
115+
(table) => [
116+
index("desktop_handoff_grant_user_id").on(table.user_id),
117+
index("desktop_handoff_grant_expires_at").on(table.expires_at),
118+
],
119+
)
120+
105121
export const OrgTable = mysqlTable(
106122
"org",
107123
{
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
CREATE TABLE `desktop_handoff_grant` (
2+
`id` varchar(64) NOT NULL,
3+
`user_id` varchar(64) NOT NULL,
4+
`session_token` text NOT NULL,
5+
`expires_at` timestamp(3) NOT NULL,
6+
`consumed_at` timestamp(3),
7+
`created_at` timestamp(3) NOT NULL DEFAULT (now(3)),
8+
CONSTRAINT `desktop_handoff_grant_id` PRIMARY KEY(`id`)
9+
);
10+
--> statement-breakpoint
11+
CREATE INDEX `desktop_handoff_grant_user_id` ON `desktop_handoff_grant` (`user_id`);
12+
--> statement-breakpoint
13+
CREATE INDEX `desktop_handoff_grant_expires_at` ON `desktop_handoff_grant` (`expires_at`);
Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
import { randomBytes } from "node:crypto"
2+
import express from "express"
3+
import { and, eq, gt, isNull } from "../db/drizzle.js"
4+
import { db } from "../db/index.js"
5+
import { AuthSessionTable, AuthUserTable, DesktopHandoffGrantTable } from "../db/schema.js"
6+
import { normalizeDenTypeId } from "../db/typeid.js"
7+
import { asyncRoute } from "./errors.js"
8+
import { getRequestSession } from "./session.js"
9+
import { z } from "zod"
10+
11+
const desktopAuthRouter = express.Router()
12+
13+
const createGrantSchema = z.object({
14+
next: z.string().trim().max(128).optional(),
15+
desktopScheme: z.string().trim().max(32).optional(),
16+
})
17+
18+
const exchangeGrantSchema = z.object({
19+
grant: z.string().trim().min(12).max(128),
20+
})
21+
22+
function buildOpenworkDeepLink(input: {
23+
scheme?: string | null
24+
grant: string
25+
denBaseUrl: string
26+
}) {
27+
const requestedScheme = input.scheme?.trim() || "openwork"
28+
const scheme = /^[a-z][a-z0-9+.-]*$/i.test(requestedScheme)
29+
? requestedScheme
30+
: "openwork"
31+
const url = new URL(`${scheme}://den-auth`)
32+
url.searchParams.set("grant", input.grant)
33+
url.searchParams.set("denBaseUrl", input.denBaseUrl)
34+
return url.toString()
35+
}
36+
37+
desktopAuthRouter.post(
38+
"/desktop-handoff",
39+
asyncRoute(async (req, res) => {
40+
const session = await getRequestSession(req)
41+
if (!session?.user?.id || !session.session?.token) {
42+
res.status(401).json({ error: "unauthorized" })
43+
return
44+
}
45+
46+
const parsed = createGrantSchema.safeParse(req.body ?? {})
47+
if (!parsed.success) {
48+
res.status(400).json({ error: "invalid_request", details: parsed.error.flatten() })
49+
return
50+
}
51+
52+
const grant = randomBytes(24).toString("base64url")
53+
const expiresAt = new Date(Date.now() + 5 * 60 * 1000)
54+
await db.insert(DesktopHandoffGrantTable).values({
55+
id: grant,
56+
user_id: normalizeDenTypeId("user", session.user.id),
57+
session_token: session.session.token,
58+
expires_at: expiresAt,
59+
consumed_at: null,
60+
})
61+
62+
const forwardedProto =
63+
typeof req.headers["x-forwarded-proto"] === "string"
64+
? req.headers["x-forwarded-proto"]
65+
: null
66+
const host = typeof req.headers.host === "string" ? req.headers.host : null
67+
const protocol = forwardedProto ?? req.protocol ?? "https"
68+
const denBaseUrl = host ? `${protocol}://${host}` : "https://app.openworklabs.com"
69+
70+
res.json({
71+
grant,
72+
expiresAt: expiresAt.toISOString(),
73+
openworkUrl: buildOpenworkDeepLink({
74+
scheme: parsed.data.desktopScheme || "openwork",
75+
grant,
76+
denBaseUrl,
77+
}),
78+
})
79+
}),
80+
)
81+
82+
desktopAuthRouter.post(
83+
"/desktop-handoff/exchange",
84+
asyncRoute(async (req, res) => {
85+
const parsed = exchangeGrantSchema.safeParse(req.body ?? {})
86+
if (!parsed.success) {
87+
res.status(400).json({ error: "invalid_request", details: parsed.error.flatten() })
88+
return
89+
}
90+
91+
const now = new Date()
92+
const rows = await db
93+
.select({
94+
grant: DesktopHandoffGrantTable,
95+
session: AuthSessionTable,
96+
user: AuthUserTable,
97+
})
98+
.from(DesktopHandoffGrantTable)
99+
.innerJoin(
100+
AuthSessionTable,
101+
eq(DesktopHandoffGrantTable.session_token, AuthSessionTable.token),
102+
)
103+
.innerJoin(
104+
AuthUserTable,
105+
eq(DesktopHandoffGrantTable.user_id, AuthUserTable.id),
106+
)
107+
.where(
108+
and(
109+
eq(DesktopHandoffGrantTable.id, parsed.data.grant),
110+
isNull(DesktopHandoffGrantTable.consumed_at),
111+
gt(DesktopHandoffGrantTable.expires_at, now),
112+
gt(AuthSessionTable.expiresAt, now),
113+
),
114+
)
115+
.limit(1)
116+
117+
const row = rows[0]
118+
if (!row) {
119+
res.status(404).json({
120+
error: "grant_not_found",
121+
message: "This desktop sign-in link is missing, expired, or already used.",
122+
})
123+
return
124+
}
125+
126+
await db
127+
.update(DesktopHandoffGrantTable)
128+
.set({ consumed_at: now })
129+
.where(
130+
and(
131+
eq(DesktopHandoffGrantTable.id, parsed.data.grant),
132+
isNull(DesktopHandoffGrantTable.consumed_at),
133+
),
134+
)
135+
136+
res.json({
137+
token: row.session.token,
138+
user: {
139+
id: row.user.id,
140+
email: row.user.email,
141+
name: row.user.name,
142+
},
143+
})
144+
}),
145+
)
146+
147+
export { desktopAuthRouter }

‎services/den-v2/src/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { toNodeHandler } from "better-auth/node"
77
import { auth } from "./auth.js"
88
import { env } from "./env.js"
99
import { adminRouter } from "./http/admin.js"
10+
import { desktopAuthRouter } from "./http/desktop-auth.js"
1011
import { asyncRoute, errorMiddleware } from "./http/errors.js"
1112
import { getRequestSession } from "./http/session.js"
1213
import { workersRouter } from "./http/workers.js"
@@ -59,6 +60,7 @@ app.get("/v1/me/orgs", asyncRoute(async (req, res) => {
5960
}))
6061

6162
app.use("/v1/admin", adminRouter)
63+
app.use("/v1/auth", desktopAuthRouter)
6264
app.use("/v1/workers", workersRouter)
6365
app.use(errorMiddleware)
6466

‎services/den/src/http/desktop-auth.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { and, eq, gt, isNull } from "drizzle-orm"
44
import { z } from "zod"
55
import { db } from "../db/index.js"
66
import { AuthSessionTable, DesktopHandoffGrantTable, AuthUserTable } from "../db/schema.js"
7+
import { normalizeDenTypeId } from "../db/typeid.js"
78
import { asyncRoute } from "./errors.js"
89
import { getRequestSession } from "./session.js"
910

@@ -44,7 +45,7 @@ desktopAuthRouter.post("/desktop-handoff", asyncRoute(async (req, res) => {
4445
const expiresAt = new Date(Date.now() + 5 * 60 * 1000)
4546
await db.insert(DesktopHandoffGrantTable).values({
4647
id: grant,
47-
user_id: session.user.id,
48+
user_id: normalizeDenTypeId("user", session.user.id),
4849
session_token: session.session.token,
4950
expires_at: expiresAt,
5051
consumed_at: null,

0 commit comments

Comments
 (0)