@atproto/bsky 0.0.11 → 0.0.12

package/tests/admin/get-record.test.ts

@@ -0,0 +1,115 @@
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import AtpAgent from '@atproto/api'
+import { AtUri } from '@atproto/syntax'
+import {
+  ACKNOWLEDGE,
+  TAKEDOWN,
+} from '@atproto/api/src/client/types/com/atproto/admin/defs'
+import {
+  REASONOTHER,
+  REASONSPAM,
+} from '../../src/lexicon/types/com/atproto/moderation/defs'
+import { forSnapshot } from '../_util'
+import basicSeed from '../seeds/basic'
+
+describe('admin get record view', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let sc: SeedClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'views_admin_get_record',
+    })
+    agent = network.pds.getClient()
+    sc = network.getSeedClient()
+    await basicSeed(sc)
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  beforeAll(async () => {
+    const acknowledge = await sc.takeModerationAction({
+      action: ACKNOWLEDGE,
+      subject: {
+        $type: 'com.atproto.repo.strongRef',
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+      },
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.bob,
+      reasonType: REASONSPAM,
+      subject: {
+        $type: 'com.atproto.repo.strongRef',
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+      },
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.carol,
+      reasonType: REASONOTHER,
+      reason: 'defamation',
+      subject: {
+        $type: 'com.atproto.repo.strongRef',
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+      },
+    })
+    await sc.reverseModerationAction({ id: acknowledge.id })
+    await sc.takeModerationAction({
+      action: TAKEDOWN,
+      subject: {
+        $type: 'com.atproto.repo.strongRef',
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+      },
+    })
+  })
+
+  it('gets a record by uri, even when taken down.', async () => {
+    const result = await agent.api.com.atproto.admin.getRecord(
+      { uri: sc.posts[sc.dids.alice][0].ref.uriStr },
+      { headers: network.pds.adminAuthHeaders() },
+    )
+    expect(forSnapshot(result.data)).toMatchSnapshot()
+  })
+
+  it('gets a record by uri and cid.', async () => {
+    const result = await agent.api.com.atproto.admin.getRecord(
+      {
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+      },
+      { headers: network.pds.adminAuthHeaders() },
+    )
+    expect(forSnapshot(result.data)).toMatchSnapshot()
+  })
+
+  it('fails when record does not exist.', async () => {
+    const promise = agent.api.com.atproto.admin.getRecord(
+      {
+        uri: AtUri.make(
+          sc.dids.alice,
+          'app.bsky.feed.post',
+          'badrkey',
+        ).toString(),
+      },
+      { headers: network.pds.adminAuthHeaders() },
+    )
+    await expect(promise).rejects.toThrow('Record not found')
+  })
+
+  it('fails when record cid does not exist.', async () => {
+    const promise = agent.api.com.atproto.admin.getRecord(
+      {
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][1].ref.cidStr, // Mismatching cid
+      },
+      { headers: network.pds.adminAuthHeaders() },
+    )
+    await expect(promise).rejects.toThrow('Record not found')
+  })
+})

package/tests/admin/get-repo.test.ts

@@ -0,0 +1,101 @@
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import AtpAgent from '@atproto/api'
+import {
+  ACKNOWLEDGE,
+  TAKEDOWN,
+} from '@atproto/api/src/client/types/com/atproto/admin/defs'
+import {
+  REASONOTHER,
+  REASONSPAM,
+} from '../../src/lexicon/types/com/atproto/moderation/defs'
+import { forSnapshot } from '../_util'
+import basicSeed from '../seeds/basic'
+
+describe('admin get repo view', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let sc: SeedClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'views_admin_get_repo',
+    })
+    agent = network.pds.getClient()
+    sc = network.getSeedClient()
+    await basicSeed(sc)
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  beforeAll(async () => {
+    const acknowledge = await sc.takeModerationAction({
+      action: ACKNOWLEDGE,
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      },
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.bob,
+      reasonType: REASONSPAM,
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      },
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.carol,
+      reasonType: REASONOTHER,
+      reason: 'defamation',
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      },
+    })
+    await sc.reverseModerationAction({ id: acknowledge.id })
+    await sc.takeModerationAction({
+      action: TAKEDOWN,
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      },
+    })
+  })
+
+  it('gets a repo by did, even when taken down.', async () => {
+    const result = await agent.api.com.atproto.admin.getRepo(
+      { did: sc.dids.alice },
+      { headers: network.pds.adminAuthHeaders() },
+    )
+    expect(forSnapshot(result.data)).toMatchSnapshot()
+  })
+
+  it('does not include account emails for triage mods.', async () => {
+    const { data: admin } = await agent.api.com.atproto.admin.getRepo(
+      { did: sc.dids.bob },
+      { headers: network.pds.adminAuthHeaders() },
+    )
+    const { data: moderator } = await agent.api.com.atproto.admin.getRepo(
+      { did: sc.dids.bob },
+      { headers: network.pds.adminAuthHeaders('moderator') },
+    )
+    const { data: triage } = await agent.api.com.atproto.admin.getRepo(
+      { did: sc.dids.bob },
+      { headers: network.pds.adminAuthHeaders('triage') },
+    )
+    expect(admin.email).toEqual('bob@test.com')
+    expect(moderator.email).toEqual('bob@test.com')
+    expect(triage.email).toBeUndefined()
+    expect(triage).toEqual({ ...admin, email: undefined })
+  })
+
+  it('fails when repo does not exist.', async () => {
+    const promise = agent.api.com.atproto.admin.getRepo(
+      { did: 'did:plc:doesnotexist' },
+      { headers: network.pds.adminAuthHeaders() },
+    )
+    await expect(promise).rejects.toThrow('Repo not found')
+  })
+})

package/tests/{moderation.test.ts → admin/moderation.test.ts}

@@ -1,25 +1,25 @@
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, ImageRef, RecordRef, SeedClient } from '@atproto/dev-env'
 import { TID, cidForCbor } from '@atproto/common'
 import AtpAgent, { ComAtprotoAdminTakeModerationAction } from '@atproto/api'
 import { AtUri } from '@atproto/syntax'
-import { forSnapshot } from './_util'
-import { ImageRef, RecordRef, SeedClient } from './seeds/client'
-import basicSeed from './seeds/basic'
+import { forSnapshot } from '../_util'
+import basicSeed from '../seeds/basic'
 import {
   ACKNOWLEDGE,
   ESCALATE,
   FLAG,
   TAKEDOWN,
-} from '../src/lexicon/types/com/atproto/admin/defs'
+} from '../../src/lexicon/types/com/atproto/admin/defs'
 import {
   REASONOTHER,
   REASONSPAM,
-} from '../src/lexicon/types/com/atproto/moderation/defs'
-import { PeriodicModerationActionReversal } from '../src'
+} from '../../src/lexicon/types/com/atproto/moderation/defs'
+import { PeriodicModerationActionReversal } from '../../src'
 
 describe('moderation', () => {
   let network: TestNetwork
   let agent: AtpAgent
+  let pdsAgent: AtpAgent
   let sc: SeedClient
 
   beforeAll(async () => {
@@ -27,8 +27,8 @@ describe('moderation', () => {
       dbPostgresSchema: 'bsky_moderation',
     })
     agent = network.bsky.getClient()
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    pdsAgent = network.pds.getClient()
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
   })
@@ -962,6 +962,82 @@ describe('moderation', () => {
       )
     })
 
+    it('fans out repo takedowns to pds', async () => {
+      const { data: action } =
+        await agent.api.com.atproto.admin.takeModerationAction(
+          {
+            action: TAKEDOWN,
+            createdBy: 'did:example:moderator',
+            reason: 'Y',
+            subject: {
+              $type: 'com.atproto.admin.defs#repoRef',
+              did: sc.dids.bob,
+            },
+          },
+          {
+            encoding: 'application/json',
+            headers: network.bsky.adminAuthHeaders(),
+          },
+        )
+
+      const res1 = await pdsAgent.api.com.atproto.admin.getSubjectStatus(
+        {
+          did: sc.dids.bob,
+        },
+        { headers: network.pds.adminAuthHeaders() },
+      )
+      expect(res1.data.takedown?.applied).toBe(true)
+
+      // cleanup
+      await reverse(action.id)
+
+      const res2 = await pdsAgent.api.com.atproto.admin.getSubjectStatus(
+        {
+          did: sc.dids.bob,
+        },
+        { headers: network.pds.adminAuthHeaders() },
+      )
+      expect(res2.data.takedown?.applied).toBe(false)
+    })
+
+    it('fans out record takedowns to pds', async () => {
+      const post = sc.posts[sc.dids.bob][0]
+      const uri = post.ref.uriStr
+      const cid = post.ref.cidStr
+      const { data: action } =
+        await agent.api.com.atproto.admin.takeModerationAction(
+          {
+            action: TAKEDOWN,
+            createdBy: 'did:example:moderator',
+            reason: 'Y',
+            subject: {
+              $type: 'com.atproto.repo.strongRef',
+              uri,
+              cid,
+            },
+          },
+          {
+            encoding: 'application/json',
+            headers: network.bsky.adminAuthHeaders(),
+          },
+        )
+
+      const res1 = await pdsAgent.api.com.atproto.admin.getSubjectStatus(
+        { uri },
+        { headers: network.pds.adminAuthHeaders() },
+      )
+      expect(res1.data.takedown?.applied).toBe(true)
+
+      // cleanup
+      await reverse(action.id)
+
+      const res2 = await pdsAgent.api.com.atproto.admin.getSubjectStatus(
+        { uri },
+        { headers: network.pds.adminAuthHeaders() },
+      )
+      expect(res2.data.takedown?.applied).toBe(false)
+    })
+
     it('allows full moderators to takedown.', async () => {
       const { data: action } =
         await agent.api.com.atproto.admin.takeModerationAction(
@@ -1161,6 +1237,17 @@ describe('moderation', () => {
       expect(await fetchImage.json()).toEqual({ message: 'Image not found' })
     })
 
+    it('fans takedown out to pds', async () => {
+      const res = await pdsAgent.api.com.atproto.admin.getSubjectStatus(
+        {
+          did: sc.dids.carol,
+          blob: blob.image.ref.toString(),
+        },
+        { headers: network.pds.adminAuthHeaders() },
+      )
+      expect(res.data.takedown?.applied).toBe(true)
+    })
+
     it('restores blob when action is reversed.', async () => {
       await agent.api.com.atproto.admin.reverseModerationAction(
         {
@@ -1185,5 +1272,16 @@ describe('moderation', () => {
       const size = Number(fetchImage.headers.get('content-length'))
       expect(size).toBeGreaterThan(9000)
     })
+
+    it('fans reversal out to pds', async () => {
+      const res = await pdsAgent.api.com.atproto.admin.getSubjectStatus(
+        {
+          did: sc.dids.carol,
+          blob: blob.image.ref.toString(),
+        },
+        { headers: network.pds.adminAuthHeaders() },
+      )
+      expect(res.data.takedown?.applied).toBe(false)
+    })
   })
 })

package/tests/admin/repo-search.test.ts

@@ -0,0 +1,124 @@
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import AtpAgent from '@atproto/api'
+import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
+import { paginateAll } from '../_util'
+import usersBulkSeed from '../seeds/users-bulk'
+
+describe('admin repo search view', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let sc: SeedClient
+  let headers: { [s: string]: string }
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'views_admin_repo_search',
+    })
+    agent = network.pds.getClient()
+    sc = network.getSeedClient()
+    await usersBulkSeed(sc)
+    headers = network.pds.adminAuthHeaders()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  beforeAll(async () => {
+    await sc.takeModerationAction({
+      action: TAKEDOWN,
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids['cara-wiegand69.test'],
+      },
+    })
+  })
+
+  it('gives relevant results', async () => {
+    const result = await agent.api.com.atproto.admin.searchRepos(
+      { term: 'car' },
+      { headers },
+    )
+
+    const handles = result.data.repos.map((u) => u.handle)
+
+    const shouldContain = [
+      'cara-wiegand69.test', // Present despite repo takedown
+      'carlos6.test',
+      'carolina-mcdermott77.test',
+    ]
+
+    shouldContain.forEach((handle) => expect(handles).toContain(handle))
+
+    const shouldNotContain = [
+      'sven70.test',
+      'hilario84.test',
+      'santa-hermann78.test',
+      'dylan61.test',
+      'preston-harris.test',
+      'loyce95.test',
+      'melyna-zboncak.test',
+    ]
+
+    shouldNotContain.forEach((handle) => expect(handles).not.toContain(handle))
+  })
+
+  it('finds repo by did', async () => {
+    const term = sc.dids['cara-wiegand69.test']
+    const res = await agent.api.com.atproto.admin.searchRepos(
+      { term },
+      { headers },
+    )
+
+    expect(res.data.repos.length).toEqual(1)
+    expect(res.data.repos[0].did).toEqual(term)
+  })
+
+  it('paginates with term', async () => {
+    const results = (results) => results.flatMap((res) => res.users)
+    const paginator = async (cursor?: string) => {
+      const res = await agent.api.com.atproto.admin.searchRepos(
+        { term: 'p', cursor, limit: 3 },
+        { headers },
+      )
+      return res.data
+    }
+
+    const paginatedAll = await paginateAll(paginator)
+    paginatedAll.forEach((res) =>
+      expect(res.repos.length).toBeLessThanOrEqual(3),
+    )
+
+    const full = await agent.api.com.atproto.admin.searchRepos(
+      { term: 'p' },
+      { headers },
+    )
+
+    expect(full.data.repos.length).toBeGreaterThan(3)
+    expect(results(paginatedAll)).toEqual(results([full.data]))
+  })
+
+  it('paginates without term', async () => {
+    const results = (results) => results.flatMap((res) => res.repos)
+    const paginator = async (cursor?: string) => {
+      const res = await agent.api.com.atproto.admin.searchRepos(
+        { cursor, limit: 3 },
+        { headers },
+      )
+      return res.data
+    }
+
+    const paginatedAll = await paginateAll(paginator, 5)
+    paginatedAll.forEach((res) =>
+      expect(res.repos.length).toBeLessThanOrEqual(3),
+    )
+
+    const full = await agent.api.com.atproto.admin.searchRepos(
+      { limit: 15 },
+      { headers },
+    )
+
+    expect(full.data.repos.length).toEqual(15)
+    expect(results(paginatedAll)).toEqual(results([full.data]))
+  })
+})

package/tests/algos/hot-classic.test.ts

@@ -1,8 +1,7 @@
 import AtpAgent, { AtUri } from '@atproto/api'
-import { SeedClient } from '../seeds/client'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import basicSeed from '../seeds/basic'
 import { makeAlgos } from '../../src'
-import { TestNetwork } from '@atproto/dev-env'
 
 describe('algo hot-classic', () => {
   let network: TestNetwork
@@ -26,8 +25,7 @@ describe('algo hot-classic', () => {
       bsky: { algos: makeAlgos(feedPublisherDid) },
     })
     agent = new AtpAgent({ service: network.bsky.url })
-    const pdsAgent = new AtpAgent({ service: network.pds.url })
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
 
     alice = sc.dids.alice
@@ -43,7 +41,7 @@ describe('algo hot-classic', () => {
   it('returns well liked posts', async () => {
     const img = await sc.uploadFile(
       alice,
-      'tests/image/fixtures/key-landscape-small.jpg',
+      'tests/sample-img/key-landscape-small.jpg',
       'image/jpeg',
     )
     const one = await sc.post(alice, 'first post', undefined, [img])

package/tests/algos/whats-hot.test.ts

@@ -1,9 +1,8 @@
 import { HOUR } from '@atproto/common'
 import AtpAgent, { AtUri } from '@atproto/api'
-import { SeedClient } from '../seeds/client'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import basicSeed from '../seeds/basic'
 import { makeAlgos } from '../../src'
-import { TestNetwork } from '@atproto/dev-env'
 
 describe.skip('algo whats-hot', () => {
   let network: TestNetwork
@@ -28,8 +27,7 @@ describe.skip('algo whats-hot', () => {
       bsky: { algos: makeAlgos(feedPublisherDid) },
     })
     agent = new AtpAgent({ service: network.bsky.url })
-    const pdsAgent = new AtpAgent({ service: network.pds.url })
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
 
     alice = sc.dids.alice
@@ -46,7 +44,7 @@ describe.skip('algo whats-hot', () => {
   it('returns well liked posts', async () => {
     const img = await sc.uploadFile(
       alice,
-      'tests/image/fixtures/key-landscape-small.jpg',
+      'tests/sample-img/key-landscape-small.jpg',
       'image/jpeg',
     )
     const one = await sc.post(carol, 'carol is in the chat')

package/tests/algos/with-friends.test.ts

@@ -1,8 +1,7 @@
 import AtpAgent, { AtUri } from '@atproto/api'
-import { RecordRef, SeedClient } from '../seeds/client'
 import userSeed from '../seeds/users'
 import { makeAlgos } from '../../src'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
 
 describe.skip('algo with friends', () => {
   let network: TestNetwork
@@ -28,8 +27,7 @@ describe.skip('algo with friends', () => {
       bsky: { algos: makeAlgos(feedPublisherDid) },
     })
     agent = new AtpAgent({ service: network.bsky.url })
-    const pdsAgent = new AtpAgent({ service: network.pds.url })
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await userSeed(sc)
 
     alice = sc.dids.alice

package/tests/auth.test.ts

@@ -0,0 +1,64 @@
+import AtpAgent from '@atproto/api'
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import usersSeed from './seeds/users'
+import { createServiceJwt } from '@atproto/xrpc-server'
+import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
+
+describe('auth', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let sc: SeedClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'bsky_auth',
+    })
+    agent = network.bsky.getClient()
+    sc = network.getSeedClient()
+    await usersSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('handles signing key change for service auth.', async () => {
+    const issuer = sc.dids.alice
+    const attemptWithKey = async (keypair: Keypair) => {
+      const jwt = await createServiceJwt({
+        iss: issuer,
+        aud: network.bsky.ctx.cfg.serverDid,
+        keypair,
+      })
+      return agent.api.app.bsky.actor.getProfile(
+        { actor: sc.dids.carol },
+        { headers: { authorization: `Bearer ${jwt}` } },
+      )
+    }
+    const origSigningKey = network.pds.ctx.repoSigningKey
+    const newSigningKey = await Secp256k1Keypair.create({ exportable: true })
+    // confirm original signing key works
+    await expect(attemptWithKey(origSigningKey)).resolves.toBeDefined()
+    // confirm next signing key doesn't work yet
+    await expect(attemptWithKey(newSigningKey)).rejects.toThrow(
+      'jwt signature does not match jwt issuer',
+    )
+    // update to new signing key
+    await network.plc
+      .getClient()
+      .updateAtprotoKey(
+        issuer,
+        network.pds.ctx.plcRotationKey,
+        newSigningKey.did(),
+      )
+    // old signing key still works due to did doc cache
+    await expect(attemptWithKey(origSigningKey)).resolves.toBeDefined()
+    // new signing key works
+    await expect(attemptWithKey(newSigningKey)).resolves.toBeDefined()
+    // old signing key no longer works after cache is updated
+    await expect(attemptWithKey(origSigningKey)).rejects.toThrow(
+      'jwt signature does not match jwt issuer',
+    )
+  })
+})

package/tests/auto-moderator/fuzzy-matcher.test.ts

@@ -1,6 +1,5 @@
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { FuzzyMatcher, encode } from '../../src/auto-moderator/fuzzy-matcher'
-import { TestNetwork } from '@atproto/dev-env'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import { AtpAgent } from '@atproto/api'
 import { ImageInvalidator } from '../../src/image/invalidator'
@@ -25,7 +24,7 @@ describe('fuzzy matcher', () => {
     })
     fuzzyMatcher = new FuzzyMatcher(['evil', 'mean', 'bad'], ['baddie'])
     agent = network.pds.getClient()
-    sc = new SeedClient(agent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     alice = sc.dids.alice