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

bluesky-social · Feb 3, 2024 · e9783cf · e9783cf
2 parents 1981dc9 + 346d04d
commit e9783cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/pds/src/api/com/atproto/server/updateEmail.ts b/packages/pds/src/api/com/atproto/server/updateEmail.ts
@@ -35,9 +35,8 @@ export default function (server: Server, ctx: AppContext) {
       await ctx.db.transaction(async (dbTxn) => {
         const accntSrvce = ctx.services.account(dbTxn)
 
-        if (token) {
-          await accntSrvce.deleteEmailToken(did, 'update_email')
-        }
+        await accntSrvce.deleteAllEmailTokens(did)
+
         if (user.email !== email) {
           try {
             await accntSrvce.updateEmail(did, email)

diff --git a/packages/pds/src/services/account/index.ts b/packages/pds/src/services/account/index.ts
@@ -549,6 +549,13 @@ export class AccountService {
       .executeTakeFirst()
   }
 
+  async deleteAllEmailTokens(did: string) {
+    await this.db.db
+      .deleteFrom('email_token')
+      .where('did', '=', did)
+      .executeTakeFirst()
+  }
+
   async assertValidToken(
     did: string,
     purpose: EmailTokenPurpose,