@atproto/ozone 0.0.17-next.0 → 0.0.17-next.1

package/src/mod-service/views.ts

@@ -3,6 +3,7 @@ import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import AtpAgent, { AppBskyFeedDefs } from '@atproto/api'
 import { dedupeStrs } from '@atproto/common'
 import { BlobRef } from '@atproto/lexicon'
+import { Keypair } from '@atproto/crypto'
 import { Database } from '../db'
 import {
   ModEventView,
@@ -10,12 +11,11 @@ import {
   RepoViewDetail,
   RecordView,
   RecordViewDetail,
-  ReportViewDetail,
   BlobView,
   SubjectStatusView,
   ModEventViewDetail,
-  AccountView,
-} from '../lexicon/types/com/atproto/admin/defs'
+} from '../lexicon/types/tools/ozone/moderation/defs'
+import { AccountView } from '../lexicon/types/com/atproto/admin/defs'
 import { OutputSchema as ReportOutput } from '../lexicon/types/com/atproto/moderation/createReport'
 import { Label, isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
 import {
@@ -24,8 +24,10 @@ import {
 } from './types'
 import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs'
 import { subjectFromEventRow, subjectFromStatusRow } from './subject'
-import { formatLabel } from './util'
-import { httpLogger as log } from '../logger'
+import { formatLabel, signLabel } from './util'
+import { LabelRow } from '../db/schema/label'
+import { dbLogger } from '../logger'
+import { httpLogger } from '../logger'
 
 export type AuthHeaders = {
   headers: {
@@ -36,6 +38,8 @@ export type AuthHeaders = {
 export class ModerationViews {
   constructor(
     private db: Database,
+    private signingKey: Keypair,
+    private signingKeyId: number,
     private appviewAgent: AtpAgent,
     private appviewAuth: () => Promise<AuthHeaders>,
   ) {}
@@ -55,7 +59,10 @@ export class ModerationViews {
         return acc.set(cur.did, cur)
       }, new Map<string, AccountView>())
     } catch (err) {
-      log.error({ err, dids }, 'failed to resolve account infos from appview')
+      httpLogger.error(
+        { err, dids },
+        'failed to resolve account infos from appview',
+      )
       return new Map()
     }
   }
@@ -101,8 +108,8 @@ export class ModerationViews {
 
     if (
       [
-        'com.atproto.admin.defs#modEventTakedown',
-        'com.atproto.admin.defs#modEventMute',
+        'tools.ozone.moderation.defs#modEventTakedown',
+        'tools.ozone.moderation.defs#modEventMute',
       ].includes(event.action)
     ) {
       eventView.event = {
@@ -111,7 +118,7 @@ export class ModerationViews {
       }
     }
 
-    if (event.action === 'com.atproto.admin.defs#modEventLabel') {
+    if (event.action === 'tools.ozone.moderation.defs#modEventLabel') {
       eventView.event = {
         ...eventView.event,
         createLabelVals: event.createLabelVals?.length
@@ -126,9 +133,9 @@ export class ModerationViews {
     // This is for legacy data only, for new events, these types of events won't have labels attached
     if (
       [
-        'com.atproto.admin.defs#modEventAcknowledge',
-        'com.atproto.admin.defs#modEventTakedown',
-        'com.atproto.admin.defs#modEventEscalate',
+        'tools.ozone.moderation.defs#modEventAcknowledge',
+        'tools.ozone.moderation.defs#modEventTakedown',
+        'tools.ozone.moderation.defs#modEventEscalate',
       ].includes(event.action)
     ) {
       if (event.createLabelVals?.length) {
@@ -146,14 +153,14 @@ export class ModerationViews {
       }
     }
 
-    if (event.action === 'com.atproto.admin.defs#modEventReport') {
+    if (event.action === 'tools.ozone.moderation.defs#modEventReport') {
       eventView.event = {
         ...eventView.event,
         reportType: event.meta?.reportType ?? undefined,
       }
     }
 
-    if (event.action === 'com.atproto.admin.defs#modEventEmail') {
+    if (event.action === 'tools.ozone.moderation.defs#modEventEmail') {
       eventView.event = {
         ...eventView.event,
         subjectLine: event.meta?.subjectLine ?? '',
@@ -162,13 +169,13 @@ export class ModerationViews {
     }
 
     if (
-      event.action === 'com.atproto.admin.defs#modEventComment' &&
+      event.action === 'tools.ozone.moderation.defs#modEventComment' &&
       event.meta?.sticky
     ) {
       eventView.event.sticky = true
     }
 
-    if (event.action === 'com.atproto.admin.defs#modEventTag') {
+    if (event.action === 'tools.ozone.moderation.defs#modEventTag') {
       eventView.event.add = event.addedTags || []
       eventView.event.remove = event.removedTags || []
     }
@@ -408,7 +415,25 @@ export class ModerationViews {
       .if(!includeNeg, (qb) => qb.where('neg', '=', false))
       .selectAll()
       .execute()
-    return res.map((l) => formatLabel(l))
+    return Promise.all(res.map((l) => this.formatLabelAndEnsureSig(l)))
+  }
+
+  async formatLabelAndEnsureSig(row: LabelRow) {
+    const formatted = formatLabel(row)
+    if (!!row.sig && row.signingKeyId === this.signingKeyId) {
+      return formatted
+    }
+    const signed = await signLabel(formatted, this.signingKey)
+    try {
+      await this.db.db
+        .updateTable('label')
+        .set({ sig: Buffer.from(signed.sig), signingKeyId: this.signingKeyId })
+        .where('id', '=', row.id)
+        .execute()
+    } catch (err) {
+      dbLogger.error({ err, label: row }, 'failed to update resigned label')
+    }
+    return signed
   }
 
   async getSubjectStatus(
@@ -500,7 +525,9 @@ export class ModerationViews {
 
 type RecordSubject = { uri: string; cid?: string }
 
-type SubjectView = ModEventViewDetail['subject'] & ReportViewDetail['subject']
+type SubjectView = ModEventViewDetail['subject']
+// @TODO tidy
+// type SubjectView = ModEventViewDetail['subject'] & ReportViewDetail['subject']
 
 type RecordInfo = {
   uri: string

package/src/sequencer/sequencer.ts

@@ -1,24 +1,26 @@
 import EventEmitter from 'events'
 import TypedEmitter from 'typed-emitter'
+import { Selectable } from 'kysely'
+import { PoolClient } from 'pg'
 import { seqLogger as log } from '../logger'
 import Database from '../db'
 import { Labels as LabelsEvt } from '../lexicon/types/com/atproto/label/subscribeLabels'
 import { LabelChannel, Label as LabelTable } from '../db/schema/label'
-import { Selectable } from 'kysely'
-import { formatLabel } from '../mod-service/util'
-import { PoolClient } from 'pg'
+import { ModerationService } from '../mod-service'
 
 export type { Labels as LabelsEvt } from '../lexicon/types/com/atproto/label/subscribeLabels'
 type LabelRow = Selectable<LabelTable>
 
 export class Sequencer extends (EventEmitter as new () => SequencerEmitter) {
+  db: Database
   destroyed = false
   pollPromise: Promise<void> | undefined
   queued = false
   conn: PoolClient | undefined
 
-  constructor(public db: Database, public lastSeen = 0) {
+  constructor(public modSrvc: ModerationService, public lastSeen = 0) {
     super()
+    this.db = modSrvc.db
     // note: this does not err when surpassed, just prints a warning to stderr
     this.setMaxListeners(100)
   }
@@ -89,13 +91,12 @@ export class Sequencer extends (EventEmitter as new () => SequencerEmitter) {
       return []
     }
 
-    const evts: LabelsEvt[] = []
-    for (const row of rows) {
-      evts.push({
-        seq: row.id,
-        labels: [formatLabel(row)],
-      })
-    }
+    const evts: LabelsEvt[] = await Promise.all(
+      rows.map(async (row) => {
+        const formatted = await this.modSrvc.views.formatLabelAndEnsureSig(row)
+        return { seq: row.id, labels: [formatted] }
+      }),
+    )
 
     return evts
   }

package/src/util.ts

@@ -1,6 +1,27 @@
 import { AxiosError } from 'axios'
 import { XRPCError, ResponseType } from '@atproto/xrpc'
 import { RetryOptions, retry } from '@atproto/common'
+import Database from './db'
+
+export const getSigningKeyId = async (
+  db: Database,
+  signingKey: string,
+): Promise<number> => {
+  const selectRes = await db.db
+    .selectFrom('signing_key')
+    .selectAll()
+    .where('key', '=', signingKey)
+    .executeTakeFirst()
+  if (selectRes) {
+    return selectRes.id
+  }
+  const insertRes = await db.db
+    .insertInto('signing_key')
+    .values({ key: signingKey })
+    .returningAll()
+    .executeTakeFirstOrThrow()
+  return insertRes.id
+}
 
 export async function retryHttp<T>(
   fn: () => Promise<T>,

package/tests/__snapshots__/blob-divert.test.ts.snap

@@ -0,0 +1,22 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`blob divert sends blobs to configured divert service and marks divert date 1`] = `
+Object {
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "createdBy": "user(0)",
+  "event": Object {
+    "$type": "tools.ozone.moderation.defs#modEventDivert",
+    "comment": "Diverting for test",
+  },
+  "id": 1,
+  "subject": Object {
+    "$type": "com.atproto.repo.strongRef",
+    "cid": "cids(0)",
+    "uri": "record(0)",
+  },
+  "subjectBlobCids": Array [
+    "cids(1)",
+    "cids(2)",
+  ],
+}
+`;

package/tests/__snapshots__/get-record.test.ts.snap

@@ -11,9 +11,13 @@ Object {
       "cid": "cids(0)",
       "cts": "1970-01-01T00:00:00.000Z",
       "neg": false,
+      "sig": Object {
+        "$bytes": "sig(0)",
+      },
       "src": "user(2)",
       "uri": "record(0)",
       "val": "!unspecced-takedown",
+      "ver": 1,
     },
     Object {
       "cid": "cids(0)",
@@ -31,7 +35,7 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
-      "reviewState": "com.atproto.admin.defs#reviewClosed",
+      "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {
         "$type": "com.atproto.repo.strongRef",
         "cid": "cids(0)",
@@ -108,9 +112,13 @@ Object {
       "cid": "cids(0)",
       "cts": "1970-01-01T00:00:00.000Z",
       "neg": false,
+      "sig": Object {
+        "$bytes": "sig(0)",
+      },
       "src": "user(2)",
       "uri": "record(0)",
       "val": "!unspecced-takedown",
+      "ver": 1,
     },
     Object {
       "cid": "cids(0)",
@@ -128,7 +136,7 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
-      "reviewState": "com.atproto.admin.defs#reviewClosed",
+      "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {
         "$type": "com.atproto.repo.strongRef",
         "cid": "cids(0)",

package/tests/__snapshots__/get-repo.test.ts.snap

@@ -12,9 +12,13 @@ Object {
     Object {
       "cts": "1970-01-01T00:00:00.000Z",
       "neg": false,
+      "sig": Object {
+        "$bytes": "sig(0)",
+      },
       "src": "user(2)",
       "uri": "user(0)",
       "val": "!unspecced-takedown",
+      "ver": 1,
     },
   ],
   "moderation": Object {
@@ -24,7 +28,7 @@ Object {
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedBy": "user(1)",
-      "reviewState": "com.atproto.admin.defs#reviewClosed",
+      "reviewState": "tools.ozone.moderation.defs#reviewClosed",
       "subject": Object {
         "$type": "com.atproto.admin.defs#repoRef",
         "did": "user(0)",

package/tests/__snapshots__/moderation-events.test.ts.snap

@@ -5,7 +5,7 @@ Object {
   "createdAt": "1970-01-01T00:00:00.000Z",
   "createdBy": "user(2)",
   "event": Object {
-    "$type": "com.atproto.admin.defs#modEventReport",
+    "$type": "tools.ozone.moderation.defs#modEventReport",
     "comment": "X",
     "reportType": "com.atproto.moderation.defs#reasonMisleading",
   },
@@ -22,7 +22,7 @@ Object {
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedBy": "user(1)",
-        "reviewState": "com.atproto.admin.defs#reviewEscalated",
+        "reviewState": "tools.ozone.moderation.defs#reviewEscalated",
         "subject": Object {
           "$type": "com.atproto.admin.defs#repoRef",
           "did": "user(0)",
@@ -75,7 +75,7 @@ Array [
     "createdBy": "user(1)",
     "creatorHandle": "alice.test",
     "event": Object {
-      "$type": "com.atproto.admin.defs#modEventReport",
+      "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "X",
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
@@ -91,7 +91,7 @@ Array [
     "createdAt": "1970-01-01T00:00:00.000Z",
     "createdBy": "user(2)",
     "event": Object {
-      "$type": "com.atproto.admin.defs#modEventTag",
+      "$type": "tools.ozone.moderation.defs#modEventTag",
       "add": Array [
         "lang:en",
         "lang:i",
@@ -111,7 +111,7 @@ Array [
     "createdBy": "user(1)",
     "creatorHandle": "alice.test",
     "event": Object {
-      "$type": "com.atproto.admin.defs#modEventReport",
+      "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "X",
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
@@ -133,7 +133,7 @@ Array [
     "createdBy": "user(0)",
     "creatorHandle": "bob.test",
     "event": Object {
-      "$type": "com.atproto.admin.defs#modEventReport",
+      "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "X",
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
@@ -150,7 +150,7 @@ Array [
     "createdAt": "1970-01-01T00:00:00.000Z",
     "createdBy": "user(1)",
     "event": Object {
-      "$type": "com.atproto.admin.defs#modEventTag",
+      "$type": "tools.ozone.moderation.defs#modEventTag",
       "add": Array [
         "lang:und",
       ],
@@ -170,7 +170,7 @@ Array [
     "createdBy": "user(0)",
     "creatorHandle": "bob.test",
     "event": Object {
-      "$type": "com.atproto.admin.defs#modEventReport",
+      "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "X",
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },

package/tests/__snapshots__/moderation-statuses.test.ts.snap

@@ -6,7 +6,7 @@ Array [
     "createdAt": "1970-01-01T00:00:00.000Z",
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
-    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
       "cid": "cids(0)",
@@ -25,7 +25,7 @@ Array [
     "createdAt": "1970-01-01T00:00:00.000Z",
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
-    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",
@@ -48,7 +48,7 @@ Array [
     "createdAt": "1970-01-01T00:00:00.000Z",
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
-    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
       "cid": "cids(0)",
@@ -67,7 +67,7 @@ Array [
     "createdAt": "1970-01-01T00:00:00.000Z",
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
-    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(0)",
@@ -85,7 +85,7 @@ Array [
     "createdAt": "1970-01-01T00:00:00.000Z",
     "id": 3,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
-    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.repo.strongRef",
       "cid": "cids(1)",
@@ -103,7 +103,7 @@ Array [
     "createdAt": "1970-01-01T00:00:00.000Z",
     "id": 1,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
-    "reviewState": "com.atproto.admin.defs#reviewOpen",
+    "reviewState": "tools.ozone.moderation.defs#reviewOpen",
     "subject": Object {
       "$type": "com.atproto.admin.defs#repoRef",
       "did": "user(1)",

package/tests/_util.ts

@@ -16,6 +16,7 @@ export const forSnapshot = (obj: unknown) => {
   const collections = { [kTake]: 'collection' }
   const users = { [kTake]: 'user' }
   const cids = { [kTake]: 'cids' }
+  const sigs = { [kTake]: 'sig' }
   const unknown = { [kTake]: 'unknown' }
   const toWalk = lexToJson(obj as any) // remove any blobrefs/cids
   return mapLeafValues(toWalk, (item) => {
@@ -61,6 +62,10 @@ export const forSnapshot = (obj: unknown) => {
       const [, did, cid] = match
       return str.replace(did, take(users, did)).replace(cid, take(cids, cid))
     }
+    // decent check for 64-byte base64 encoded signatures
+    if (str.length === 86 && !str.includes(' ')) {
+      return take(sigs, str)
+    }
     let isCid: boolean
     try {
       CID.parse(str)

package/tests/blob-divert.test.ts

@@ -0,0 +1,87 @@
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
+import { BlobDiverter } from '../src/daemon'
+import { forSnapshot } from './_util'
+
+describe('blob divert', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_blob_divert_test',
+      ozone: {
+        blobDivertUrl: `https://blob-report.com`,
+        blobDivertAdminPassword: 'test-auth-token',
+      },
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  const mockReportServiceResponse = (result: boolean) => {
+    return jest
+      .spyOn(BlobDiverter.prototype, 'sendImage')
+      .mockImplementation(async () => {
+        return result
+      })
+  }
+
+  const getSubject = () => ({
+    $type: 'com.atproto.repo.strongRef',
+    uri: sc.posts[sc.dids.carol][0].ref.uriStr,
+    cid: sc.posts[sc.dids.carol][0].ref.cidStr,
+  })
+
+  const emitDivertEvent = async () =>
+    modClient.emitEvent(
+      {
+        subject: getSubject(),
+        event: {
+          $type: 'tools.ozone.moderation.defs#modEventDivert',
+          comment: 'Diverting for test',
+        },
+        createdBy: sc.dids.alice,
+        subjectBlobCids: sc.posts[sc.dids.carol][0].images.map((img) =>
+          img.image.ref.toString(),
+        ),
+      },
+      'moderator',
+    )
+
+  it('fails and keeps attempt count when report service fails to accept upload.', async () => {
+    // Simulate failure to fail upload
+    const reportServiceRequest = mockReportServiceResponse(false)
+
+    await expect(emitDivertEvent()).rejects.toThrow()
+
+    expect(reportServiceRequest).toHaveBeenCalled()
+  })
+
+  it('sends blobs to configured divert service and marks divert date', async () => {
+    // Simulate failure to accept upload
+    const reportServiceRequest = mockReportServiceResponse(true)
+
+    const divertEvent = await emitDivertEvent()
+
+    expect(reportServiceRequest).toHaveBeenCalled()
+    expect(forSnapshot(divertEvent)).toMatchSnapshot()
+
+    const { subjectStatuses } = await modClient.queryStatuses({
+      subject: getSubject().uri,
+    })
+
+    expect(subjectStatuses[0].takendown).toBe(true)
+  })
+})

package/tests/communication-templates.test.ts

@@ -27,37 +27,34 @@ describe('communication-templates', () => {
   }
 
   const listTemplates = async () => {
-    const { data } =
-      await agent.api.com.atproto.admin.listCommunicationTemplates(
-        {},
-        {
-          headers: await network.ozone.modHeaders('moderator'),
-        },
-      )
+    const { data } = await agent.api.tools.ozone.communication.listTemplates(
+      {},
+      {
+        headers: await network.ozone.modHeaders('moderator'),
+      },
+    )
     return data.communicationTemplates
   }
 
   describe('create templates', () => {
     it('only allows admins to create new templates', async () => {
-      const moderatorReq =
-        agent.api.com.atproto.admin.createCommunicationTemplate(
-          { ...templateOne, createdBy: sc.dids.bob },
-          {
-            encoding: 'application/json',
-            headers: await network.ozone.modHeaders('moderator'),
-          },
-        )
+      const moderatorReq = agent.api.tools.ozone.communication.createTemplate(
+        { ...templateOne, createdBy: sc.dids.bob },
+        {
+          encoding: 'application/json',
+          headers: await network.ozone.modHeaders('moderator'),
+        },
+      )
       await expect(moderatorReq).rejects.toThrow(
         'Must be an admin to create a communication template',
       )
-      const modReq =
-        await agent.api.com.atproto.admin.createCommunicationTemplate(
-          { ...templateOne, createdBy: sc.dids.bob },
-          {
-            encoding: 'application/json',
-            headers: await network.ozone.modHeaders('admin'),
-          },
-        )
+      const modReq = await agent.api.tools.ozone.communication.createTemplate(
+        { ...templateOne, createdBy: sc.dids.bob },
+        {
+          encoding: 'application/json',
+          headers: await network.ozone.modHeaders('admin'),
+        },
+      )
 
       expect(modReq.data).toMatchObject({
         ...templateOne,
@@ -75,7 +72,7 @@ describe('communication-templates', () => {
         ...templateOne,
         name: 'Test template 2',
       }
-      await agent.api.com.atproto.admin.createCommunicationTemplate(
+      await agent.api.tools.ozone.communication.createTemplate(
         { ...templateTwo, createdBy: sc.dids.bob },
         {
           encoding: 'application/json',
@@ -90,14 +87,13 @@ describe('communication-templates', () => {
   })
   describe('update template', () => {
     it('allows moderators to update a template by id', async () => {
-      const { data } =
-        await agent.api.com.atproto.admin.updateCommunicationTemplate(
-          { id: '1', updatedBy: sc.dids.bob, name: '1 Test template' },
-          {
-            encoding: 'application/json',
-            headers: await network.ozone.modHeaders('admin'),
-          },
-        )
+      const { data } = await agent.api.tools.ozone.communication.updateTemplate(
+        { id: '1', updatedBy: sc.dids.bob, name: '1 Test template' },
+        {
+          encoding: 'application/json',
+          headers: await network.ozone.modHeaders('admin'),
+        },
+      )
 
       expect(data.name).not.toEqual(templateOne.name)
       expect(data.name).toEqual('1 Test template')
@@ -105,7 +101,7 @@ describe('communication-templates', () => {
   })
   describe('delete template', () => {
     it('allows admins to remove a template by id', async () => {
-      const modReq = agent.api.com.atproto.admin.deleteCommunicationTemplate(
+      const modReq = agent.api.tools.ozone.communication.deleteTemplate(
         { id: '1' },
         {
           encoding: 'application/json',
@@ -117,7 +113,7 @@ describe('communication-templates', () => {
         'Must be an admin to delete a communication template',
       )
 
-      await agent.api.com.atproto.admin.deleteCommunicationTemplate(
+      await agent.api.tools.ozone.communication.deleteTemplate(
         { id: '1' },
         {
           encoding: 'application/json',