Merge branch 'ozone-acls-take2' into pds-proxy-headers

packages/bsky/src/auth-verifier.ts

@@ -211,7 +211,7 @@ export class AuthVerifier {
       }
       const [did, serviceId] = iss.split('#')
       const keyId =
-        serviceId === 'atproto-labeler' ? 'atproto-label' : 'atproto'
+        serviceId === 'atproto_labeler' ? 'atproto_label' : 'atproto'
       let identity: GetIdentityByDidResponse
       try {
         identity = await this.dataplane.getIdentityByDid({ did })

packages/ozone/src/mod-service/views.ts

@@ -25,6 +25,7 @@ import {
 import { REASONOTHER } from '../lexicon/types/com/atproto/moderation/defs'
 import { subjectFromEventRow, subjectFromStatusRow } from './subject'
 import { formatLabel } from './util'
+import { httpLogger as log } from '../logger'
 
 export type AuthHeaders = {
   headers: {
@@ -43,15 +44,20 @@ export class ModerationViews {
     if (dids.length === 0) return new Map()
     const auth = await this.appviewAuth()
     if (!auth) return new Map()
-    const res = await this.appviewAgent.api.com.atproto.admin.getAccountInfos(
-      {
-        dids: dedupeStrs(dids),
-      },
-      auth,
-    )
-    return res.data.infos.reduce((acc, cur) => {
-      return acc.set(cur.did, cur)
-    }, new Map<string, AccountView>())
+    try {
+      const res = await this.appviewAgent.api.com.atproto.admin.getAccountInfos(
+        {
+          dids: dedupeStrs(dids),
+        },
+        auth,
+      )
+      return res.data.infos.reduce((acc, cur) => {
+        return acc.set(cur.did, cur)
+      }, new Map<string, AccountView>())
+    } catch (err) {
+      log.error({ err, dids }, 'failed to resolve account infos from appview')
+      return new Map()
+    }
   }
 
   async repos(dids: string[]): Promise<Map<string, RepoView>> {