@atproto/pds 0.5.5 → 0.5.7

package/src/sequencer/sequencer.ts

@@ -162,9 +162,7 @@ export class Sequencer extends (EventEmitter as new () => SequencerEmitter) {
     await wait(waitTime)
   }
 
-  protected async sequenceEvts(
-    events: readonly RepoSeqInsert[],
-  ): Promise<number[]> {
+  async sequenceEvts(events: readonly RepoSeqInsert[]): Promise<number[]> {
     if (!events.length) return []
     const rows = await this.db.executeWithRetry(
       this.db.db.insertInto('repo_seq').values(events).returning('seq'),

package/tests/_util.ts

@@ -1,6 +1,7 @@
-import { Server } from 'node:http'
+import { RequestListener, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
-import { type Express } from 'express'
+// eslint-disable-next-line import/default
+import httpTerminator from 'http-terminator'
 import { ToolsOzoneModerationDefs, lexToJson } from '@atproto/api'
 import { isCidString } from '@atproto/lex'
 import { isCid, isPlainObject } from '@atproto/lex-data'
@@ -146,19 +147,11 @@ export const paginateAll = async <T extends { cursor?: string }>(
   return results
 }
 
-export async function startServer(app: Express) {
-  return new Promise<{
-    origin: string
-    server: Server
-    stop: () => Promise<void>
-  }>((resolve, reject) => {
+export async function startServer(listener: RequestListener) {
+  return new Promise<AsyncDisposable & { port: number }>((resolve, reject) => {
     const onListen = () => {
       const port = (server.address() as AddressInfo).port
-      resolve({
-        server,
-        origin: `http://localhost:${port}`,
-        stop: () => stopServer(server),
-      })
+      resolve({ port, [Symbol.asyncDispose]: () => terminator.terminate() })
       cleanup()
     }
     const onError = (err: Error) => {
@@ -170,22 +163,12 @@ export async function startServer(app: Express) {
       server.removeListener('error', onError)
     }
 
-    const server = app
+    const server = createServer(listener)
       .listen(0)
       .once('listening', onListen)
       .once('error', onError)
-  })
-}
 
-export async function stopServer(server: Server) {
-  return new Promise<void>((resolve, reject) => {
-    server.close((err) => {
-      if (err) {
-        reject(err)
-      } else {
-        resolve()
-      }
-    })
+    const terminator = httpTerminator.createHttpTerminator({ server })
   })
 }
 

package/tests/account-deactivation.test.ts

@@ -39,7 +39,7 @@ describe('account deactivation', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('deactivates account', async () => {

package/tests/account-deletion.test.ts

@@ -57,7 +57,7 @@ describe('account deletion', () => {
 
   afterAll(async () => {
     mailer.transporter.sendMail = _origSendMail
-    await network.close()
+    await network?.close()
   })
 
   const getMailFrom = async (promise): Promise<Mail.Options> => {

package/tests/account-manager.test.ts

@@ -134,6 +134,7 @@ describe('account manager', () => {
     const [params] = sendResetPasswordMock.mock.lastCall!
     expect(params).toEqual({
       handle: 'bob.test',
+      locale: 'fr',
       token: expect.any(String),
     })
 
@@ -380,4 +381,82 @@ describe('account manager', () => {
     await page.clickOnText('Retour')
     await page.ensureTextVisibility('bob-renamed.test', 'span')
   })
+
+  it('allows deactivating & reactivating the account', async () => {
+    await using page = await PageHelper.from(browser, { languages })
+
+    await page.goto(new URL('/account', network.pds.url))
+
+    await page.assertTitle('Mon compte Atmosphère')
+
+    await page.clickOnText('Compte utilisateur', 'a')
+
+    await page.clickOnText('Désactiver le compte')
+
+    await page.ensureTextVisibility(
+      'limite de temps pour la désactivation du compte',
+    )
+
+    await page.clickOnText('Oui, désactiver')
+
+    await page.waitForNetworkIdle()
+
+    // The row should now offer re-activation
+    await page.ensureTextVisibility('Réactiver le compte', 'span')
+
+    await page.clickOnText('Réactiver le compte')
+
+    // @NOTE The dialog's submit label ("Réactiver") is a substring of the
+    // trigger row ("Réactiver le compte"), which comes first in DOM order, so
+    // we target the dialog's submit button instead of using its text.
+    await page.clickOn('[role="dialog"] button[type="submit"]')
+
+    await page.waitForNetworkIdle()
+
+    await page.ensureTextVisibility('Désactiver le compte', 'span')
+  })
+
+  it('allows deleting the account', async () => {
+    await using page = await PageHelper.from(browser, { languages })
+
+    await page.goto(new URL('/account', network.pds.url))
+
+    await page.assertTitle('Mon compte Atmosphère')
+
+    await page.clickOnText('Compte utilisateur', 'a')
+
+    await page.clickOnText('Supprimer le compte')
+
+    using sendAccountDeleteMock = jest
+      .spyOn(network.pds.ctx.mailer, 'sendAccountDelete')
+      .mockImplementation(async () => {
+        // noop
+      })
+
+    await page.clickOnText("Envoyer l'email")
+
+    await page.waitForNetworkIdle()
+
+    expect(sendAccountDeleteMock).toHaveBeenCalledTimes(1)
+
+    const [params] = sendAccountDeleteMock.mock.lastCall!
+    expect(params).toEqual({
+      locale: 'fr',
+      token: expect.any(String),
+    })
+
+    await page.typeInInput('code', params.token)
+    await page.typeInInput('password', 'bob-new-pass')
+
+    await page.clickOnText('Supprimer mon compte')
+
+    // A final confirmation step is displayed
+    await page.ensureTextVisibility('Êtes-vous vraiment, vraiment sûr ?', 'h2')
+
+    await page.clickOnText('Oui, supprimer mon compte')
+
+    // Once the account is deleted, the session is gone and the user is
+    // brought back to the sign-in page.
+    await page.assertTitle('Se connecter')
+  })
 })

package/tests/account-migration.test.ts

@@ -71,8 +71,8 @@ describe('account migration', () => {
   })
 
   afterAll(async () => {
-    await newPds.close()
-    await network.close()
+    await newPds?.close()
+    await network?.close()
   })
 
   it('migrates an account', async () => {

package/tests/account-status.test.ts

@@ -0,0 +1,206 @@
+import { jest } from '@jest/globals'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
+import { Client } from '@atproto/lex'
+import { com } from '../src/lexicons/index.js'
+
+describe('account-status', () => {
+  let network: TestNetworkNoAppView
+  let client: Client
+
+  beforeAll(async () => {
+    network = await TestNetworkNoAppView.create({
+      dbPostgresSchema: 'account_status',
+    })
+    client = network.pds.getClient()
+  })
+
+  afterEach(async () => {
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network?.close()
+  })
+
+  it('takedown + activation triggers an error', async () => {
+    const { did } = await client.call(com.atproto.server.createAccount, {
+      handle: 'iris.test',
+      email: 'iris@test.com',
+      password: 'password',
+    })
+
+    await expect(
+      client.call(
+        com.atproto.admin.updateSubjectStatus,
+        {
+          subject: com.atproto.admin.defs.repoRef.$build({ did }),
+          takedown: { applied: true },
+          deactivated: { applied: false },
+        },
+        { headers: { authorization: network.pds.adminAuth() } },
+      ),
+    ).rejects.toMatchObject({
+      error: 'InvalidRequest',
+      message: 'Cannot activate and takedown an account at the same time',
+    })
+  })
+
+  it('activating a taken down account causes an error', async () => {
+    const { did } = await client.call(com.atproto.server.createAccount, {
+      handle: 'iris2.test',
+      email: 'iris2@test.com',
+      password: 'password',
+    })
+
+    const mock = jest.spyOn(network.pds.ctx.sequencer, 'sequenceEvts')
+
+    // First deactivate
+    await client.call(
+      com.atproto.admin.updateSubjectStatus,
+      {
+        subject: com.atproto.admin.defs.repoRef.$build({ did }),
+        deactivated: { applied: true },
+      },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    expect(mock).toHaveBeenCalledTimes(1)
+
+    // Then takedown
+    await client.call(
+      com.atproto.admin.updateSubjectStatus,
+      {
+        subject: com.atproto.admin.defs.repoRef.$build({ did }),
+        takedown: { applied: true },
+      },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    expect(mock).toHaveBeenCalledTimes(2)
+
+    // Then remove the takedown
+    await client.call(
+      com.atproto.admin.updateSubjectStatus,
+      {
+        subject: com.atproto.admin.defs.repoRef.$build({ did }),
+        takedown: { applied: false },
+      },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    expect(mock).toHaveBeenCalledTimes(3)
+
+    // Then try to activate again (should work now)
+    await client.call(
+      com.atproto.admin.updateSubjectStatus,
+      {
+        subject: com.atproto.admin.defs.repoRef.$build({ did }),
+        deactivated: { applied: false },
+      },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    expect(mock).toHaveBeenCalledTimes(4)
+
+    // Attempt login to ensure account is active
+    await client.call(com.atproto.server.createSession, {
+      identifier: 'iris2.test',
+      password: 'password',
+    })
+
+    // @TODO use "using" (requires updating jest)
+    mock.mockRestore()
+  })
+
+  it('sequences an account status event when calling updateSubjectStatus without changing the status', async () => {
+    const { did } = await client.call(com.atproto.server.createAccount, {
+      handle: 'iris3.test',
+      email: 'iris3@test.com',
+      password: 'password',
+    })
+
+    const mock = jest.spyOn(network.pds.ctx.sequencer, 'sequenceEvts')
+
+    // Update the account status without changing the status (should still sequence an event)
+    await client.call(
+      com.atproto.admin.updateSubjectStatus,
+      {
+        subject: com.atproto.admin.defs.repoRef.$build({ did }),
+      },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    expect(mock).toHaveBeenCalledTimes(1)
+
+    // @TODO use "using" (requires updating jest)
+    mock.mockRestore()
+  })
+
+  it('allows to takedown, then deactivate, an account', async () => {
+    const { did } = await client.call(com.atproto.server.createAccount, {
+      handle: 'iris4.test',
+      email: 'iris4@test.com',
+      password: 'password',
+    })
+
+    await client.call(
+      com.atproto.admin.updateSubjectStatus,
+      {
+        subject: com.atproto.admin.defs.repoRef.$build({ did }),
+        takedown: { applied: true },
+      },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    await client.call(
+      com.atproto.admin.updateSubjectStatus,
+      {
+        subject: com.atproto.admin.defs.repoRef.$build({ did }),
+        deactivated: { applied: true },
+      },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    const status = await client.call(
+      com.atproto.admin.getSubjectStatus,
+      { did },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    expect(status).toEqual({
+      subject: com.atproto.admin.defs.repoRef.$build({ did }),
+      takedown: { applied: true, ref: expect.any(String) },
+      deactivated: { applied: true },
+    })
+  })
+
+  it('throws when trying to activate a takedown account', async () => {
+    const { did } = await client.call(com.atproto.server.createAccount, {
+      handle: 'iris5.test',
+      email: 'iris5@test.com',
+      password: 'password',
+    })
+
+    await client.call(
+      com.atproto.admin.updateSubjectStatus,
+      {
+        subject: com.atproto.admin.defs.repoRef.$build({ did }),
+        takedown: { applied: true },
+      },
+      { headers: { authorization: network.pds.adminAuth() } },
+    )
+
+    await expect(
+      client.call(
+        com.atproto.admin.updateSubjectStatus,
+        {
+          subject: com.atproto.admin.defs.repoRef.$build({ did }),
+          deactivated: { applied: false },
+        },
+        { headers: { authorization: network.pds.adminAuth() } },
+      ),
+    ).rejects.toMatchObject({
+      error: 'AccountNotFound',
+    })
+  })
+})

package/tests/account.test.ts

@@ -60,7 +60,7 @@ describe('account', () => {
 
   afterAll(async () => {
     mailer.transporter.sendMail = _origSendMail
-    await network.close()
+    await network?.close()
   })
 
   it('serves the accounts system config', async () => {

package/tests/app-passwords.test.ts

@@ -24,7 +24,7 @@ describe('app_passwords', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   let appPass: string

package/tests/auth.test.ts

@@ -16,7 +16,7 @@ describe('auth', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const createAccount = async (info) => {

package/tests/blob-deletes.test.ts

@@ -35,7 +35,7 @@ describe('blob deletes', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getDbBlobsForDid = (did: string) => {

package/tests/create-post.test.ts

@@ -25,7 +25,7 @@ describe('pds posts record creation', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('allows for creating posts with tags', async () => {

package/tests/crud.test.ts

@@ -47,7 +47,7 @@ describe('crud operations', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('registers users', async () => {

package/tests/db.test.ts

@@ -14,15 +14,15 @@ describe('db', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('commits changes', async () => {
     const result = await db.transaction(async (dbTxn) => {
       return await dbTxn.db
         .insertInto('repo_root')
+        // @ts-expect-error invalid date is intentional for testing purposes
         .values({
-          // @ts-expect-error invalid date is intentional for testing purposes
           did: 'x',
           cid: 'x',
           rev: 'x',
@@ -56,8 +56,8 @@ describe('db', () => {
     const promise = db.transaction(async (dbTxn) => {
       await dbTxn.db
         .insertInto('repo_root')
+        // @ts-expect-error invalid date is intentional for testing purposes
         .values({
-          // @ts-expect-error invalid date is intentional for testing purposes
           did: 'y',
           cid: 'y',
           rev: 'y',
@@ -139,8 +139,8 @@ describe('db', () => {
           const name = `user${i}`
           const query = dbTxn.db
             .insertInto('repo_root')
+            // @ts-expect-error invalid date is intentional for testing purposes
             .values({
-              // @ts-expect-error invalid date is intentional for testing purposes
               cid: name,
               did: name,
               rev: name,

package/tests/email-confirmation.test.ts

@@ -42,7 +42,7 @@ describe('email confirmation', () => {
 
   afterAll(async () => {
     mailer.transporter.sendMail = _origSendMail
-    await network.close()
+    await network?.close()
   })
 
   const getMailFrom = async (promise): Promise<SendMailOptions> => {

package/tests/file-uploads.test.ts

@@ -41,8 +41,8 @@ describe('file uploads', () => {
   })
 
   afterAll(async () => {
-    aliceDb.close()
-    await network.close()
+    aliceDb?.close()
+    await network?.close()
   })
 
   let smallBlob: TypedBlobRef

package/tests/get-service-auth.test.ts

@@ -23,7 +23,7 @@ describe('com.atproto.server.getServiceAuth', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('issues a token whose aud matches a bare-DID input', async () => {

package/tests/handles.test.ts

@@ -60,7 +60,7 @@ describe('handles', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   const getHandleFromDb = async (

package/tests/invite-codes.test.ts

@@ -26,7 +26,7 @@ describe('account', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('describes the fact that invites are required', async () => {

package/tests/invites-admin.test.ts

@@ -20,7 +20,7 @@ describe('pds admin invite views', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   let alice: string

package/tests/moderation.test.ts

@@ -47,7 +47,7 @@ describe('moderation', () => {
   })
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('takes down accounts', async () => {

package/tests/moderator-auth.test.ts

@@ -71,7 +71,7 @@ describe('moderator auth', () => {
   }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
-    await network.close()
+    await network?.close()
   })
 
   it('allows service auth requests from the configured appview did', async () => {

package/tests/oauth.test.ts

@@ -160,6 +160,7 @@ describe('oauth', () => {
     const [params] = sendTemplateMock.mock.lastCall!
     expect(params).toEqual({
       handle: 'alice.test',
+      locale: 'fr',
       token: expect.any(String),
     })
 
@@ -240,4 +241,94 @@ describe('oauth', () => {
 
     await page.waitForNetworkIdle()
   })
+
+  it('revokes OAuth sessions on deactivation & requires re-activation on sign-in', async () => {
+    await using page = await PageHelper.from(browser, { languages })
+
+    // Sign into the client (the device session is remembered, so the flow
+    // jumps straight to the consent screen).
+    await page.goto(appUrl)
+
+    await page.assertTitle('OAuth Client Example')
+
+    await page.navigationAction(async () => {
+      const input = await page.typeInInput('identifier', 'alice.test')
+      await input.press('Enter')
+    })
+
+    await page.assertTitle('Autoriser')
+
+    await page.navigationClick('Autoriser')
+
+    await page.assertTitle('OAuth Client Example')
+
+    await page.ensureTextVisibility('Token info', 'h2')
+
+    // While the client page is still open, deactivate the account through
+    // the account manager in another page.
+    {
+      await using accountPage = await PageHelper.from(browser, { languages })
+
+      await accountPage.goto(new URL('/account', network.pds.url))
+
+      await accountPage.assertTitle('Mon compte Atmosphère')
+
+      await accountPage.clickOnText('Compte utilisateur', 'a')
+
+      await accountPage.clickOnText('Désactiver le compte')
+
+      await accountPage.clickOnText('Oui, désactiver')
+
+      await accountPage.waitForNetworkIdle()
+
+      await accountPage.ensureTextVisibility('Réactiver le compte', 'span')
+
+      await network.processAll()
+    }
+
+    // Back in the client: deactivation revoked every OAuth session, so
+    // refreshing the credentials logs the user out.
+    await page.clickOnText('refresh').catch((_err) => {
+      // The OAuth app may have refreshed the session on it's own, causing the
+      // page to reset before the click is processed, which throws an error.
+    })
+
+    await page.waitForNetworkIdle()
+
+    await page.ensureTextVisibility('Login with the Atmosphere', 'h2')
+
+    // Signing back in with the deactivated account asks the user to
+    // re-activate it before the flow can proceed.
+    // @NOTE The PDS is used directly as issuer (rather than resolving the
+    // handle) because handle resolution does not work for deactivated
+    // accounts.
+
+    await page.navigationClick(`Login with ${new URL(network.pds.url).host}`)
+
+    await page.ensureTextVisibility('Se connecter en tant que...')
+
+    await page.clickOnText('alice.test', 'span')
+
+    await page.assertTitle('Heureux de vous revoir!')
+
+    await page.ensureTextVisibility('Vous avez précédemment désactivé')
+
+    await page.clickOnText('Oui, réactiver mon compte')
+
+    // Deactivation also cleared the authorized clients, so consent is
+    // required again.
+    await page.assertTitle('Autoriser')
+
+    await page.navigationClick('Autoriser')
+
+    await page.assertTitle('OAuth Client Example')
+
+    await page.ensureTextVisibility('Token info', 'h2')
+
+    await page.clickOnAriaLabel('User menu')
+
+    await page.clickOnText('Sign out')
+
+    await page.waitForNetworkIdle()
+  })
 })