@atproto/oauth-provider 0.2.16 → 0.2.17

package/src/dpop/dpop-manager.ts

@@ -1,7 +1,5 @@
 import { createHash } from 'node:crypto'
-
 import { EmbeddedJWK, calculateJwkThumbprint, errors, jwtVerify } from 'jose'
-
 import { DPOP_NONCE_MAX_AGE } from '../constants.js'
 import { InvalidDpopProofError } from '../errors/invalid-dpop-proof-error.js'
 import { UseDpopNonceError } from '../errors/use-dpop-nonce-error.js'

package/src/dpop/dpop-nonce.ts

@@ -1,5 +1,4 @@
 import { createHmac, randomBytes } from 'node:crypto'
-
 import { DPOP_NONCE_MAX_AGE } from '../constants.js'
 
 function numTo64bits(num: number) {

package/src/errors/invalid-client-metadata-error.ts

@@ -1,5 +1,5 @@
-import { FetchError } from '@atproto-labs/fetch'
 import { ZodError } from 'zod'
+import { FetchError } from '@atproto-labs/fetch'
 import { OAuthError } from './oauth-error.js'
 
 /**

package/src/errors/invalid-token-error.ts

@@ -1,7 +1,6 @@
-import { JwtVerifyError } from '@atproto/jwk'
 import { errors } from 'jose'
 import { ZodError } from 'zod'
-
+import { JwtVerifyError } from '@atproto/jwk'
 import { OAuthError } from './oauth-error.js'
 import { WWWAuthenticateError } from './www-authenticate-error.js'
 

package/src/errors/www-authenticate-error.ts

@@ -1,5 +1,4 @@
 import { VERIFY_ALGOS } from '../lib/util/crypto.js'
-
 import { OAuthError } from './oauth-error.js'
 
 export type WWWAuthenticateParams = Record<string, string | undefined>

package/src/lib/http/accept.ts

@@ -1,5 +1,4 @@
 import { mediaType } from '@hapi/accept'
-
 import { SubCtx, subCtx } from './context.js'
 import {
   IncomingMessage,

package/src/lib/http/middleware.ts

@@ -1,6 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'node:http'
 import { writeJson } from './response.js'
-import { Middleware, Handler, NextFunction } from './types.js'
+import { Handler, Middleware, NextFunction } from './types.js'
 
 export function combineMiddlewares<M extends Middleware<any, any, any>>(
   middlewares: Iterable<null | undefined | M>,

package/src/lib/http/request.ts

@@ -1,10 +1,9 @@
+import { randomBytes } from 'node:crypto'
 import { parse as parseCookie, serialize as serializeCookie } from 'cookie'
-import { randomBytes } from 'crypto'
 import createHttpError from 'http-errors'
-
 import { appendHeader } from './response.js'
 import { IncomingMessage, ServerResponse } from './types.js'
-import { urlMatch, UrlReference } from './url.js'
+import { UrlReference, urlMatch } from './url.js'
 
 export function validateHeaderValue(
   req: IncomingMessage,

package/src/lib/http/response.ts

@@ -1,5 +1,4 @@
 import { Readable, pipeline } from 'node:stream'
-
 import { Handler, ServerResponse } from './types.js'
 
 export function appendHeader(

package/src/lib/http/stream.ts

@@ -1,13 +1,12 @@
-import { decodeStream, streamToNodeBuffer } from '@atproto/common'
-import createHttpError from 'http-errors'
 import { IncomingMessage } from 'node:http'
 import { Readable } from 'node:stream'
-
+import createHttpError from 'http-errors'
+import { decodeStream, streamToNodeBuffer } from '@atproto/common'
 import {
   KnownNames,
   KnownParser,
-  parseContentType,
   ParserResult,
+  parseContentType,
   parsers,
 } from './parser.js'
 

package/src/lib/util/authorization-header.ts

@@ -1,9 +1,8 @@
+import { z } from 'zod'
 import {
   oauthAccessTokenSchema,
   oauthTokenTypeSchema,
 } from '@atproto/oauth-types'
-import { z } from 'zod'
-
 import { InvalidRequestError } from '../../errors/invalid-request-error.js'
 import { WWWAuthenticateError } from '../../errors/www-authenticate-error.js'
 

package/src/lib/util/hostname.ts

@@ -1,4 +1,4 @@
-import { parse, ParsedDomain } from 'psl'
+import { ParsedDomain, parse } from 'psl'
 
 export function isInternetUrl(url: URL): boolean {
   return parseUrlPublicSuffix(url) !== null

package/src/metadata/build-metadata.ts

@@ -3,7 +3,6 @@ import {
   OAuthAuthorizationServerMetadata,
   oauthAuthorizationServerMetadataSchema,
 } from '@atproto/oauth-types'
-
 import { Client } from '../client/client.js'
 import { VERIFY_ALGOS } from '../lib/util/crypto.js'
 

package/src/oauth-hooks.ts

@@ -5,7 +5,6 @@ import {
   OAuthClientMetadata,
   OAuthTokenResponse,
 } from '@atproto/oauth-types'
-
 import { Account } from './account/account.js'
 import { ClientAuth } from './client/client-auth.js'
 import { ClientId } from './client/client-id.js'

package/src/oauth-provider.ts

@@ -1,6 +1,7 @@
-import { safeFetchWrap } from '@atproto-labs/fetch-node'
-import { SimpleStore } from '@atproto-labs/simple-store'
-import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory'
+import { mediaType } from '@hapi/accept'
+import createHttpError from 'http-errors'
+import type { Redis, RedisOptions } from 'ioredis'
+import { ZodError, z } from 'zod'
 import { Jwks, Keyset } from '@atproto/jwk'
 import {
   CLIENT_ASSERTION_TYPE_JWT_BEARER,
@@ -29,11 +30,9 @@ import {
   oauthTokenIdentificationSchema,
   oauthTokenRequestSchema,
 } from '@atproto/oauth-types'
-import { mediaType } from '@hapi/accept'
-import createHttpError from 'http-errors'
-import type { Redis, RedisOptions } from 'ioredis'
-import z, { ZodError } from 'zod'
-
+import { safeFetchWrap } from '@atproto-labs/fetch-node'
+import { SimpleStore } from '@atproto-labs/simple-store'
+import { SimpleStoreMemory } from '@atproto-labs/simple-store-memory'
 import { AccessTokenType } from './access-token/access-token-type.js'
 import { AccountManager } from './account/account-manager.js'
 import {
@@ -125,10 +124,10 @@ export type OAuthProviderStore = Partial<
 >
 
 export {
-  Keyset,
   type CustomMetadata,
   type Customization,
   type Handler,
+  Keyset,
   type OAuthAuthorizationServerMetadata,
 }
 

package/src/oauth-verifier.ts

@@ -1,3 +1,4 @@
+import type { Redis, RedisOptions } from 'ioredis'
 import { Key, Keyset, isSignedJwt } from '@atproto/jwk'
 import {
   OAuthAccessToken,
@@ -5,8 +6,6 @@ import {
   OAuthTokenType,
   oauthIssuerIdentifierSchema,
 } from '@atproto/oauth-types'
-import type { Redis, RedisOptions } from 'ioredis'
-
 import { AccessTokenType } from './access-token/access-token-type.js'
 import { DpopManager, DpopManagerOptions } from './dpop/dpop-manager.js'
 import { DpopNonce } from './dpop/dpop-nonce.js'

package/src/output/build-authorize-data.ts

@@ -2,7 +2,6 @@ import {
   OAuthAuthorizationRequestParameters,
   OAuthClientMetadata,
 } from '@atproto/oauth-types'
-
 import { DeviceAccountInfo } from '../account/account-store.js'
 import { Account } from '../account/account.js'
 import { Client } from '../client/client.js'

package/src/output/build-error-payload.ts

@@ -1,7 +1,6 @@
-import { JwtVerifyError } from '@atproto/jwk'
 import { errors } from 'jose'
 import { ZodError } from 'zod'
-
+import { JwtVerifyError } from '@atproto/jwk'
 import { OAuthError } from '../errors/oauth-error.js'
 
 const { JOSEError } = errors

package/src/output/output-manager.ts

@@ -1,17 +1,16 @@
 import { ServerResponse } from 'node:http'
-
 import { Asset } from '../assets/asset.js'
 import { getAsset } from '../assets/index.js'
-import { cssCode, Html, html } from '../lib/html/index.js'
+import { Html, cssCode, html } from '../lib/html/index.js'
 import {
   AuthorizationResultAuthorize,
   buildAuthorizeData,
 } from './build-authorize-data.js'
 import { buildErrorPayload, buildErrorStatus } from './build-error-payload.js'
 import {
+  Customization,
   buildCustomizationCss,
   buildCustomizationData,
-  Customization,
 } from './customization.js'
 import { declareBackendData, sendWebPage } from './send-web-page.js'
 

package/src/output/send-authorize-redirect.ts

@@ -1,9 +1,8 @@
+import { ServerResponse } from 'node:http'
 import {
   OAuthAuthorizationRequestParameters,
   OAuthTokenType,
 } from '@atproto/oauth-types'
-import { ServerResponse } from 'node:http'
-
 import { InvalidRequestError } from '../errors/invalid-request-error.js'
 import { html, js } from '../lib/html/index.js'
 import { Code } from '../request/code.js'

package/src/output/send-web-page.ts

@@ -1,14 +1,13 @@
 import { createHash } from 'node:crypto'
 import { ServerResponse } from 'node:http'
-
 import {
   AssetRef,
-  buildDocument,
   BuildDocumentOptions,
   Html,
+  buildDocument,
   js,
 } from '../lib/html/index.js'
-import { writeHtml, WriteResponseOptions } from '../lib/http/response.js'
+import { WriteResponseOptions, writeHtml } from '../lib/http/response.js'
 
 export function declareBackendData(name: string, data: unknown) {
   // The script tag is removed after the data is assigned to the global variable

package/src/replay/replay-manager.ts

@@ -1,8 +1,8 @@
 import { ClientId } from '../client/client-id.js'
 import {
   CLIENT_ASSERTION_MAX_AGE,
-  DPOP_NONCE_MAX_AGE,
   CODE_CHALLENGE_REPLAY_TIMEFRAME,
+  DPOP_NONCE_MAX_AGE,
   JAR_MAX_AGE,
 } from '../constants.js'
 import { ReplayStore } from './replay-store.js'

package/src/replay/replay-store-redis.ts

@@ -1,5 +1,4 @@
 import type { Redis } from 'ioredis'
-
 import { CreateRedisOptions, createRedis } from '../lib/redis.js'
 import type { ReplayStore } from './replay-store.js'
 

package/src/request/code.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { CODE_BYTES_LENGTH, CODE_PREFIX } from '../constants.js'
 import { randomHexId } from '../lib/util/crypto.js'
 

package/src/request/request-data.ts

@@ -1,5 +1,4 @@
 import { OAuthAuthorizationRequestParameters } from '@atproto/oauth-types'
-
 import { ClientAuth } from '../client/client-auth.js'
 import { ClientId } from '../client/client-id.js'
 import { DeviceId } from '../device/device-id.js'

package/src/request/request-id.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { REQUEST_ID_BYTES_LENGTH, REQUEST_ID_PREFIX } from '../constants.js'
 import { randomHexId } from '../lib/util/crypto.js'
 

package/src/request/request-info.ts

@@ -1,6 +1,6 @@
 import { OAuthAuthorizationRequestParameters } from '@atproto/oauth-types'
-import { ClientId } from '../client/client-id.js'
 import { ClientAuth } from '../client/client-auth.js'
+import { ClientId } from '../client/client-id.js'
 import { RequestId } from './request-id.js'
 import { RequestUri } from './request-uri.js'
 

package/src/request/request-manager.ts

@@ -3,7 +3,6 @@ import {
   OAuthAuthorizationRequestParameters,
   OAuthAuthorizationServerMetadata,
 } from '@atproto/oauth-types'
-
 import { Account } from '../account/account.js'
 import { ClientAuth } from '../client/client-auth.js'
 import { ClientId } from '../client/client-id.js'
@@ -20,22 +19,22 @@ import { InvalidAuthorizationDetailsError } from '../errors/invalid-authorizatio
 import { InvalidGrantError } from '../errors/invalid-grant-error.js'
 import { InvalidParametersError } from '../errors/invalid-parameters-error.js'
 import { InvalidRequestError } from '../errors/invalid-request-error.js'
+import { InvalidScopeError } from '../errors/invalid-scope-error.js'
 import { OAuthHooks } from '../oauth-hooks.js'
 import { Signer } from '../signer/signer.js'
 import { Code, generateCode } from './code.js'
 import {
-  isRequestDataAuthorized,
   RequestDataAuthorized,
+  isRequestDataAuthorized,
 } from './request-data.js'
 import { generateRequestId } from './request-id.js'
 import { RequestInfo } from './request-info.js'
 import { RequestStore, UpdateRequestData } from './request-store.js'
 import {
+  RequestUri,
   decodeRequestUri,
   encodeRequestUri,
-  RequestUri,
 } from './request-uri.js'
-import { InvalidScopeError } from '../errors/invalid-scope-error.js'
 
 export class RequestManager {
   constructor(

package/src/request/request-store-memory.ts

@@ -1,6 +1,6 @@
 import { Code } from './code.js'
-import { RequestId } from './request-id.js'
 import { RequestData } from './request-data.js'
+import { RequestId } from './request-id.js'
 import { RequestStore } from './request-store.js'
 
 export class RequestStoreMemory implements RequestStore {

package/src/request/request-store-redis.ts

@@ -1,12 +1,11 @@
 import type { Redis } from 'ioredis'
-
 import { CreateRedisOptions, createRedis } from '../lib/redis.js'
 import { Code } from './code.js'
 import { RequestData } from './request-data.js'
 import { RequestId, requestIdSchema } from './request-id.js'
 import { RequestStore } from './request-store.js'
 
-export type { Redis, CreateRedisOptions }
+export type { CreateRedisOptions, Redis }
 
 export type ReplayStoreRedisOptions = {
   redis: CreateRedisOptions

package/src/request/request-uri.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { RequestId, requestIdSchema } from './request-id.js'
 
 export const REQUEST_URI_PREFIX = 'urn:ietf:params:oauth:request_uri:'

package/src/signer/signed-token-payload.ts

@@ -1,6 +1,5 @@
+import { z } from 'zod'
 import { jwtPayloadSchema } from '@atproto/jwk'
-import z from 'zod'
-
 import { clientIdSchema } from '../client/client-id.js'
 import { Simplify } from '../lib/util/type.js'
 import { subSchema } from '../oidc/sub.js'

package/src/signer/signer.ts

@@ -7,10 +7,9 @@ import {
   VerifyOptions,
 } from '@atproto/jwk'
 import {
-  OAuthAuthorizationRequestParameters,
   OAuthAuthorizationDetails,
+  OAuthAuthorizationRequestParameters,
 } from '@atproto/oauth-types'
-
 import { Client } from '../client/client.js'
 import { dateToEpoch } from '../lib/util/date.js'
 import { TokenId } from '../token/token-id.js'

package/src/token/refresh-token.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import {
   REFRESH_TOKEN_BYTES_LENGTH,
   REFRESH_TOKEN_PREFIX,

package/src/token/token-claims.ts

@@ -1,6 +1,5 @@
+import { z } from 'zod'
 import { jwtPayloadSchema } from '@atproto/jwk'
-import z from 'zod'
-
 import { clientIdSchema } from '../client/client-id.js'
 import { Simplify } from '../lib/util/type.js'
 import { subSchema } from '../oidc/sub.js'

package/src/token/token-data.ts

@@ -2,7 +2,6 @@ import {
   OAuthAuthorizationDetails,
   OAuthAuthorizationRequestParameters,
 } from '@atproto/oauth-types'
-
 import { ClientAuth } from '../client/client-auth.js'
 import { ClientId } from '../client/client-id.js'
 import { DeviceId } from '../device/device-id.js'

package/src/token/token-id.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod'
-
 import { TOKEN_ID_BYTES_LENGTH, TOKEN_ID_PREFIX } from '../constants.js'
 import { randomHexId } from '../lib/util/crypto.js'
 

package/src/token/token-manager.ts

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 import { isSignedJwt } from '@atproto/jwk'
 import {
   CLIENT_ASSERTION_TYPE_JWT_BEARER,
@@ -10,8 +11,6 @@ import {
   OAuthTokenResponse,
   OAuthTokenType,
 } from '@atproto/oauth-types'
-import { createHash } from 'node:crypto'
-
 import { AccessTokenType } from '../access-token/access-token-type.js'
 import { DeviceAccountInfo } from '../account/account-store.js'
 import { Account } from '../account/account.js'

package/src/token/verify-token-claims.ts

@@ -1,5 +1,4 @@
 import { OAuthAccessToken, OAuthTokenType } from '@atproto/oauth-types'
-
 import { InvalidDpopKeyBindingError } from '../errors/invalid-dpop-key-binding-error.js'
 import { InvalidDpopProofError } from '../errors/invalid-dpop-proof-error.js'
 import { asArray } from '../lib/util/cast.js'