Merge branch 'workstream-i'

apps/api-server/src/router.ts

@@ -109,7 +109,13 @@ const verifyRegistration = os.auth.webauthn.verifyRegistration
       context.allowedOrigins,
       context.rpName,
     );
-    await verifyReg(context.db, rpInfo, context.user.id, challengeId, response);
+    return verifyReg(
+      context.db,
+      rpInfo,
+      context.user.id,
+      challengeId,
+      response,
+    );
   });
 
 const createAuthenticationOptions = os.auth.webauthn.createAuthenticationOptions
@@ -162,6 +168,7 @@ const meGet = os.me.get.use(authMiddleware).handler(async ({ context }) => {
       "avatar_url",
       "email_verified_at",
       "is_superuser",
+      "password_hash",
     ])
     .where("id", "=", context.user.id)
     .executeTakeFirstOrThrow();
@@ -176,6 +183,7 @@ const meGet = os.me.get.use(authMiddleware).handler(async ({ context }) => {
     emailVerified: user.email_verified_at !== null,
     needsSetup: user.display_name === null,
     isSuperuser: user.is_superuser,
+    hasPassword: user.password_hash !== null,
   };
 });
 

apps/api-server/src/utils/webauthn.ts

@@ -157,7 +157,7 @@ export const verifyRegistration = async (
   userId: number,
   challengeId: number,
   response: RegistrationResponseJSON,
-): Promise<void> => {
+): Promise<{ passkeyId: number }> => {
   // Fetch the challenge
   const challengeRow = await db
     .selectFrom("webauthn_challenges")
@@ -207,7 +207,7 @@ export const verifyRegistration = async (
     guidName ?? `Key registered at ${formatPasskeyDate(new Date())}`;
 
   // Store the passkey
-  await db
+  const { id: passkeyId } = await db
     .insertInto("passkeys")
     .values({
       user_id: userId,
@@ -222,7 +222,10 @@ export const verifyRegistration = async (
       rpid: rpInfo.rpID,
       name: passKeyName,
     })
-    .execute();
+    .returning("id")
+    .executeTakeFirstOrThrow();
+
+  return { passkeyId: Number(passkeyId) };
 };
 
 /**