refactor auth in bsky

packages/bsky/src/api/app/bsky/actor/getProfile.ts

@@ -16,18 +16,16 @@ import { ModerationService } from '../../../../services/moderation'
 export default function (server: Server, ctx: AppContext) {
   const getProfile = createPipeline(skeleton, hydration, noRules, presentation)
   server.app.bsky.actor.getProfile({
-    auth: ctx.authOptionalAccessOrRoleVerifier,
+    auth: ctx.authVerifier.optionalStandardOrRole,
     handler: async ({ auth, params, res }) => {
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
       const modService = ctx.services.moderation(ctx.db.getPrimary())
-      const viewer = 'did' in auth.credentials ? auth.credentials.did : null
-      const canViewTakendownProfile =
-        auth.credentials.type === 'role' && auth.credentials.triage
+      const { viewer, canViewTakedowns } = ctx.authVerifier.parseCreds(auth)
 
       const [result, repoRev] = await Promise.allSettled([
         getProfile(
-          { ...params, viewer, canViewTakendownProfile },
+          { ...params, viewer, canViewTakedowns },
           { db, actorService, modService },
         ),
         actorService.getRepoRev(viewer),
@@ -53,12 +51,12 @@ const skeleton = async (
   ctx: Context,
 ): Promise<SkeletonState> => {
   const { actorService, modService } = ctx
-  const { canViewTakendownProfile } = params
+  const { canViewTakedowns } = params
   const actor = await actorService.getActor(params.actor, true)
   if (!actor) {
     throw new InvalidRequestError('Profile not found')
   }
-  if (!canViewTakendownProfile && softDeleted(actor)) {
+  if (!canViewTakedowns && softDeleted(actor)) {
     const isSuspended = await modService.isSubjectSuspended(actor.did)
     if (isSuspended) {
       throw new InvalidRequestError(
@@ -78,10 +76,10 @@ const skeleton = async (
 const hydration = async (state: SkeletonState, ctx: Context) => {
   const { actorService } = ctx
   const { params, actor } = state
-  const { viewer, canViewTakendownProfile } = params
+  const { viewer, canViewTakedowns } = params
   const hydration = await actorService.views.profileDetailHydration(
     [actor.did],
-    { viewer, includeSoftDeleted: canViewTakendownProfile },
+    { viewer, includeSoftDeleted: canViewTakedowns },
   )
   return { ...state, ...hydration }
 }
@@ -110,7 +108,7 @@ type Context = {
 
 type Params = QueryParams & {
   viewer: string | null
-  canViewTakendownProfile: boolean
+  canViewTakedowns: boolean
 }
 
 type SkeletonState = { params: Params; actor: Actor }

packages/bsky/src/api/app/bsky/actor/getProfiles.ts

@@ -13,11 +13,11 @@ import { createPipeline, noRules } from '../../../../pipeline'
 export default function (server: Server, ctx: AppContext) {
   const getProfile = createPipeline(skeleton, hydration, noRules, presentation)
   server.app.bsky.actor.getProfiles({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ auth, params, res }) => {
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const [result, repoRev] = await Promise.all([
         getProfile({ ...params, viewer }, { db, actorService }),

packages/bsky/src/api/app/bsky/actor/getSuggestions.ts

@@ -17,12 +17,12 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.actor.getSuggestions({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth }) => {
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
       const graphService = ctx.services.graph(db)
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const result = await getSuggestions(
         { ...params, viewer },

packages/bsky/src/api/app/bsky/actor/searchActors.ts

@@ -9,10 +9,10 @@ import {
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.actor.searchActors({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ auth, params }) => {
       const { cursor, limit } = params
-      const requester = auth.credentials.did
+      const requester = auth.credentials.iss
       const rawQuery = params.q ?? params.term
       const query = cleanQuery(rawQuery || '')
       const db = ctx.db.getReplica('search')

packages/bsky/src/api/app/bsky/actor/searchActorsTypeahead.ts

@@ -7,10 +7,10 @@ import {
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.actor.searchActorsTypeahead({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth }) => {
       const { limit } = params
-      const requester = auth.credentials.did
+      const requester = auth.credentials.iss
       const rawQuery = params.q ?? params.term
       const query = cleanQuery(rawQuery || '')
       const db = ctx.db.getReplica('search')

packages/bsky/src/api/app/bsky/feed/getActorFeeds.ts

@@ -6,10 +6,10 @@ import { TimeCidKeyset, paginate } from '../../../../db/pagination'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.feed.getActorFeeds({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ auth, params }) => {
       const { actor, limit, cursor } = params
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)

packages/bsky/src/api/app/bsky/feed/getActorLikes.ts

@@ -23,9 +23,9 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getActorLikes({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth, res }) => {
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
       const feedService = ctx.services.feed(db)

packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts

@@ -23,14 +23,13 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getAuthorFeed({
-    auth: ctx.authOptionalAccessOrRoleVerifier,
+    auth: ctx.authVerifier.optionalStandardOrRole,
     handler: async ({ params, auth, res }) => {
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
       const feedService = ctx.services.feed(db)
       const graphService = ctx.services.graph(db)
-      const viewer =
-        auth.credentials.type === 'access' ? auth.credentials.did : null
+      const { viewer } = ctx.authVerifier.parseCreds(auth)
 
       const [result, repoRev] = await Promise.all([
         getAuthorFeed(

packages/bsky/src/api/app/bsky/feed/getFeed.ts

@@ -33,11 +33,11 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getFeed({
-    auth: ctx.authOptionalVerifierAnyAudience,
+    auth: ctx.authVerifier.standardOptionalAnyAud,
     handler: async ({ params, auth, req }) => {
       const db = ctx.db.getReplica()
       const feedService = ctx.services.feed(db)
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const { timerSkele, timerHydr, ...result } = await getFeed(
         { ...params, viewer },

packages/bsky/src/api/app/bsky/feed/getFeedGenerator.ts

@@ -9,10 +9,10 @@ import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.feed.getFeedGenerator({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth }) => {
       const { feed } = params
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const db = ctx.db.getReplica()
       const feedService = ctx.services.feed(db)

packages/bsky/src/api/app/bsky/feed/getFeedGenerators.ts

@@ -14,10 +14,10 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getFeedGenerators({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth }) => {
       const { feeds } = params
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
       const db = ctx.db.getReplica()
       const feedService = ctx.services.feed(db)
       const actorService = ctx.services.actor(db)

packages/bsky/src/api/app/bsky/feed/getFeedSkeleton.ts

@@ -5,10 +5,10 @@ import { toSkeletonItem } from '../../../../feed-gen/types'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.feed.getFeedSkeleton({
-    auth: ctx.authVerifierAnyAudience,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth }) => {
       const { feed } = params
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
       const localAlgo = ctx.algos[feed]
 
       if (!localAlgo) {

packages/bsky/src/api/app/bsky/feed/getLikes.ts

@@ -13,12 +13,12 @@ import { createPipeline } from '../../../../pipeline'
 export default function (server: Server, ctx: AppContext) {
   const getLikes = createPipeline(skeleton, hydration, noBlocks, presentation)
   server.app.bsky.feed.getLikes({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth }) => {
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
       const graphService = ctx.services.graph(db)
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const result = await getLikes(
         { ...params, viewer },

packages/bsky/src/api/app/bsky/feed/getListFeed.ts

@@ -22,9 +22,9 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getListFeed({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth, res }) => {
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
       const feedService = ctx.services.feed(db)

packages/bsky/src/api/app/bsky/feed/getPostThread.ts

@@ -31,9 +31,9 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getPostThread({
-    auth: ctx.authOptionalAccessOrRoleVerifier,
+    auth: ctx.authVerifier.optionalStandardOrRole,
     handler: async ({ params, auth, res }) => {
-      const viewer = 'did' in auth.credentials ? auth.credentials.did : null
+      const { viewer } = ctx.authVerifier.parseCreds(auth)
       const db = ctx.db.getReplica('thread')
       const feedService = ctx.services.feed(db)
       const actorService = ctx.services.actor(db)

packages/bsky/src/api/app/bsky/feed/getPosts.ts

@@ -14,12 +14,12 @@ import { ActorService } from '../../../../services/actor'
 export default function (server: Server, ctx: AppContext) {
   const getPosts = createPipeline(skeleton, hydration, noBlocks, presentation)
   server.app.bsky.feed.getPosts({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth }) => {
       const db = ctx.db.getReplica()
       const feedService = ctx.services.feed(db)
       const actorService = ctx.services.actor(db)
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const results = await getPosts(
         { ...params, viewer },

packages/bsky/src/api/app/bsky/feed/getRepostedBy.ts

@@ -18,12 +18,12 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getRepostedBy({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ params, auth }) => {
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
       const graphService = ctx.services.graph(db)
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const result = await getRepostedBy(
         { ...params, viewer },

packages/bsky/src/api/app/bsky/feed/getSuggestedFeeds.ts

@@ -4,9 +4,9 @@ import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.feed.getSuggestedFeeds({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ auth }) => {
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
 
       const db = ctx.db.getReplica()
       const feedService = ctx.services.feed(db)

packages/bsky/src/api/app/bsky/feed/getTimeline.ts

@@ -21,9 +21,9 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.getTimeline({
-    auth: ctx.authVerifier,
+    auth: ctx.authVerifier.standard,
     handler: async ({ params, auth, res }) => {
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
       const db = ctx.db.getReplica('timeline')
       const feedService = ctx.services.feed(db)
       const actorService = ctx.services.actor(db)

packages/bsky/src/api/app/bsky/feed/searchPosts.ts

@@ -21,9 +21,9 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.feed.searchPosts({
-    auth: ctx.authOptionalVerifier,
+    auth: ctx.authVerifier.standardOptional,
     handler: async ({ auth, params }) => {
-      const viewer = auth.credentials.did
+      const viewer = auth.credentials.iss
       const db = ctx.db.getReplica('search')
       const feedService = ctx.services.feed(db)
       const actorService = ctx.services.actor(db)

packages/bsky/src/api/app/bsky/graph/getBlocks.ts

@@ -5,10 +5,10 @@ import { notSoftDeletedClause } from '../../../../db/util'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.getBlocks({
-    auth: ctx.authVerifier,
+    auth: ctx.authVerifier.standard,
     handler: async ({ params, auth }) => {
       const { limit, cursor } = params
-      const requester = auth.credentials.did
+      const requester = auth.credentials.iss
       const db = ctx.db.getReplica()
       const { ref } = db.db.dynamic
 

packages/bsky/src/api/app/bsky/graph/getFollowers.ts

@@ -19,17 +19,15 @@ export default function (server: Server, ctx: AppContext) {
     presentation,
   )
   server.app.bsky.graph.getFollowers({
-    auth: ctx.authOptionalAccessOrRoleVerifier,
+    auth: ctx.authVerifier.optionalStandardOrRole,
     handler: async ({ params, auth }) => {
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
       const graphService = ctx.services.graph(db)
-      const viewer = 'did' in auth.credentials ? auth.credentials.did : null
-      const canViewTakendownProfile =
-        auth.credentials.type === 'role' && auth.credentials.triage
+      const { viewer, canViewTakedowns } = ctx.authVerifier.parseCreds(auth)
 
       const result = await getFollowers(
-        { ...params, viewer, canViewTakendownProfile },
+        { ...params, viewer, canViewTakedowns },
         { db, actorService, graphService },
       )
 
@@ -46,10 +44,10 @@ const skeleton = async (
   ctx: Context,
 ): Promise<SkeletonState> => {
   const { db, actorService } = ctx
-  const { limit, cursor, actor, canViewTakendownProfile } = params
+  const { limit, cursor, actor, canViewTakedowns } = params
   const { ref } = db.db.dynamic
 
-  const subject = await actorService.getActor(actor, canViewTakendownProfile)
+  const subject = await actorService.getActor(actor, canViewTakedowns)
   if (!subject) {
     throw new InvalidRequestError(`Actor not found: ${actor}`)
   }
@@ -58,7 +56,7 @@ const skeleton = async (
     .selectFrom('follow')
     .where('follow.subjectDid', '=', subject.did)
     .innerJoin('actor as creator', 'creator.did', 'follow.creator')
-    .if(!canViewTakendownProfile, (qb) =>
+    .if(!canViewTakedowns, (qb) =>
       qb.where(notSoftDeletedClause(ref('creator'))),
     )
     .selectAll('creator')
@@ -130,7 +128,7 @@ type Context = {
 
 type Params = QueryParams & {
   viewer: string | null
-  canViewTakendownProfile: boolean
+  canViewTakedowns: boolean
 }
 
 type SkeletonState = {