Some changes to hopefully help with oauth session

Author: fatfingers23

server/api/auth/atproto.get.ts

@@ -6,6 +6,7 @@ import { useOAuthStorage } from '#server/utils/atproto/storage'
 import { SLINGSHOT_HOST } from '#shared/utils/constants'
 import { useServerSession } from '#server/utils/server-session'
 import type { PublicUserSession } from '#shared/schemas/publicUserSession'
+import { handleResolver } from '#server/utils/atproto/oauth'
 
 interface ProfileRecord {
   avatar?: {
@@ -35,6 +36,7 @@ export default defineEventHandler(async event => {
     sessionStore,
     clientMetadata,
     requestLock: getOAuthLock(),
+    handleResolver,
   })
 
   if (!query.code) {
@@ -98,6 +100,16 @@ export default defineEventHandler(async event => {
         avatar,
       },
     })
+  } else {
+    //If slingshot fails we still want to set some key info we need.
+    const pdsBase = (await authSession.getTokenInfo()).aud
+    await session.update({
+      public: {
+        did: authSession.did,
+        handle: 'Not available',
+        pds: pdsBase,
+      },
+    })
   }
 
   return sendRedirect(event, '/')

server/utils/atproto/oauth-session-store.ts

@@ -17,6 +17,7 @@ export class OAuthSessionStore implements NodeSavedSessionStore {
 
   async set(_key: string, val: NodeSavedSession) {
     // We are ignoring the key since the mapping is already done in the session
+    console.log('oauth session set', val)
     await this.session.update({
       oauthSession: val,
     })

server/utils/atproto/oauth.ts

@@ -1,6 +1,6 @@
 import type { OAuthClientMetadataInput, OAuthSession } from '@atproto/oauth-client-node'
 import type { EventHandlerRequest, H3Event, SessionManager } from 'h3'
-import { NodeOAuthClient } from '@atproto/oauth-client-node'
+import { NodeOAuthClient, AtprotoDohHandleResolver } from '@atproto/oauth-client-node'
 import { parse } from 'valibot'
 import { getOAuthLock } from '#server/utils/atproto/lock'
 import { useOAuthStorage } from '#server/utils/atproto/storage'
@@ -11,6 +11,13 @@ import { clientUri } from '#oauth/config'
 // TODO: If you add writing a new record you will need to add a scope for it
 export const scope = `atproto ${LIKES_SCOPE}`
 
+/**
+ * Resolves a did to a handle via DoH or via the http website calls
+ */
+export const handleResolver = new AtprotoDohHandleResolver({
+  dohEndpoint: 'https://cloudflare-dns.com/dns-query',
+})
+
 export function getOauthClientMetadata() {
   const dev = import.meta.dev
 
@@ -42,24 +49,32 @@ type EventHandlerWithOAuthSession<T extends EventHandlerRequest, D> = (
   serverSession: SessionManager,
 ) => Promise<D>
 
-async function getOAuthSession(event: H3Event): Promise<OAuthSession | undefined> {
+async function getOAuthSession(
+  event: H3Event,
+): Promise<{ oauthSession: OAuthSession | undefined; serverSession: SessionManager }> {
+  const serverSession = await useServerSession(event)
+
   try {
     const clientMetadata = getOauthClientMetadata()
-    const serverSession = await useServerSession(event)
     const { stateStore, sessionStore } = useOAuthStorage(serverSession)
 
     const client = new NodeOAuthClient({
       stateStore,
       sessionStore,
       clientMetadata,
       requestLock: getOAuthLock(),
+      handleResolver,
     })
 
-    const currentSession = await sessionStore.get()
-    if (!currentSession) return undefined
+    const currentSession = serverSession.data
+    if (!currentSession) {
+      console.log('oauth session not found')
+      return { oauthSession: undefined, serverSession }
+    }
 
     // restore using the subject
-    return await client.restore(currentSession.tokenSet.sub)
+    const oauthSession = await client.restore(currentSession.public.did)
+    return { oauthSession, serverSession }
   } catch (error) {
     // Log error safely without using util.inspect on potentially problematic objects
     // The @atproto library creates error objects with getters that crash Node's util.inspect
@@ -68,7 +83,7 @@ async function getOAuthSession(event: H3Event): Promise<OAuthSession | undefined
       '[oauth] Failed to get session:',
       error instanceof Error ? error.message : 'Unknown error',
     )
-    return undefined
+    return { oauthSession: undefined, serverSession }
   }
 }
 
@@ -93,9 +108,7 @@ export function eventHandlerWithOAuthSession<T extends EventHandlerRequest, D>(
   handler: EventHandlerWithOAuthSession<T, D>,
 ) {
   return defineEventHandler(async event => {
-    const serverSession = await useServerSession(event)
-
-    const oAuthSession = await getOAuthSession(event)
-    return await handler(event, oAuthSession, serverSession)
+    const { oauthSession, serverSession } = await getOAuthSession(event)
+    return await handler(event, oauthSession, serverSession)
   })
 }