@atproto/oauth-provider 0.20.2 → 0.21.0

package/dist/signer/access-token-payload.d.ts

@@ -1219,7 +1219,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             alg?: "HS256" | "HS384" | "HS512" | undefined;
             k: string;
         }) & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }, {
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1367,7 +1367,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1391,7 +1391,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1415,7 +1415,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1438,7 +1438,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }, {
@@ -1588,7 +1588,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1612,7 +1612,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1636,7 +1636,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1659,7 +1659,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }, {
@@ -1817,7 +1817,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1841,7 +1841,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1865,7 +1865,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -1888,7 +1888,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }) | undefined;
@@ -3317,7 +3317,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             alg?: "HS256" | "HS384" | "HS512" | undefined;
             k: string;
         }) & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }, {
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3465,7 +3465,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3489,7 +3489,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3513,7 +3513,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3536,7 +3536,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }, {
@@ -3686,7 +3686,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3710,7 +3710,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3734,7 +3734,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3757,7 +3757,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }, {
@@ -3915,7 +3915,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3939,7 +3939,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3963,7 +3963,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -3986,7 +3986,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }) | undefined;
@@ -5415,7 +5415,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             alg?: "HS256" | "HS384" | "HS512" | undefined;
             k: string;
         }) & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }, {
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -5563,7 +5563,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -5587,7 +5587,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -5611,7 +5611,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -5634,7 +5634,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }, {
@@ -5784,7 +5784,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -5808,7 +5808,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -5832,7 +5832,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -5855,7 +5855,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }, {
@@ -6013,7 +6013,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
                 t?: string | undefined;
             }[] | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -6037,7 +6037,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -6061,7 +6061,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             y: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         }) | ({
             kid?: string | undefined;
             use?: "enc" | "sig" | undefined;
@@ -6084,7 +6084,7 @@ export declare const accessTokenPayloadSchema: z.ZodObject<z.objectUtil.extendSh
             x: string;
             d?: string | undefined;
         } & {
-            kid: {};
+            kid: NonNullable<unknown>;
         })) & {
             d?: never;
         }) | undefined;

package/dist/token/token-manager.d.ts

@@ -26,12 +26,12 @@ export declare class TokenManager {
     protected readonly accessTokenMode: AccessTokenMode;
     protected readonly tokenMaxAge: number;
     constructor(store: TokenStore, lexiconManager: LexiconManager, signer: Signer, hooks: OAuthHooks, accessTokenMode: AccessTokenMode, tokenMaxAge?: number);
-    protected createTokenExpiry(now?: Date): Date;
+    protected createTokenExpiry(client: Client, now: Date, sessionCreationDate?: Date): Date;
     protected createAccessToken(tokenId: TokenId, client: Client, account: Account, parameters: OAuthAuthorizationRequestParameters, issuedAt: Date, expiresAt: Date, scope: OAuthScope): Promise<OAuthAccessToken>;
     createToken(client: Client, clientAuth: ClientAuth, clientMetadata: RequestMetadata, account: Account, deviceId: null | DeviceId, parameters: OAuthAuthorizationRequestParameters, code: Code): Promise<OAuthTokenResponse>;
     protected validateTokenParams(client: Client, clientAuth: ClientAuth, parameters: OAuthAuthorizationRequestParameters): Promise<void>;
     protected buildTokenResponse(tokenType: OAuthTokenType, accessToken: OAuthAccessToken, refreshToken: string | undefined, expiresAt: Date, did: Did, scope: string): OAuthTokenResponse;
-    rotateToken(client: Client, clientAuth: ClientAuth, clientMetadata: RequestMetadata, tokenInfo: TokenInfo): Promise<OAuthTokenResponse>;
+    rotateToken(client: Client, clientAuth: ClientAuth, clientMetadata: RequestMetadata, tokenInfo: TokenInfo, now?: Date): Promise<OAuthTokenResponse>;
     /**
      * @note The token validity is not guaranteed. The caller must ensure that the
      * token is valid before using the returned token info.

package/dist/token/token-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-manager.d.ts","sourceRoot":"","sources":["../../src/token/token-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token-manager.d.ts","sourceRoot":"","sources":["../../src/token/token-manager.ts"],"names":[],"mappings":"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"}

package/dist/token/token-manager.js

@@ -5,7 +5,7 @@ import { InvalidGrantError } from '../errors/invalid-grant-error.js';
 import { InvalidRequestError } from '../errors/invalid-request-error.js';
 import { InvalidTokenError } from '../errors/invalid-token-error.js';
 import { dateToEpoch, dateToRelativeSeconds } from '../lib/util/date.js';
-import { TOKEN_MAX_AGE } from '../oauth-constants.js';
+import { REFRESH_LIFETIME_EXTENDED, SESSION_LIFETIME_EXTENDED, TOKEN_MAX_AGE, } from '../oauth-constants.js';
 import { isCode } from '../request/code.js';
 import { Signer } from '../signer/signer.js';
 import { generateRefreshToken, isRefreshToken, } from './refresh-token.js';
@@ -20,8 +20,16 @@ export class TokenManager {
         this.accessTokenMode = accessTokenMode;
         this.tokenMaxAge = tokenMaxAge;
     }
-    createTokenExpiry(now = new Date()) {
-        return new Date(now.getTime() + this.tokenMaxAge);
+    createTokenExpiry(client, now, sessionCreationDate = now) {
+        const lifetime = Math.min(this.tokenMaxAge, 
+        // Make sure the token does not stay valid beyond the session lifetime.
+        sessionCreationDate.getTime() + client.sessionLifetime - now.getTime());
+        // We account for a small buffer to avoid the token being valid for a few
+        // milliseconds
+        if (lifetime <= 250) {
+            throw new InvalidGrantError(`Session expired`);
+        }
+        return new Date(now.getTime() + lifetime);
     }
     async createAccessToken(tokenId, client, account, parameters, issuedAt, expiresAt, scope) {
         const claims = {
@@ -56,7 +64,7 @@ export class TokenManager {
             ? await generateRefreshToken()
             : undefined;
         const now = new Date();
-        const expiresAt = this.createTokenExpiry(now);
+        const expiresAt = this.createTokenExpiry(client, now);
         const scope = await this.lexiconManager
             .buildTokenScope(parameters.scope)
             .catch((err) => {
@@ -122,14 +130,13 @@ export class TokenManager {
             sub: did,
         };
     }
-    async rotateToken(client, clientAuth, clientMetadata, tokenInfo) {
+    async rotateToken(client, clientAuth, clientMetadata, tokenInfo, now = new Date()) {
         const { account, data } = tokenInfo;
         const { parameters } = data;
         await this.validateTokenParams(client, clientAuth, parameters);
         const nextTokenId = await generateTokenId();
         const nextRefreshToken = await generateRefreshToken();
-        const now = new Date();
-        const expiresAt = this.createTokenExpiry(now);
+        const expiresAt = this.createTokenExpiry(client, now, tokenInfo.data.createdAt);
         // @NOTE since the permission sets are stored in a persistent store,
         // it's fine to propagate a 500 (server_error) here as the values should
         // be retrievable from the store.
@@ -266,7 +273,14 @@ export class TokenManager {
         const results = await this.store.listAccountTokens(did);
         return results
             .filter((tokenInfo) => tokenInfo.account.did === did) // Fool proof
-            .filter((tokenInfo) => !isCurrentTokenExpired(tokenInfo));
+            .filter(
+        // The session are still active if they are within the session lifetime
+        // and refresh lifetime. We pre-filter here, based on the maximum
+        // possible lifetime of a session, to avoid loading the client metadata
+        // for sessions that are for sure expired. The client metadata is needed
+        // to determine the actual session and refresh lifetimes.
+        ({ data }) => Date.now() - data.createdAt.getTime() < SESSION_LIFETIME_EXTENDED &&
+            Date.now() - data.updatedAt.getTime() < REFRESH_LIFETIME_EXTENDED);
     }
 }
 function isCurrentTokenExpired(tokenInfo) {

package/dist/token/token-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-manager.js","sourceRoot":"","sources":["../../src/token/token-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Did } from '@atproto/did'\nimport { type SignedJwt, isSignedJwt } from '@atproto/jwk'\nimport { LexResolverError } from '@atproto/lex-resolver'\nimport type { Account } from '@atproto/oauth-provider-api'\nimport type {\n  OAuthAccessToken,\n  OAuthAuthorizationRequestParameters,\n  OAuthScope,\n  OAuthTokenResponse,\n  OAuthTokenType,\n} from '@atproto/oauth-types'\nimport { AccessTokenMode } from '../access-token/access-token-mode.js'\nimport type { ClientAuth } from '../client/client-auth.js'\nimport type { Client } from '../client/client.js'\nimport type { DeviceId } from '../device/device-id.js'\nimport { InvalidGrantError } from '../errors/invalid-grant-error.js'\nimport { InvalidRequestError } from '../errors/invalid-request-error.js'\nimport { InvalidTokenError } from '../errors/invalid-token-error.js'\nimport type { LexiconManager } from '../lexicon/lexicon-manager.js'\nimport type { RequestMetadata } from '../lib/http/request.js'\nimport { dateToEpoch, dateToRelativeSeconds } from '../lib/util/date.js'\nimport { TOKEN_MAX_AGE } from '../oauth-constants.js'\nimport type { OAuthHooks } from '../oauth-hooks.js'\nimport { type Code, isCode } from '../request/code.js'\nimport type { AccessTokenPayload } from '../signer/access-token-payload.js'\nimport { Signer } from '../signer/signer.js'\nimport {\n  type RefreshToken,\n  generateRefreshToken,\n  isRefreshToken,\n} from './refresh-token.js'\nimport type { TokenClaims } from './token-claims.js'\nimport { type TokenId, generateTokenId, isTokenId } from './token-id.js'\nimport type { CreateTokenData, TokenInfo, TokenStore } from './token-store.js'\n\nexport { AccessTokenMode, Signer }\nexport type { OAuthHooks, TokenStore }\n\nexport class TokenManager {\n  constructor(\n    protected readonly store: TokenStore,\n    protected readonly lexiconManager: LexiconManager,\n    protected readonly signer: Signer,\n    protected readonly hooks: OAuthHooks,\n    protected readonly accessTokenMode: AccessTokenMode,\n    protected readonly tokenMaxAge = TOKEN_MAX_AGE,\n  ) {}\n\n  protected createTokenExpiry(now = new Date()) {\n    return new Date(now.getTime() + this.tokenMaxAge)\n  }\n\n  protected async createAccessToken(\n    tokenId: TokenId,\n    client: Client,\n    account: Account,\n    parameters: OAuthAuthorizationRequestParameters,\n    issuedAt: Date,\n    expiresAt: Date,\n    scope: OAuthScope,\n  ): Promise<OAuthAccessToken> {\n    const claims: TokenClaims = {\n      jti: tokenId,\n      sub: account.did,\n      iat: dateToEpoch(issuedAt),\n      exp: dateToEpoch(expiresAt),\n      aud: account.pds,\n\n      ...(parameters.dpop_jkt && {\n        cnf: { jkt: parameters.dpop_jkt },\n      }),\n\n      // Because tokens can end-up being quite big, we only include the scope in\n      // stateless mode.\n      ...(this.accessTokenMode === AccessTokenMode.stateless && {\n        scope,\n      }),\n\n      // https://datatracker.ietf.org/doc/html/rfc8693#section-4.3\n      client_id: client.id,\n    }\n\n    const claimsOverride = await this.hooks.onCreateToken?.call(null, {\n      client,\n      account,\n      parameters,\n      claims,\n    })\n\n    return this.signer.createAccessToken(claimsOverride ?? claims)\n  }\n\n  async createToken(\n    client: Client,\n    clientAuth: ClientAuth,\n    clientMetadata: RequestMetadata,\n    account: Account,\n    deviceId: null | DeviceId,\n    parameters: OAuthAuthorizationRequestParameters,\n    code: Code,\n  ): Promise<OAuthTokenResponse> {\n    await this.validateTokenParams(client, clientAuth, parameters)\n\n    const tokenId = await generateTokenId()\n    const refreshToken = client.metadata.grant_types.includes('refresh_token')\n      ? await generateRefreshToken()\n      : undefined\n\n    const now = new Date()\n    const expiresAt = this.createTokenExpiry(now)\n\n    const scope = await this.lexiconManager\n      .buildTokenScope(parameters.scope!)\n      .catch((err) => {\n        // Parse expected errors\n        if (err instanceof LexResolverError) {\n          throw new InvalidRequestError(err.message, err)\n        }\n\n        // Unexpected error\n        throw err\n      })\n\n    const accessToken = await this.createAccessToken(\n      tokenId,\n      client,\n      account,\n      parameters,\n      now,\n      expiresAt,\n      scope,\n    )\n\n    const response = this.buildTokenResponse(\n      inferTokenType(parameters),\n      accessToken,\n      refreshToken,\n      expiresAt,\n      account.did,\n      scope,\n    )\n\n    const tokenData: CreateTokenData = {\n      createdAt: now,\n      updatedAt: now,\n      expiresAt,\n      clientId: client.id,\n      clientAuth,\n      deviceId,\n      did: account.did,\n      parameters,\n      details: null,\n      scope,\n      code,\n    }\n\n    await this.store.createToken(tokenId, tokenData, refreshToken)\n\n    try {\n      await this.hooks.onTokenCreated?.call(null, {\n        client,\n        clientAuth,\n        clientMetadata,\n        account,\n        parameters,\n      })\n\n      return response\n    } catch (err) {\n      // If the hook fails, we delete the token to avoid leaving a dangling\n      // token in the store.\n      await this.deleteToken(tokenId)\n      throw err\n    }\n  }\n\n  protected async validateTokenParams(\n    client: Client,\n    clientAuth: ClientAuth,\n    parameters: OAuthAuthorizationRequestParameters,\n  ): Promise<void> {\n    if (client.metadata.dpop_bound_access_tokens && !parameters.dpop_jkt) {\n      throw new InvalidGrantError(\n        `DPoP JKT is required for DPoP bound access tokens`,\n      )\n    }\n  }\n\n  protected buildTokenResponse(\n    tokenType: OAuthTokenType,\n    accessToken: OAuthAccessToken,\n    refreshToken: string | undefined,\n    expiresAt: Date,\n    did: Did,\n    scope: string,\n  ): OAuthTokenResponse {\n    return {\n      access_token: accessToken,\n      token_type: tokenType,\n      refresh_token: refreshToken,\n      scope,\n\n      // @NOTE using a getter so that the value gets computed when the JSON\n      // response is generated, allowing to value to be as accurate as possible.\n      get expires_in() {\n        return dateToRelativeSeconds(expiresAt)\n      },\n\n      // ATPROTO extension: add the sub claim to the token response to allow\n      // clients to resolve the PDS url (audience) using the did resolution\n      // mechanism.\n      sub: did,\n    }\n  }\n\n  async rotateToken(\n    client: Client,\n    clientAuth: ClientAuth,\n    clientMetadata: RequestMetadata,\n    tokenInfo: TokenInfo,\n  ): Promise<OAuthTokenResponse> {\n    const { account, data } = tokenInfo\n    const { parameters } = data\n\n    await this.validateTokenParams(client, clientAuth, parameters)\n\n    const nextTokenId = await generateTokenId()\n    const nextRefreshToken = await generateRefreshToken()\n\n    const now = new Date()\n    const expiresAt = this.createTokenExpiry(now)\n\n    // @NOTE since the permission sets are stored in a persistent store,\n    // it's fine to propagate a 500 (server_error) here as the values should\n    // be retrievable from the store.\n    const scope = await this.lexiconManager.buildTokenScope(parameters.scope!)\n\n    await this.store.rotateToken(tokenInfo.id, nextTokenId, nextRefreshToken, {\n      updatedAt: now,\n      expiresAt,\n      // @NOTE Normally, the clientAuth not change over time. There are two\n      // exceptions:\n      // - Upgrade from a legacy representation of client authentication to\n      //   a modern one.\n      // - Allow clients to become \"confidential\" if they were previously\n      //   \"public\"\n      clientAuth,\n      scope,\n    })\n\n    const accessToken = await this.createAccessToken(\n      nextTokenId,\n      client,\n      account,\n      parameters,\n      now,\n      expiresAt,\n      scope,\n    )\n\n    const response = this.buildTokenResponse(\n      inferTokenType(parameters),\n      accessToken,\n      nextRefreshToken,\n      expiresAt,\n      account.did,\n      scope,\n    )\n\n    await this.hooks.onTokenRefreshed?.call(null, {\n      client,\n      clientAuth,\n      clientMetadata,\n      account,\n      parameters,\n    })\n\n    return response\n  }\n\n  /**\n   * @note The token validity is not guaranteed. The caller must ensure that the\n   * token is valid before using the returned token info.\n   */\n  public async findToken(token: string): Promise<null | TokenInfo> {\n    if (isTokenId(token)) {\n      return this.getTokenInfo(token)\n    } else if (isCode(token)) {\n      return this.findByCode(token)\n    } else if (isRefreshToken(token)) {\n      return this.findByRefreshToken(token)\n    } else if (isSignedJwt(token)) {\n      return this.findByAccessToken(token)\n    } else {\n      throw new InvalidRequestError(`Invalid token`)\n    }\n  }\n\n  public async findByAccessToken(token: SignedJwt): Promise<null | TokenInfo> {\n    const { payload } = await this.signer.verifyAccessToken(token, {\n      clockTolerance: Infinity,\n    })\n\n    const tokenInfo = await this.getTokenInfo(payload.jti)\n    if (!tokenInfo) return null\n\n    // Fool-proof: Invalid store implementation ?\n    if (payload.sub !== tokenInfo.account.did) {\n      await this.deleteToken(tokenInfo.id)\n      throw new Error(\n        `Account sub (${tokenInfo.account.did}) does not match token sub (${payload.sub})`,\n      )\n    }\n\n    return tokenInfo\n  }\n\n  protected async findByRefreshToken(\n    token: RefreshToken,\n  ): Promise<null | TokenInfo> {\n    return this.store.findTokenByRefreshToken(token)\n  }\n\n  public async consumeRefreshToken(token: RefreshToken): Promise<TokenInfo> {\n    // @NOTE concurrent refreshes of the same refresh token could theoretically\n    // lead to two new tokens (access & refresh) being created. This is deemed\n    // acceptable for now (as the mechanism can only be used once since only one\n    // of the two refresh token created will be valid, and any future refresh\n    // attempts from outdated tokens will cause the entire session to be\n    // invalidated). Ideally, the store should be able to handle this case by\n    // atomically consuming the refresh token and returning the token info.\n\n    // @TODO Add another store method that atomically consumes the refresh token\n    // with a lock.\n    const tokenInfo = await this.findByRefreshToken(token).catch((err) => {\n      throw InvalidGrantError.from(err, `Invalid refresh token`)\n    })\n\n    if (!tokenInfo) {\n      throw new InvalidGrantError(`Invalid refresh token`)\n    }\n\n    if (tokenInfo.currentRefreshToken !== token) {\n      await this.deleteToken(tokenInfo.id)\n      throw new InvalidGrantError(`Refresh token replayed`)\n    }\n\n    return tokenInfo\n  }\n\n  public async findByCode(code: Code): Promise<null | TokenInfo> {\n    return this.store.findTokenByCode(code)\n  }\n\n  public async deleteToken(tokenId: TokenId): Promise<void> {\n    return this.store.deleteToken(tokenId)\n  }\n\n  async getTokenInfo(tokenId: TokenId): Promise<null | TokenInfo> {\n    return this.store.readToken(tokenId)\n  }\n\n  /**\n   * This method is called to when decoding a token that was encoded in\n   * {@link AccessTokenMode.light} mode, using data from the store to fill the\n   * data that was omitted in the token itself.\n   */\n  async loadTokenClaims(\n    tokenType: OAuthTokenType,\n    tokenPayload: AccessTokenPayload,\n  ): Promise<TokenClaims> {\n    const tokenId = tokenPayload.jti\n    const tokenInfo = await this.getTokenInfo(tokenId).catch((err) => {\n      throw InvalidTokenError.from(err, tokenType)\n    })\n\n    if (!tokenInfo) {\n      throw new InvalidTokenError(tokenType, `Invalid token`)\n    }\n\n    const { account, data } = tokenInfo\n\n    // Fool proof, make sure that the database & token payload are consistent.\n    // These should both be either undefined or a string so it's safe to compare\n    // the values directly.\n    if (tokenPayload.cnf?.jkt !== data.parameters.dpop_jkt) {\n      await this.deleteToken(tokenId)\n      throw new InvalidTokenError(tokenType, `Invalid token`)\n    }\n\n    if (isCurrentTokenExpired(tokenInfo)) {\n      await this.deleteToken(tokenId)\n      throw new InvalidTokenError(tokenType, `Token expired`)\n    }\n\n    return {\n      jti: tokenId,\n      sub: account.did,\n      iat: dateToEpoch(data.updatedAt),\n      exp: dateToEpoch(data.expiresAt),\n      aud: account.pds,\n      scope: data.scope ?? data.parameters.scope,\n      // https://datatracker.ietf.org/doc/html/rfc8693#section-4.3\n      client_id: data.clientId,\n    }\n  }\n\n  async listAccountTokens(did: Did): Promise<TokenInfo[]> {\n    const results = await this.store.listAccountTokens(did)\n    return results\n      .filter((tokenInfo) => tokenInfo.account.did === did) // Fool proof\n      .filter((tokenInfo) => !isCurrentTokenExpired(tokenInfo))\n  }\n}\n\nfunction isCurrentTokenExpired(tokenInfo: TokenInfo): boolean {\n  return tokenInfo.data.expiresAt.getTime() < Date.now()\n}\n\nfunction inferTokenType(\n  parameters: OAuthAuthorizationRequestParameters,\n): OAuthTokenType {\n  if (parameters.dpop_jkt) {\n    return 'DPoP'\n  }\n  return 'Bearer'\n}\n"]}
+{"version":3,"file":"token-manager.js","sourceRoot":"","sources":["../../src/token/token-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Did } from '@atproto/did'\nimport { type SignedJwt, isSignedJwt } from '@atproto/jwk'\nimport { LexResolverError } from '@atproto/lex-resolver'\nimport type { Account } from '@atproto/oauth-provider-api'\nimport type {\n  OAuthAccessToken,\n  OAuthAuthorizationRequestParameters,\n  OAuthScope,\n  OAuthTokenResponse,\n  OAuthTokenType,\n} from '@atproto/oauth-types'\nimport { AccessTokenMode } from '../access-token/access-token-mode.js'\nimport type { ClientAuth } from '../client/client-auth.js'\nimport type { Client } from '../client/client.js'\nimport type { DeviceId } from '../device/device-id.js'\nimport { InvalidGrantError } from '../errors/invalid-grant-error.js'\nimport { InvalidRequestError } from '../errors/invalid-request-error.js'\nimport { InvalidTokenError } from '../errors/invalid-token-error.js'\nimport type { LexiconManager } from '../lexicon/lexicon-manager.js'\nimport type { RequestMetadata } from '../lib/http/request.js'\nimport { dateToEpoch, dateToRelativeSeconds } from '../lib/util/date.js'\nimport {\n  REFRESH_LIFETIME_EXTENDED,\n  SESSION_LIFETIME_EXTENDED,\n  TOKEN_MAX_AGE,\n} from '../oauth-constants.js'\nimport type { OAuthHooks } from '../oauth-hooks.js'\nimport { type Code, isCode } from '../request/code.js'\nimport type { AccessTokenPayload } from '../signer/access-token-payload.js'\nimport { Signer } from '../signer/signer.js'\nimport {\n  type RefreshToken,\n  generateRefreshToken,\n  isRefreshToken,\n} from './refresh-token.js'\nimport type { TokenClaims } from './token-claims.js'\nimport { type TokenId, generateTokenId, isTokenId } from './token-id.js'\nimport type { CreateTokenData, TokenInfo, TokenStore } from './token-store.js'\n\nexport { AccessTokenMode, Signer }\nexport type { OAuthHooks, TokenStore }\n\nexport class TokenManager {\n  constructor(\n    protected readonly store: TokenStore,\n    protected readonly lexiconManager: LexiconManager,\n    protected readonly signer: Signer,\n    protected readonly hooks: OAuthHooks,\n    protected readonly accessTokenMode: AccessTokenMode,\n    protected readonly tokenMaxAge = TOKEN_MAX_AGE,\n  ) {}\n\n  protected createTokenExpiry(\n    client: Client,\n    now: Date,\n    sessionCreationDate: Date = now,\n  ): Date {\n    const lifetime = Math.min(\n      this.tokenMaxAge,\n      // Make sure the token does not stay valid beyond the session lifetime.\n      sessionCreationDate.getTime() + client.sessionLifetime - now.getTime(),\n    )\n\n    // We account for a small buffer to avoid the token being valid for a few\n    // milliseconds\n    if (lifetime <= 250) {\n      throw new InvalidGrantError(`Session expired`)\n    }\n\n    return new Date(now.getTime() + lifetime)\n  }\n\n  protected async createAccessToken(\n    tokenId: TokenId,\n    client: Client,\n    account: Account,\n    parameters: OAuthAuthorizationRequestParameters,\n    issuedAt: Date,\n    expiresAt: Date,\n    scope: OAuthScope,\n  ): Promise<OAuthAccessToken> {\n    const claims: TokenClaims = {\n      jti: tokenId,\n      sub: account.did,\n      iat: dateToEpoch(issuedAt),\n      exp: dateToEpoch(expiresAt),\n      aud: account.pds,\n\n      ...(parameters.dpop_jkt && {\n        cnf: { jkt: parameters.dpop_jkt },\n      }),\n\n      // Because tokens can end-up being quite big, we only include the scope in\n      // stateless mode.\n      ...(this.accessTokenMode === AccessTokenMode.stateless && {\n        scope,\n      }),\n\n      // https://datatracker.ietf.org/doc/html/rfc8693#section-4.3\n      client_id: client.id,\n    }\n\n    const claimsOverride = await this.hooks.onCreateToken?.call(null, {\n      client,\n      account,\n      parameters,\n      claims,\n    })\n\n    return this.signer.createAccessToken(claimsOverride ?? claims)\n  }\n\n  async createToken(\n    client: Client,\n    clientAuth: ClientAuth,\n    clientMetadata: RequestMetadata,\n    account: Account,\n    deviceId: null | DeviceId,\n    parameters: OAuthAuthorizationRequestParameters,\n    code: Code,\n  ): Promise<OAuthTokenResponse> {\n    await this.validateTokenParams(client, clientAuth, parameters)\n\n    const tokenId = await generateTokenId()\n    const refreshToken = client.metadata.grant_types.includes('refresh_token')\n      ? await generateRefreshToken()\n      : undefined\n\n    const now = new Date()\n    const expiresAt = this.createTokenExpiry(client, now)\n\n    const scope = await this.lexiconManager\n      .buildTokenScope(parameters.scope!)\n      .catch((err) => {\n        // Parse expected errors\n        if (err instanceof LexResolverError) {\n          throw new InvalidRequestError(err.message, err)\n        }\n\n        // Unexpected error\n        throw err\n      })\n\n    const accessToken = await this.createAccessToken(\n      tokenId,\n      client,\n      account,\n      parameters,\n      now,\n      expiresAt,\n      scope,\n    )\n\n    const response = this.buildTokenResponse(\n      inferTokenType(parameters),\n      accessToken,\n      refreshToken,\n      expiresAt,\n      account.did,\n      scope,\n    )\n\n    const tokenData: CreateTokenData = {\n      createdAt: now,\n      updatedAt: now,\n      expiresAt,\n      clientId: client.id,\n      clientAuth,\n      deviceId,\n      did: account.did,\n      parameters,\n      details: null,\n      scope,\n      code,\n    }\n\n    await this.store.createToken(tokenId, tokenData, refreshToken)\n\n    try {\n      await this.hooks.onTokenCreated?.call(null, {\n        client,\n        clientAuth,\n        clientMetadata,\n        account,\n        parameters,\n      })\n\n      return response\n    } catch (err) {\n      // If the hook fails, we delete the token to avoid leaving a dangling\n      // token in the store.\n      await this.deleteToken(tokenId)\n      throw err\n    }\n  }\n\n  protected async validateTokenParams(\n    client: Client,\n    clientAuth: ClientAuth,\n    parameters: OAuthAuthorizationRequestParameters,\n  ): Promise<void> {\n    if (client.metadata.dpop_bound_access_tokens && !parameters.dpop_jkt) {\n      throw new InvalidGrantError(\n        `DPoP JKT is required for DPoP bound access tokens`,\n      )\n    }\n  }\n\n  protected buildTokenResponse(\n    tokenType: OAuthTokenType,\n    accessToken: OAuthAccessToken,\n    refreshToken: string | undefined,\n    expiresAt: Date,\n    did: Did,\n    scope: string,\n  ): OAuthTokenResponse {\n    return {\n      access_token: accessToken,\n      token_type: tokenType,\n      refresh_token: refreshToken,\n      scope,\n\n      // @NOTE using a getter so that the value gets computed when the JSON\n      // response is generated, allowing to value to be as accurate as possible.\n      get expires_in() {\n        return dateToRelativeSeconds(expiresAt)\n      },\n\n      // ATPROTO extension: add the sub claim to the token response to allow\n      // clients to resolve the PDS url (audience) using the did resolution\n      // mechanism.\n      sub: did,\n    }\n  }\n\n  async rotateToken(\n    client: Client,\n    clientAuth: ClientAuth,\n    clientMetadata: RequestMetadata,\n    tokenInfo: TokenInfo,\n    now = new Date(),\n  ): Promise<OAuthTokenResponse> {\n    const { account, data } = tokenInfo\n    const { parameters } = data\n\n    await this.validateTokenParams(client, clientAuth, parameters)\n\n    const nextTokenId = await generateTokenId()\n    const nextRefreshToken = await generateRefreshToken()\n\n    const expiresAt = this.createTokenExpiry(\n      client,\n      now,\n      tokenInfo.data.createdAt,\n    )\n\n    // @NOTE since the permission sets are stored in a persistent store,\n    // it's fine to propagate a 500 (server_error) here as the values should\n    // be retrievable from the store.\n    const scope = await this.lexiconManager.buildTokenScope(parameters.scope!)\n\n    await this.store.rotateToken(tokenInfo.id, nextTokenId, nextRefreshToken, {\n      updatedAt: now,\n      expiresAt,\n      // @NOTE Normally, the clientAuth not change over time. There are two\n      // exceptions:\n      // - Upgrade from a legacy representation of client authentication to\n      //   a modern one.\n      // - Allow clients to become \"confidential\" if they were previously\n      //   \"public\"\n      clientAuth,\n      scope,\n    })\n\n    const accessToken = await this.createAccessToken(\n      nextTokenId,\n      client,\n      account,\n      parameters,\n      now,\n      expiresAt,\n      scope,\n    )\n\n    const response = this.buildTokenResponse(\n      inferTokenType(parameters),\n      accessToken,\n      nextRefreshToken,\n      expiresAt,\n      account.did,\n      scope,\n    )\n\n    await this.hooks.onTokenRefreshed?.call(null, {\n      client,\n      clientAuth,\n      clientMetadata,\n      account,\n      parameters,\n    })\n\n    return response\n  }\n\n  /**\n   * @note The token validity is not guaranteed. The caller must ensure that the\n   * token is valid before using the returned token info.\n   */\n  public async findToken(token: string): Promise<null | TokenInfo> {\n    if (isTokenId(token)) {\n      return this.getTokenInfo(token)\n    } else if (isCode(token)) {\n      return this.findByCode(token)\n    } else if (isRefreshToken(token)) {\n      return this.findByRefreshToken(token)\n    } else if (isSignedJwt(token)) {\n      return this.findByAccessToken(token)\n    } else {\n      throw new InvalidRequestError(`Invalid token`)\n    }\n  }\n\n  public async findByAccessToken(token: SignedJwt): Promise<null | TokenInfo> {\n    const { payload } = await this.signer.verifyAccessToken(token, {\n      clockTolerance: Infinity,\n    })\n\n    const tokenInfo = await this.getTokenInfo(payload.jti)\n    if (!tokenInfo) return null\n\n    // Fool-proof: Invalid store implementation ?\n    if (payload.sub !== tokenInfo.account.did) {\n      await this.deleteToken(tokenInfo.id)\n      throw new Error(\n        `Account sub (${tokenInfo.account.did}) does not match token sub (${payload.sub})`,\n      )\n    }\n\n    return tokenInfo\n  }\n\n  protected async findByRefreshToken(\n    token: RefreshToken,\n  ): Promise<null | TokenInfo> {\n    return this.store.findTokenByRefreshToken(token)\n  }\n\n  public async consumeRefreshToken(token: RefreshToken): Promise<TokenInfo> {\n    // @NOTE concurrent refreshes of the same refresh token could theoretically\n    // lead to two new tokens (access & refresh) being created. This is deemed\n    // acceptable for now (as the mechanism can only be used once since only one\n    // of the two refresh token created will be valid, and any future refresh\n    // attempts from outdated tokens will cause the entire session to be\n    // invalidated). Ideally, the store should be able to handle this case by\n    // atomically consuming the refresh token and returning the token info.\n\n    // @TODO Add another store method that atomically consumes the refresh token\n    // with a lock.\n    const tokenInfo = await this.findByRefreshToken(token).catch((err) => {\n      throw InvalidGrantError.from(err, `Invalid refresh token`)\n    })\n\n    if (!tokenInfo) {\n      throw new InvalidGrantError(`Invalid refresh token`)\n    }\n\n    if (tokenInfo.currentRefreshToken !== token) {\n      await this.deleteToken(tokenInfo.id)\n      throw new InvalidGrantError(`Refresh token replayed`)\n    }\n\n    return tokenInfo\n  }\n\n  public async findByCode(code: Code): Promise<null | TokenInfo> {\n    return this.store.findTokenByCode(code)\n  }\n\n  public async deleteToken(tokenId: TokenId): Promise<void> {\n    return this.store.deleteToken(tokenId)\n  }\n\n  async getTokenInfo(tokenId: TokenId): Promise<null | TokenInfo> {\n    return this.store.readToken(tokenId)\n  }\n\n  /**\n   * This method is called to when decoding a token that was encoded in\n   * {@link AccessTokenMode.light} mode, using data from the store to fill the\n   * data that was omitted in the token itself.\n   */\n  async loadTokenClaims(\n    tokenType: OAuthTokenType,\n    tokenPayload: AccessTokenPayload,\n  ): Promise<TokenClaims> {\n    const tokenId = tokenPayload.jti\n    const tokenInfo = await this.getTokenInfo(tokenId).catch((err) => {\n      throw InvalidTokenError.from(err, tokenType)\n    })\n\n    if (!tokenInfo) {\n      throw new InvalidTokenError(tokenType, `Invalid token`)\n    }\n\n    const { account, data } = tokenInfo\n\n    // Fool proof, make sure that the database & token payload are consistent.\n    // These should both be either undefined or a string so it's safe to compare\n    // the values directly.\n    if (tokenPayload.cnf?.jkt !== data.parameters.dpop_jkt) {\n      await this.deleteToken(tokenId)\n      throw new InvalidTokenError(tokenType, `Invalid token`)\n    }\n\n    if (isCurrentTokenExpired(tokenInfo)) {\n      await this.deleteToken(tokenId)\n      throw new InvalidTokenError(tokenType, `Token expired`)\n    }\n\n    return {\n      jti: tokenId,\n      sub: account.did,\n      iat: dateToEpoch(data.updatedAt),\n      exp: dateToEpoch(data.expiresAt),\n      aud: account.pds,\n      scope: data.scope ?? data.parameters.scope,\n      // https://datatracker.ietf.org/doc/html/rfc8693#section-4.3\n      client_id: data.clientId,\n    }\n  }\n\n  async listAccountTokens(did: Did): Promise<TokenInfo[]> {\n    const results = await this.store.listAccountTokens(did)\n    return results\n      .filter((tokenInfo) => tokenInfo.account.did === did) // Fool proof\n      .filter(\n        // The session are still active if they are within the session lifetime\n        // and refresh lifetime. We pre-filter here, based on the maximum\n        // possible lifetime of a session, to avoid loading the client metadata\n        // for sessions that are for sure expired. The client metadata is needed\n        // to determine the actual session and refresh lifetimes.\n        ({ data }) =>\n          Date.now() - data.createdAt.getTime() < SESSION_LIFETIME_EXTENDED &&\n          Date.now() - data.updatedAt.getTime() < REFRESH_LIFETIME_EXTENDED,\n      )\n  }\n}\n\nfunction isCurrentTokenExpired(tokenInfo: TokenInfo): boolean {\n  return tokenInfo.data.expiresAt.getTime() < Date.now()\n}\n\nfunction inferTokenType(\n  parameters: OAuthAuthorizationRequestParameters,\n): OAuthTokenType {\n  if (parameters.dpop_jkt) {\n    return 'DPoP'\n  }\n  return 'Bearer'\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/oauth-provider",
-  "version": "0.20.2",
+  "version": "0.21.0",
   "license": "MIT",
   "description": "Generic OAuth2 and OpenID Connect provider for Node.js. Currently only supports features needed for Atproto.",
   "keywords": [
@@ -72,20 +72,20 @@
     "ioredis": "^5.3.2",
     "jose": "^5.2.0",
     "zod": "^3.23.8",
-    "@atproto-labs/fetch-node": "^0.3.5",
-    "@atproto-labs/simple-store": "^0.4.4",
-    "@atproto-labs/simple-store-memory": "^0.2.4",
-    "@atproto/did": "^0.5.4",
+    "@atproto-labs/fetch-node": "^0.3.6",
     "@atproto-labs/pipe": "^0.2.4",
-    "@atproto/jwk": "^0.7.4",
-    "@atproto/jwk-jose": "^0.2.4",
+    "@atproto-labs/simple-store": "^0.5.0",
+    "@atproto-labs/simple-store-memory": "^0.2.5",
+    "@atproto/did": "^0.5.4",
     "@atproto/common": "^0.7.2",
-    "@atproto/lex-resolver": "^0.2.2",
+    "@atproto/jwk": "^0.7.4",
     "@atproto/lex-document": "^0.1.6",
+    "@atproto/lex-resolver": "^0.2.3",
+    "@atproto/jwk-jose": "^0.2.4",
+    "@atproto/oauth-provider-ui": "0.8.8",
     "@atproto/oauth-types": "^0.7.5",
-    "@atproto/oauth-provider-api": "0.7.6",
-    "@atproto/oauth-scopes": "^0.5.6",
-    "@atproto/oauth-provider-ui": "0.8.7",
+    "@atproto/oauth-provider-api": "0.7.7",
+    "@atproto/oauth-scopes": "^0.5.7",
     "@atproto/syntax": "^0.7.2"
   },
   "devDependencies": {
@@ -93,9 +93,11 @@
     "@types/forwarded": "0.1.3",
     "@types/http-errors": "^2.0.4",
     "@types/send": "^0.17.4",
+    "vitest": "^4.0.16",
     "@atproto-labs/rollup-plugin-bundle-manifest": "^0.3.3"
   },
   "scripts": {
-    "build": "tsgo --build tsconfig.build.json"
+    "build": "tsgo --build tsconfig.build.json",
+    "test": "vitest run"
   }
 }