Merge branch 'multi-pds-auth' into signup-queueing-take2

bluesky-social · Feb 4, 2024 · 3f3df31 · 3f3df31
2 parents e9783cf + 57b1ad5
commit 3f3df31
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts b/packages/pds/src/api/com/atproto/server/requestEmailConfirmation.ts
@@ -20,14 +20,17 @@ export default function (server: Server, ctx: AppContext) {
     auth: ctx.authVerifier.accessCheckTakedown,
     handler: async ({ auth }) => {
       const did = auth.credentials.did
-      const user = await ctx.services.account(ctx.db).getAccount(did)
-      if (!user) {
-        throw new InvalidRequestError('user not found')
-      }
-      const token = await ctx.services
-        .account(ctx.db)
-        .createEmailToken(did, 'confirm_email')
-      await ctx.mailer.sendConfirmEmail({ token }, { to: user.email })
+      const { token, email } = await ctx.db.transaction(async (dbTxn) => {
+        const token = await ctx.services
+          .account(dbTxn)
+          .createEmailToken(did, 'confirm_email')
+        const user = await ctx.services.account(ctx.db).getAccount(did)
+        if (!user) {
+          throw new InvalidRequestError('user not found')
+        }
+        return { token, email: user.email }
+      })
+      await ctx.mailer.sendConfirmEmail({ token }, { to: email })
     },
   })
 }