@atproto/oauth-client 0.7.6 → 0.7.7

package/src/oauth-client.ts

@@ -1,541 +0,0 @@
-import { Key, Keyset } from '@atproto/jwk'
-import {
-  OAuthAuthorizationRequestParameters,
-  OAuthClientIdDiscoverable,
-  OAuthClientMetadata,
-  OAuthClientMetadataInput,
-  OAuthResponseMode,
-  oauthClientMetadataSchema,
-} from '@atproto/oauth-types'
-import {
-  AtprotoDid,
-  DidCache,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  type DidResolverCommonOptions,
-  assertAtprotoDid,
-} from '@atproto-labs/did-resolver'
-import { Fetch } from '@atproto-labs/fetch'
-import { HandleCache, HandleResolver } from '@atproto-labs/handle-resolver'
-import { HANDLE_INVALID } from '@atproto-labs/identity-resolver'
-import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory'
-import { FALLBACK_ALG } from './constants.js'
-import { AuthMethodUnsatisfiableError } from './errors/auth-method-unsatisfiable-error.js'
-import { TokenRevokedError } from './errors/token-revoked-error.js'
-import {
-  CreateIdentityResolverOptions,
-  createIdentityResolver,
-} from './identity-resolver.js'
-import {
-  AuthorizationServerMetadataCache,
-  OAuthAuthorizationServerMetadataResolver,
-} from './oauth-authorization-server-metadata-resolver.js'
-import { OAuthCallbackError } from './oauth-callback-error.js'
-import { negotiateClientAuthMethod } from './oauth-client-auth.js'
-import {
-  OAuthProtectedResourceMetadataResolver,
-  ProtectedResourceMetadataCache,
-} from './oauth-protected-resource-metadata-resolver.js'
-import { OAuthResolver } from './oauth-resolver.js'
-import { DpopNonceCache, OAuthServerAgent } from './oauth-server-agent.js'
-import { OAuthServerFactory } from './oauth-server-factory.js'
-import { OAuthSession } from './oauth-session.js'
-import { RuntimeImplementation } from './runtime-implementation.js'
-import { Runtime } from './runtime.js'
-import {
-  SessionGetter,
-  SessionHooks,
-  SessionStore,
-  isExpectedSessionError,
-} from './session-getter.js'
-import { InternalStateData, StateStore } from './state-store.js'
-import { AuthorizeOptions, CallbackOptions, ClientMetadata } from './types.js'
-import { validateClientMetadata } from './validate-client-metadata.js'
-
-// Export all types needed to construct OAuthClientOptions
-export type {
-  AuthorizationServerMetadataCache,
-  CreateIdentityResolverOptions,
-  DidCache,
-  DpopNonceCache,
-  Fetch,
-  HandleCache,
-  HandleResolver,
-  InternalStateData,
-  OAuthClientMetadata,
-  OAuthClientMetadataInput,
-  OAuthResponseMode,
-  ProtectedResourceMetadataCache,
-  RuntimeImplementation,
-  SessionHooks,
-  SessionStore,
-  StateStore,
-}
-
-export { Key, Keyset }
-
-export type OAuthClientOptions = {
-  // Config
-  responseMode: OAuthResponseMode
-  clientMetadata: Readonly<OAuthClientMetadataInput>
-  keyset?: Keyset | Iterable<Key | undefined | null | false>
-  /**
-   * Determines if the client will allow communicating with the OAuth Servers
-   * (Authorization & Resource), or to retrieve "did:web" documents, over
-   * unsafe HTTP connections. It is recommended to set this to `true` only for
-   * development purposes.
-   *
-   * @note This does not affect the identity resolution mechanism, which will
-   * allow HTTP connections to the PLC Directory (if the provided directory url
-   * is "http:" based).
-   * @default false
-   * @see {@link OAuthProtectedResourceMetadataResolver.allowHttpResource}
-   * @see {@link OAuthAuthorizationServerMetadataResolver.allowHttpIssuer}
-   * @see {@link DidResolverCommonOptions.allowHttp}
-   */
-  allowHttp?: boolean
-
-  // Stores
-  stateStore: StateStore
-  sessionStore: SessionStore
-  authorizationServerMetadataCache?: AuthorizationServerMetadataCache
-  protectedResourceMetadataCache?: ProtectedResourceMetadataCache
-  dpopNonceCache?: DpopNonceCache
-
-  // Services
-  runtimeImplementation: RuntimeImplementation
-  fetch?: Fetch
-} & CreateIdentityResolverOptions &
-  SessionHooks
-
-export type OAuthClientFetchMetadataOptions = {
-  clientId: OAuthClientIdDiscoverable
-  fetch?: Fetch
-  signal?: AbortSignal
-}
-
-export class OAuthClient {
-  static async fetchMetadata({
-    clientId,
-    fetch = globalThis.fetch,
-    signal,
-  }: OAuthClientFetchMetadataOptions) {
-    signal?.throwIfAborted()
-
-    const request = new Request(clientId, {
-      redirect: 'error',
-      signal: signal,
-    })
-    const response = await fetch(request)
-
-    if (response.status !== 200) {
-      response.body?.cancel?.()
-      throw new TypeError(`Failed to fetch client metadata: ${response.status}`)
-    }
-
-    // https://www.ietf.org/archive/id/draft-ietf-oauth-client-id-metadata-document-00.html#section-4.1
-    const mime = response.headers.get('content-type')?.split(';')[0].trim()
-    if (mime !== 'application/json') {
-      response.body?.cancel?.()
-      throw new TypeError(`Invalid client metadata content type: ${mime}`)
-    }
-
-    const json: unknown = await response.json()
-
-    signal?.throwIfAborted()
-
-    return oauthClientMetadataSchema.parse(json)
-  }
-
-  // Config
-  readonly clientMetadata: ClientMetadata
-  readonly responseMode: OAuthResponseMode
-  readonly keyset?: Keyset
-
-  // Services
-  readonly runtime: Runtime
-  readonly fetch: Fetch
-  readonly oauthResolver: OAuthResolver
-  readonly serverFactory: OAuthServerFactory
-
-  // Stores
-  protected readonly sessionGetter: SessionGetter
-  protected readonly stateStore: StateStore
-
-  constructor(options: OAuthClientOptions) {
-    const {
-      stateStore,
-      sessionStore,
-
-      dpopNonceCache = new SimpleStoreMemory({ ttl: 60e3, max: 100 }),
-      authorizationServerMetadataCache = new SimpleStoreMemory({
-        ttl: 60e3,
-        max: 100,
-      }),
-      protectedResourceMetadataCache = new SimpleStoreMemory({
-        ttl: 60e3,
-        max: 100,
-      }),
-
-      responseMode,
-      clientMetadata,
-      runtimeImplementation,
-      keyset,
-    } = options
-
-    this.keyset = keyset
-      ? keyset instanceof Keyset
-        ? keyset
-        : new Keyset(keyset)
-      : undefined
-    this.clientMetadata = validateClientMetadata(clientMetadata, this.keyset)
-    this.responseMode = responseMode
-
-    this.runtime = new Runtime(runtimeImplementation)
-    this.fetch = options.fetch ?? globalThis.fetch
-    this.oauthResolver = new OAuthResolver(
-      createIdentityResolver(options),
-      new OAuthProtectedResourceMetadataResolver(
-        protectedResourceMetadataCache,
-        this.fetch,
-        { allowHttpResource: options.allowHttp },
-      ),
-      new OAuthAuthorizationServerMetadataResolver(
-        authorizationServerMetadataCache,
-        this.fetch,
-        { allowHttpIssuer: options.allowHttp },
-      ),
-    )
-    this.serverFactory = new OAuthServerFactory(
-      this.clientMetadata,
-      this.runtime,
-      this.oauthResolver,
-      this.fetch,
-      this.keyset,
-      dpopNonceCache,
-    )
-
-    this.stateStore = stateStore
-    this.sessionGetter = new SessionGetter(
-      sessionStore,
-      this.serverFactory,
-      this.runtime,
-      options,
-    )
-  }
-
-  // Exposed as public API for convenience
-  get identityResolver() {
-    return this.oauthResolver.identityResolver
-  }
-
-  get jwks() {
-    return this.keyset?.publicJwks ?? ({ keys: [] as const } as const)
-  }
-
-  async authorize(
-    input: string,
-    { signal, ...options }: AuthorizeOptions = {},
-  ): Promise<URL> {
-    const redirectUri =
-      options?.redirect_uri ?? this.clientMetadata.redirect_uris[0]
-    if (!this.clientMetadata.redirect_uris.includes(redirectUri)) {
-      // The server will enforce this, but let's catch it early
-      throw new TypeError('Invalid redirect_uri')
-    }
-
-    const { identityInfo, metadata } = await this.oauthResolver.resolve(input, {
-      signal,
-    })
-
-    const pkce = await this.runtime.generatePKCE()
-    const dpopKey = await this.runtime.generateKey(
-      metadata.dpop_signing_alg_values_supported || [FALLBACK_ALG],
-    )
-
-    const authMethod = negotiateClientAuthMethod(
-      metadata,
-      this.clientMetadata,
-      this.keyset,
-    )
-    const state = await this.runtime.generateNonce()
-
-    await this.stateStore.set(state, {
-      iss: metadata.issuer,
-      dpopKey,
-      authMethod,
-      verifier: pkce.verifier,
-      appState: options?.state,
-    })
-
-    const parameters: OAuthAuthorizationRequestParameters = {
-      ...options,
-
-      client_id: this.clientMetadata.client_id,
-      redirect_uri: redirectUri,
-      code_challenge: pkce.challenge,
-      code_challenge_method: pkce.method,
-      state,
-      login_hint: identityInfo
-        ? identityInfo.handle !== HANDLE_INVALID
-          ? identityInfo.handle
-          : identityInfo.did
-        : undefined,
-      response_mode: this.responseMode,
-      response_type: 'code' as const,
-      scope: options?.scope ?? this.clientMetadata.scope,
-    }
-
-    const authorizationUrl = new URL(metadata.authorization_endpoint)
-
-    // Since the user will be redirected to the authorization_endpoint url using
-    // a browser, we need to make sure that the url is valid.
-    if (
-      authorizationUrl.protocol !== 'https:' &&
-      authorizationUrl.protocol !== 'http:'
-    ) {
-      throw new TypeError(
-        `Invalid authorization endpoint protocol: ${authorizationUrl.protocol}`,
-      )
-    }
-
-    if (metadata.pushed_authorization_request_endpoint) {
-      const server = await this.serverFactory.fromMetadata(
-        metadata,
-        authMethod,
-        dpopKey,
-      )
-      const parResponse = await server.request(
-        'pushed_authorization_request',
-        parameters,
-      )
-
-      authorizationUrl.searchParams.set(
-        'client_id',
-        this.clientMetadata.client_id,
-      )
-      authorizationUrl.searchParams.set('request_uri', parResponse.request_uri)
-      return authorizationUrl
-    } else if (metadata.require_pushed_authorization_requests) {
-      throw new Error(
-        'Server requires pushed authorization requests (PAR) but no PAR endpoint is available',
-      )
-    } else {
-      for (const [key, value] of Object.entries(parameters)) {
-        if (value) authorizationUrl.searchParams.set(key, String(value))
-      }
-
-      // Length of the URL that will be sent to the server
-      const urlLength =
-        authorizationUrl.pathname.length + authorizationUrl.search.length
-      if (urlLength < 2048) {
-        return authorizationUrl
-      } else if (!metadata.pushed_authorization_request_endpoint) {
-        throw new Error('Login URL too long')
-      }
-    }
-
-    throw new Error(
-      'Server does not support pushed authorization requests (PAR)',
-    )
-  }
-
-  /**
-   * This method allows the client to proactively revoke the request_uri it
-   * created through PAR.
-   */
-  async abortRequest(authorizeUrl: URL) {
-    const requestUri = authorizeUrl.searchParams.get('request_uri')
-    if (!requestUri) return
-
-    // @NOTE This is not implemented here because, 1) the request server should
-    // invalidate the request_uri after some delay anyways, and 2) I am not sure
-    // that the revocation endpoint is even supposed to support this (and I
-    // don't want to spend the time checking now).
-
-    // @TODO investigate actual necessity & feasibility of this feature
-  }
-
-  async callback(
-    params: URLSearchParams,
-    options: CallbackOptions = {},
-  ): Promise<{
-    session: OAuthSession
-    state: string | null
-  }> {
-    const responseJwt = params.get('response')
-    if (responseJwt != null) {
-      // https://openid.net/specs/oauth-v2-jarm.html
-      throw new OAuthCallbackError(params, 'JARM not supported')
-    }
-
-    const issuerParam = params.get('iss')
-    const stateParam = params.get('state')
-    const errorParam = params.get('error')
-    const codeParam = params.get('code')
-
-    if (!stateParam) {
-      throw new OAuthCallbackError(params, 'Missing "state" parameter')
-    }
-    const stateData = await this.stateStore.get(stateParam)
-    if (stateData) {
-      // Prevent any kind of replay
-      await this.stateStore.del(stateParam)
-    } else {
-      throw new OAuthCallbackError(
-        params,
-        `Unknown authorization session "${stateParam}"`,
-      )
-    }
-
-    try {
-      if (errorParam != null) {
-        throw new OAuthCallbackError(params, undefined, stateData.appState)
-      }
-
-      if (!codeParam) {
-        throw new OAuthCallbackError(
-          params,
-          'Missing "code" query param',
-          stateData.appState,
-        )
-      }
-
-      const server = await this.serverFactory.fromIssuer(
-        stateData.iss,
-        stateData.authMethod,
-        stateData.dpopKey,
-      )
-
-      if (issuerParam != null) {
-        if (!server.issuer) {
-          throw new OAuthCallbackError(
-            params,
-            'Issuer not found in metadata',
-            stateData.appState,
-          )
-        }
-        if (server.issuer !== issuerParam) {
-          throw new OAuthCallbackError(
-            params,
-            'Issuer mismatch',
-            stateData.appState,
-          )
-        }
-      } else if (
-        server.serverMetadata.authorization_response_iss_parameter_supported
-      ) {
-        throw new OAuthCallbackError(
-          params,
-          'iss missing from the response',
-          stateData.appState,
-        )
-      }
-
-      const tokenSet = await server.exchangeCode(
-        codeParam,
-        stateData.verifier,
-        options?.redirect_uri ?? server.clientMetadata.redirect_uris[0],
-      )
-
-      // We revoke any existing session first to avoid leaving orphaned sessions
-      // on the AS.
-      try {
-        await this.revoke(tokenSet.sub)
-      } catch {
-        // No existing session, or failed to get it. This is fine.
-      }
-
-      try {
-        await this.sessionGetter.setStored(tokenSet.sub, {
-          dpopKey: stateData.dpopKey,
-          authMethod: server.authMethod,
-          tokenSet,
-        })
-
-        const session = this.createSession(server, tokenSet.sub)
-
-        return { session, state: stateData.appState ?? null }
-      } catch (err) {
-        await server.revoke(tokenSet.refresh_token || tokenSet.access_token)
-
-        throw err
-      }
-    } catch (err) {
-      // Make sure, whatever the underlying error, that the appState is
-      // available in the calling code
-      throw OAuthCallbackError.from(err, params, stateData.appState)
-    }
-  }
-
-  /**
-   * Load a stored session. This will refresh the token only if needed (about to
-   * expire) by default.
-   *
-   * @see {@link SessionGetter.restore}
-   */
-  async restore(
-    sub: string,
-    refresh: boolean | 'auto' = 'auto',
-  ): Promise<OAuthSession> {
-    // sub arg is lightly typed for convenience of library user
-    assertAtprotoDid(sub)
-
-    const { dpopKey, authMethod, tokenSet } =
-      await this.sessionGetter.getSession(sub, refresh)
-
-    try {
-      const server = await this.serverFactory.fromIssuer(
-        tokenSet.iss,
-        authMethod,
-        dpopKey,
-        {
-          noCache: refresh === true,
-          allowStale: refresh === false,
-        },
-      )
-
-      return this.createSession(server, sub)
-    } catch (err) {
-      if (err instanceof AuthMethodUnsatisfiableError) {
-        await this.sessionGetter.delStored(sub, err)
-      }
-
-      throw err
-    }
-  }
-
-  async revoke(sub: string) {
-    // sub arg is lightly typed for convenience of library user
-    assertAtprotoDid(sub)
-
-    const res = await this.sessionGetter.getSession(sub, false).catch((err) => {
-      if (isExpectedSessionError(err)) return null
-      throw err
-    })
-
-    if (!res) return
-
-    const { dpopKey, authMethod, tokenSet } = res
-
-    // NOT using `;(await this.restore(sub, false)).signOut()` because we want
-    // the tokens to be deleted even if it was not possible to fetch the issuer
-    // data.
-    try {
-      const server = await this.serverFactory.fromIssuer(
-        tokenSet.iss,
-        authMethod,
-        dpopKey,
-      )
-      await server.revoke(tokenSet.access_token)
-    } finally {
-      await this.sessionGetter.delStored(sub, new TokenRevokedError(sub))
-    }
-  }
-
-  protected createSession(
-    server: OAuthServerAgent,
-    sub: AtprotoDid,
-  ): OAuthSession {
-    return new OAuthSession(server, sub, this.sessionGetter, this.fetch)
-  }
-}

package/src/oauth-protected-resource-metadata-resolver.ts

@@ -1,122 +0,0 @@
-import {
-  OAuthProtectedResourceMetadata,
-  oauthProtectedResourceMetadataSchema,
-} from '@atproto/oauth-types'
-import {
-  Fetch,
-  FetchResponseError,
-  bindFetch,
-  cancelBody,
-} from '@atproto-labs/fetch'
-import {
-  CachedGetter,
-  GetCachedOptions,
-  SimpleStore,
-} from '@atproto-labs/simple-store'
-import { contentMime } from './util.js'
-
-export type { GetCachedOptions, OAuthProtectedResourceMetadata }
-
-export type ProtectedResourceMetadataCache = SimpleStore<
-  string,
-  OAuthProtectedResourceMetadata | null
->
-
-export type OAuthProtectedResourceMetadataResolverConfig = {
-  allowHttpResource?: boolean
-}
-
-/**
- * @see {@link https://www.rfc-editor.org/rfc/rfc9728.html}
- */
-export class OAuthProtectedResourceMetadataResolver extends CachedGetter<
-  string,
-  OAuthProtectedResourceMetadata | null
-> {
-  private readonly fetch: Fetch<unknown>
-  private readonly allowHttpResource: boolean
-
-  constructor(
-    cache: ProtectedResourceMetadataCache,
-    fetch: Fetch = globalThis.fetch,
-    config?: OAuthProtectedResourceMetadataResolverConfig,
-  ) {
-    super(async (origin, options) => this.fetchMetadata(origin, options), cache)
-
-    this.fetch = bindFetch(fetch)
-    this.allowHttpResource = config?.allowHttpResource === true
-  }
-
-  async get(
-    resource: string | URL,
-    options?: GetCachedOptions,
-  ): Promise<OAuthProtectedResourceMetadata | null> {
-    const { protocol, origin } = new URL(resource)
-
-    if (protocol !== 'https:' && protocol !== 'http:') {
-      throw new TypeError(
-        `Invalid protected resource metadata URL protocol: ${protocol}`,
-      )
-    }
-
-    if (protocol === 'http:' && !this.allowHttpResource) {
-      throw new TypeError(
-        `Unsecure resource metadata URL (${protocol}) only allowed in development and test environments`,
-      )
-    }
-
-    return super.get(origin, options)
-  }
-
-  private async fetchMetadata(
-    origin: string,
-    options?: GetCachedOptions,
-  ): Promise<OAuthProtectedResourceMetadata | null> {
-    const url = new URL(`/.well-known/oauth-protected-resource`, origin)
-    const request = new Request(url, {
-      signal: options?.signal,
-      headers: { accept: 'application/json' },
-      cache: options?.noCache ? 'no-cache' : undefined,
-      redirect: 'manual', // response must be 200 OK
-    })
-
-    const response = await this.fetch(request)
-
-    if (response.status === 404) {
-      await cancelBody(response, 'log')
-      return null
-    }
-
-    // https://www.rfc-editor.org/rfc/rfc9728.html#section-3.2
-    if (response.status !== 200) {
-      await cancelBody(response, 'log')
-      throw await FetchResponseError.from(
-        response,
-        `Unexpected status code ${response.status} for "${url}"`,
-        undefined,
-        { cause: request },
-      )
-    }
-
-    if (contentMime(response.headers) !== 'application/json') {
-      await cancelBody(response, 'log')
-      throw await FetchResponseError.from(
-        response,
-        `Unexpected content type for "${url}"`,
-        undefined,
-        { cause: request },
-      )
-    }
-
-    const metadata = oauthProtectedResourceMetadataSchema.parse(
-      await response.json(),
-    )
-
-    // https://www.rfc-editor.org/rfc/rfc9728.html#section-3.3
-    if (metadata.resource !== origin) {
-      throw new TypeError(`Invalid issuer ${metadata.resource}`)
-    }
-
-    return metadata
-  }
-}

package/src/oauth-resolver-error.ts

@@ -1,21 +0,0 @@
-import { ZodError } from 'zod'
-
-export class OAuthResolverError extends Error {
-  constructor(message: string, options?: { cause?: unknown }) {
-    super(message, options)
-  }
-
-  static from(cause: unknown, message?: string): OAuthResolverError {
-    if (cause instanceof OAuthResolverError) return cause
-    const validationReason =
-      cause instanceof ZodError
-        ? `${cause.errors[0].path} ${cause.errors[0].message}`
-        : null
-    const fullMessage =
-      (message ?? `Unable to resolve identity`) +
-      (validationReason ? ` (${validationReason})` : '')
-    return new OAuthResolverError(fullMessage, {
-      cause,
-    })
-  }
-}