web-next: migrate passkey feature #141
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| import { | ||
| getRegistrationOptions, | ||
| verifyRegistration, | ||
| } from "@hackerspub/models/passkey"; | ||
| import { passkeyTable } from "@hackerspub/models/schema"; | ||
| import { | ||
| encodeGlobalID, | ||
| resolveCursorConnection, | ||
| type ResolveCursorConnectionArgs, | ||
| } from "@pothos/plugin-relay"; | ||
| import type { RegistrationResponseJSON } from "@simplewebauthn/server"; | ||
| import { and, desc, eq, gt, lt } from "drizzle-orm"; | ||
| import { Account } from "./account.ts"; | ||
| import { builder } from "./builder.ts"; | ||
|
|
||
| export const Passkey = builder.drizzleNode("passkeyTable", { | ||
| name: "Passkey", | ||
| id: { | ||
| column: (passkey) => passkey.id, | ||
| }, | ||
| fields: (t) => ({ | ||
| name: t.exposeString("name"), | ||
| lastUsed: t.expose("lastUsed", { type: "DateTime", nullable: true }), | ||
| created: t.expose("created", { type: "DateTime" }), | ||
| }), | ||
| }); | ||
|
|
||
| const PasskeyRegistrationResult = builder | ||
| .objectRef<{ | ||
| verified: boolean; | ||
| passkey: typeof Passkey.$inferType | null; | ||
| }>("PasskeyRegistrationResult") | ||
| .implement({ | ||
| fields: (t) => ({ | ||
| verified: t.exposeBoolean("verified"), | ||
| passkey: t.field({ | ||
| type: Passkey, | ||
| nullable: true, | ||
| resolve: (parent) => parent.passkey, | ||
| }), | ||
| }), | ||
| }); | ||
|
|
||
| // Add passkeys connection to Account type | ||
| builder.objectField(Account, "passkeys", (t) => | ||
| t.connection({ | ||
| type: Passkey, | ||
| authScopes: (parent) => ({ | ||
| selfAccount: parent.id, | ||
| }), | ||
| async resolve(account, args, ctx) { | ||
| return resolveCursorConnection( | ||
| { | ||
| args, | ||
| toCursor: (passkey) => passkey.created.valueOf().toString(), | ||
| }, | ||
| async ( | ||
| { before, after, limit, inverted }: ResolveCursorConnectionArgs, | ||
| ) => { | ||
| const beforeDate = before ? new Date(Number(before)) : undefined; | ||
| const afterDate = after ? new Date(Number(after)) : undefined; | ||
|
|
||
| return await ctx.db | ||
| .select() | ||
| .from(passkeyTable) | ||
| .where( | ||
| and( | ||
| eq(passkeyTable.accountId, account.id), | ||
| before | ||
| ? inverted | ||
| ? lt(passkeyTable.created, beforeDate!) | ||
| : gt(passkeyTable.created, beforeDate!) | ||
| : undefined, | ||
| after | ||
| ? inverted | ||
| ? gt(passkeyTable.created, afterDate!) | ||
| : lt(passkeyTable.created, afterDate!) | ||
| : undefined, | ||
| ), | ||
| ) | ||
| .orderBy( | ||
| inverted ? passkeyTable.created : desc(passkeyTable.created), | ||
| ).limit(limit); | ||
| }, | ||
| ); | ||
| }, | ||
| })); | ||
|
|
||
| builder.mutationFields((t) => ({ | ||
| getPasskeyRegistrationOptions: t.field({ | ||
| type: "JSON", | ||
| args: { | ||
| accountId: t.arg.globalID({ for: Account, required: true }), | ||
| }, | ||
| async resolve(_, args, ctx) { | ||
| const session = await ctx.session; | ||
| if (session == null) throw new Error("Not authenticated."); | ||
| if (session.accountId !== args.accountId.id) { | ||
| throw new Error("Not authorized."); | ||
| } | ||
| const account = await ctx.db.query.accountTable.findFirst({ | ||
| where: { id: args.accountId.id }, | ||
| with: { passkeys: true }, | ||
| }); | ||
| if (account == null) throw new Error("Account not found."); | ||
| const options = await getRegistrationOptions( | ||
| ctx.kv, | ||
| ctx.fedCtx.canonicalOrigin, | ||
| account, | ||
| ); | ||
| return options; | ||
| }, | ||
| }), | ||
| verifyPasskeyRegistration: t.field({ | ||
| type: PasskeyRegistrationResult, | ||
| args: { | ||
| accountId: t.arg.globalID({ for: Account, required: true }), | ||
| name: t.arg.string({ required: true }), | ||
| registrationResponse: t.arg({ type: "JSON", required: true }), | ||
| }, | ||
| async resolve(_, args, ctx) { | ||
| const session = await ctx.session; | ||
| if (session == null) throw new Error("Not authenticated."); | ||
| if (session.accountId !== args.accountId.id) { | ||
| throw new Error("Not authorized."); | ||
| } | ||
| const account = await ctx.db.query.accountTable.findFirst({ | ||
| where: { id: args.accountId.id }, | ||
| with: { passkeys: true }, | ||
| }); | ||
| if (account == null) throw new Error("Account not found."); | ||
| const result = await verifyRegistration( | ||
| ctx.db, | ||
| ctx.kv, | ||
| ctx.fedCtx.canonicalOrigin, | ||
| account, | ||
| args.name, | ||
| args.registrationResponse as RegistrationResponseJSON, | ||
| ); | ||
|
|
||
|
Comment on lines
+121
to
+140
There was a problem hiding this comment. 🛠️ Refactor suggestion Enforce case-insensitive uniqueness of passkey names (server-side). Currently neither server nor DB prevents duplicate names per account. UX-only checks can be bypassed. Add a DB unique index on Proposed DB change (Drizzle + migration):
import { unique, sql } from "drizzle-orm/pg-core";
// …
unique()
.on(passkeyTable.accountId, sql`LOWER(${passkeyTable.name})`)
.name("passkey_account_id_name_lower_unique"),
CREATE UNIQUE INDEX IF NOT EXISTS passkey_account_id_name_lower_unique
ON passkey(account_id, LOWER(name));Optional pre-check here to fail fast: const exists = await ctx.db.query.passkeyTable.findFirst({
where: and(
eq(passkeyTable.accountId, account.id),
sql`LOWER(${passkeyTable.name}) = LOWER(${args.name})`,
),
});
if (exists) throw new Error("Passkey name already exists.");Would you like a follow-up patch/migration? |
||
| let passkey = null; | ||
| if (result.verified && result.registrationInfo != null) { | ||
| // Fetch the newly created passkey | ||
| passkey = await ctx.db.query.passkeyTable.findFirst({ | ||
| where: { | ||
| id: result.registrationInfo.credential.id, | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| return { | ||
| verified: result.verified, | ||
| passkey: passkey || null, | ||
| }; | ||
| }, | ||
| }), | ||
| revokePasskey: t.field({ | ||
| type: "ID", | ||
| nullable: true, | ||
| args: { | ||
| passkeyId: t.arg.globalID({ for: Passkey, required: true }), | ||
| }, | ||
| async resolve(_, args, ctx) { | ||
| const session = await ctx.session; | ||
| if (session == null) throw new Error("Not authenticated."); | ||
| const passkey = await ctx.db.query.passkeyTable.findFirst({ | ||
| where: { id: args.passkeyId.id }, | ||
| }); | ||
| if (passkey == null) return null; | ||
| if (passkey.accountId !== session.accountId) { | ||
| throw new Error("Not authorized."); | ||
| } | ||
| await ctx.db.delete(passkeyTable).where( | ||
| eq(passkeyTable.id, args.passkeyId.id), | ||
| ); | ||
| return encodeGlobalID(Passkey.name, args.passkeyId.id); | ||
| }, | ||
| }), | ||
| })); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's significant code duplication for authentication, authorization, and account fetching logic across
getPasskeyRegistrationOptions,verifyPasskeyRegistration, andrevokePasskeymutations. This makes the code harder to maintain.To improve this, you could extract the common logic into a helper function. This function would handle session checks and fetch the authorized account, which can then be used by all three mutations. This would centralize the logic, making it easier to update and test.