@fedify/fedify 2.0.1 → 2.0.2-dev.415

package/dist/http-DkHdFfrc.d.ts

@@ -0,0 +1,246 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";
+import { CryptographicKey, Multikey } from "@fedify/vocab";
+import { TracerProvider } from "@opentelemetry/api";
+import { DocumentLoader } from "@fedify/vocab-runtime";
+
+//#region src/sig/key.d.ts
+
+/**
+* Generates a key pair which is appropriate for Fedify.
+* @param algorithm The algorithm to use.  Currently only RSASSA-PKCS1-v1_5 and
+*                  Ed25519 are supported.
+* @returns The generated key pair.
+* @throws {TypeError} If the algorithm is unsupported.
+*/
+declare function generateCryptoKeyPair(algorithm?: "RSASSA-PKCS1-v1_5" | "Ed25519"): Promise<CryptoKeyPair>;
+/**
+* Exports a key in JWK format.
+* @param key The key to export.  Either public or private key.
+* @returns The exported key in JWK format.  The key is suitable for
+*          serialization and storage.
+* @throws {TypeError} If the key is invalid or unsupported.
+*/
+declare function exportJwk(key: CryptoKey): Promise<JsonWebKey>;
+/**
+* Imports a key from JWK format.
+* @param jwk The key in JWK format.
+* @param type Which type of key to import, either `"public"` or `"private"`.
+* @returns The imported key.
+* @throws {TypeError} If the key is invalid or unsupported.
+*/
+declare function importJwk(jwk: JsonWebKey, type: "public" | "private"): Promise<CryptoKey>;
+/**
+* Options for {@link fetchKey}.
+* @since 1.3.0
+*/
+interface FetchKeyOptions {
+  /**
+  * The document loader for loading remote JSON-LD documents.
+  */
+  documentLoader?: DocumentLoader;
+  /**
+  * The context loader for loading remote JSON-LD contexts.
+  */
+  contextLoader?: DocumentLoader;
+  /**
+  * The key cache to use for caching public keys.
+  * @since 0.12.0
+  */
+  keyCache?: KeyCache;
+  /**
+  * The OpenTelemetry tracer provider to use for tracing.  If omitted,
+  * the global tracer provider is used.
+  * @since 1.3.0
+  */
+  tracerProvider?: TracerProvider;
+}
+/**
+* The result of {@link fetchKey}.
+* @since 1.3.0
+*/
+interface FetchKeyResult<T extends CryptographicKey | Multikey> {
+  /**
+  * The fetched (or cached) key.
+  */
+  readonly key: T & {
+    publicKey: CryptoKey;
+  } | null;
+  /**
+  * Whether the key is fetched from the cache.
+  */
+  readonly cached: boolean;
+}
+/**
+* Fetches a {@link CryptographicKey} or {@link Multikey} from the given URL.
+* If the given URL contains an {@link Actor} object, it tries to find
+* the corresponding key in the `publicKey` or `assertionMethod` property.
+* @template T The type of the key to fetch.  Either {@link CryptographicKey}
+*              or {@link Multikey}.
+* @param keyId The URL of the key.
+* @param cls The class of the key to fetch.  Either {@link CryptographicKey}
+*            or {@link Multikey}.
+* @param options Options for fetching the key.  See {@link FetchKeyOptions}.
+* @returns The fetched key or `null` if the key is not found.
+* @since 1.3.0
+*/
+declare function fetchKey<T extends CryptographicKey | Multikey>(keyId: URL | string, cls: (new (...args: any[]) => T) & {
+  fromJsonLd(jsonLd: unknown, options: {
+    documentLoader?: DocumentLoader;
+    contextLoader?: DocumentLoader;
+    tracerProvider?: TracerProvider;
+  }): Promise<T>;
+}, options?: FetchKeyOptions): Promise<FetchKeyResult<T>>;
+/**
+* A cache for storing cryptographic keys.
+* @since 0.12.0
+*/
+interface KeyCache {
+  /**
+  * Gets a key from the cache.
+  * @param keyId The key ID.
+  * @returns The key if found, `null` if the key is not available (e.g.,
+  *          fetching the key was tried but failed), or `undefined`
+  *          if the cache is not available.
+  */
+  get(keyId: URL): Promise<CryptographicKey | Multikey | null | undefined>;
+  /**
+  * Sets a key to the cache.
+  *
+  * Note that this caches unavailable keys (i.e., `null`) as well,
+  * and it is recommended to make unavailable keys expire after a short period.
+  * @param keyId The key ID.
+  * @param key The key to cache.  `null` means the key is not available
+  *            (e.g., fetching the key was tried but failed).
+  */
+  set(keyId: URL, key: CryptographicKey | Multikey | null): Promise<void>;
+}
+//#endregion
+//#region src/sig/http.d.ts
+/**
+* The standard to use for signing and verifying HTTP signatures.
+* @since 1.6.0
+*/
+type HttpMessageSignaturesSpec = "draft-cavage-http-signatures-12" | "rfc9421";
+/**
+* Options for {@link signRequest}.
+* @since 1.3.0
+*/
+interface SignRequestOptions {
+  /**
+  * The HTTP message signatures specification to use for signing.
+  * @default `"draft-cavage-http-signatures-12"`
+  * @since 1.6.0
+  */
+  spec?: HttpMessageSignaturesSpec;
+  /**
+  * The current time.  If not specified, the current time is used.  This is
+  * useful for testing.
+  * @since 1.6.0
+  */
+  currentTime?: Temporal.Instant;
+  /**
+  * The request body as ArrayBuffer. If provided, avoids cloning the request body.
+  * @since 1.7.7
+  */
+  body?: ArrayBuffer | null;
+  /**
+  * The OpenTelemetry tracer provider.  If omitted, the global tracer provider
+  * is used.
+  */
+  tracerProvider?: TracerProvider;
+}
+/**
+* Signs a request using the given private key.
+* @param request The request to sign.
+* @param privateKey The private key to use for signing.
+* @param keyId The key ID to use for the signature.  It will be used by the
+*              verifier.
+* @returns The signed request.
+* @throws {TypeError} If the private key is invalid or unsupported.
+*/
+declare function signRequest(request: Request, privateKey: CryptoKey, keyId: URL, options?: SignRequestOptions): Promise<Request>;
+/**
+* Options for {@link verifyRequest}.
+*/
+interface VerifyRequestOptions {
+  /**
+  * The document loader to use for fetching the public key.
+  */
+  documentLoader?: DocumentLoader;
+  /**
+  * The context loader to use for JSON-LD context retrieval.
+  */
+  contextLoader?: DocumentLoader;
+  /**
+  * The time window to allow for the request date.  The actual time window is
+  * twice the value of this option, with the current time as the center.
+  * Or if it is `false`, no time check is performed.
+  *
+  * An hour by default.
+  */
+  timeWindow?: Temporal.Duration | Temporal.DurationLike | false;
+  /**
+  * The current time.  If not specified, the current time is used.  This is
+  * useful for testing.
+  */
+  currentTime?: Temporal.Instant;
+  /**
+  * The key cache to use for caching public keys.
+  * @since 0.12.0
+  */
+  keyCache?: KeyCache;
+  /**
+  * The HTTP message signatures specification to use for verifying.
+  * @default `"draft-cavage-http-signatures-12"`
+  * @since 1.6.0
+  */
+  spec?: HttpMessageSignaturesSpec;
+  /**
+  * The OpenTelemetry tracer provider.  If omitted, the global tracer provider
+  * is used.
+  * @since 1.3.0
+  */
+  tracerProvider?: TracerProvider;
+}
+/**
+* Verifies the signature of a request.
+*
+* Note that this function consumes the request body, so it should not be used
+* if the request body is already consumed.  Consuming the request body after
+* calling this function is okay, since this function clones the request
+* under the hood.
+*
+* @param request The request to verify.
+* @param options Options for verifying the request.
+* @returns The public key of the verified signature, or `null` if the signature
+*          could not be verified.
+*/
+declare function verifyRequest(request: Request, options?: VerifyRequestOptions): Promise<CryptographicKey | null>;
+/**
+* A spec determiner for HTTP Message Signatures.
+* It determines the spec to use for signing requests.
+* It is used for double-knocking
+* (see <https://swicg.github.io/activitypub-http-signature/#how-to-upgrade-supported-versions>).
+* @since 1.6.0
+*/
+interface HttpMessageSignaturesSpecDeterminer {
+  /**
+  * Determines the spec to use for signing requests.
+  * @param origin The origin of the URL to make the request to.
+  * @returns The spec to use for signing requests.
+  */
+  determineSpec(origin: string): HttpMessageSignaturesSpec | Promise<HttpMessageSignaturesSpec>;
+  /**
+  * Remembers the successfully used spec for the given origin.
+  * @param origin The origin of the URL that was requested.
+  * @param spec The spec to remember.
+  */
+  rememberSpec(origin: string, spec: HttpMessageSignaturesSpec): void | Promise<void>;
+}
+/**
+* The options for double-knock requests.
+* @since 1.6.0
+*/
+//#endregion
+export { FetchKeyOptions, FetchKeyResult, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignRequestOptions, VerifyRequestOptions, exportJwk, fetchKey, generateCryptoKeyPair, importJwk, signRequest, verifyRequest };

package/dist/{http-Dvox_xrq.js → http-DnP0rGKj.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-CIi8RNND.js";
-import { fetchKey, validateCryptoKey } from "./key-C7JS89OH.js";
+import { deno_default } from "./deno-D-Duks4b.js";
+import { fetchKey, validateCryptoKey } from "./key-DChkqRrm.js";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{inbox-CiTdVhJQ.js → inbox-CbNZlhe6.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-CIi8RNND.js";
+import { deno_default } from "./deno-D-Duks4b.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";

package/dist/{key-C7JS89OH.js → key-DChkqRrm.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-CIi8RNND.js";
+import { deno_default } from "./deno-D-Duks4b.js";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/kv-BL4nlICN.d.cts

@@ -0,0 +1,110 @@
+//#region src/federation/kv.d.ts
+/**
+* A key for a key–value store.  An array of one or more strings.
+*
+* @since 0.5.0
+*/
+type KvKey = readonly [string] | readonly [string, ...string[]];
+/**
+* Additional options for setting a value in a key–value store.
+*
+* @since 0.5.0
+*/
+interface KvStoreSetOptions {
+  /**
+  * The time-to-live (TTL) for the value.
+  */
+  ttl?: Temporal.Duration;
+}
+/**
+* An entry returned by the {@link KvStore.list} method.
+*
+* @since 1.10.0
+*/
+interface KvStoreListEntry {
+  /**
+  * The key of the entry.
+  */
+  readonly key: KvKey;
+  /**
+  * The value of the entry.
+  */
+  readonly value: unknown;
+}
+/**
+* An abstract interface for a key–value store.
+*
+* @since 0.5.0
+*/
+interface KvStore {
+  /**
+  * Gets the value for the given key.
+  * @param key The key to get the value for.
+  * @returns The value for the key, or `undefined` if the key does not exist.
+  * @template T The type of the value to get.
+  */
+  get<T = unknown>(key: KvKey): Promise<T | undefined>;
+  /**
+  * Sets the value for the given key.
+  * @param key The key to set the value for.
+  * @param value The value to set.
+  * @param options Additional options for setting the value.
+  */
+  set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;
+  /**
+  * Deletes the value for the given key.
+  * @param key The key to delete.
+  */
+  delete(key: KvKey): Promise<void>;
+  /**
+  * Compare-and-swap (CAS) operation for the key–value store.
+  * @param key The key to perform the CAS operation on.
+  * @param expectedValue The expected value for the key.
+  * @param newValue The new value to set if the expected value matches.
+  * @param options Additional options for setting the value.
+  * @return `true` if the CAS operation was successful, `false` otherwise.
+  * @since 1.8.0
+  */
+  cas?: (key: KvKey, expectedValue: unknown, newValue: unknown, options?: KvStoreSetOptions) => Promise<boolean>;
+  /**
+  * Lists all entries in the store that match the given prefix.
+  * If no prefix is given, all entries are returned.
+  * @param prefix The prefix to filter keys by.  If not specified, all entries
+  *               are returned.
+  * @returns An async iterable of entries matching the prefix.
+  * @since 1.10.0
+  * @since 2.0.0 This method is now required instead of optional.
+  */
+  list(prefix?: KvKey): AsyncIterable<KvStoreListEntry>;
+}
+/**
+* A key–value store that stores values in memory.
+* Do not use this in production as it does not persist values.
+*
+* @since 0.5.0
+*/
+declare class MemoryKvStore implements KvStore {
+  #private;
+  /**
+  * {@inheritDoc KvStore.get}
+  */
+  get<T = unknown>(key: KvKey): Promise<T | undefined>;
+  /**
+  * {@inheritDoc KvStore.set}
+  */
+  set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;
+  /**
+  * {@inheritDoc KvStore.delete}
+  */
+  delete(key: KvKey): Promise<void>;
+  /**
+  * {@inheritDoc KvStore.cas}
+  */
+  cas(key: KvKey, expectedValue: unknown, newValue: unknown, options?: KvStoreSetOptions): Promise<boolean>;
+  /**
+  * {@inheritDoc KvStore.list}
+  */
+  list(prefix?: KvKey): AsyncIterable<KvStoreListEntry>;
+}
+//#endregion
+export { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore };

package/dist/kv-DXEUEP6z.d.ts

@@ -0,0 +1,113 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";
+
+//#region src/federation/kv.d.ts
+/**
+* A key for a key–value store.  An array of one or more strings.
+*
+* @since 0.5.0
+*/
+type KvKey = readonly [string] | readonly [string, ...string[]];
+/**
+* Additional options for setting a value in a key–value store.
+*
+* @since 0.5.0
+*/
+interface KvStoreSetOptions {
+  /**
+  * The time-to-live (TTL) for the value.
+  */
+  ttl?: Temporal.Duration;
+}
+/**
+* An entry returned by the {@link KvStore.list} method.
+*
+* @since 1.10.0
+*/
+interface KvStoreListEntry {
+  /**
+  * The key of the entry.
+  */
+  readonly key: KvKey;
+  /**
+  * The value of the entry.
+  */
+  readonly value: unknown;
+}
+/**
+* An abstract interface for a key–value store.
+*
+* @since 0.5.0
+*/
+interface KvStore {
+  /**
+  * Gets the value for the given key.
+  * @param key The key to get the value for.
+  * @returns The value for the key, or `undefined` if the key does not exist.
+  * @template T The type of the value to get.
+  */
+  get<T = unknown>(key: KvKey): Promise<T | undefined>;
+  /**
+  * Sets the value for the given key.
+  * @param key The key to set the value for.
+  * @param value The value to set.
+  * @param options Additional options for setting the value.
+  */
+  set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;
+  /**
+  * Deletes the value for the given key.
+  * @param key The key to delete.
+  */
+  delete(key: KvKey): Promise<void>;
+  /**
+  * Compare-and-swap (CAS) operation for the key–value store.
+  * @param key The key to perform the CAS operation on.
+  * @param expectedValue The expected value for the key.
+  * @param newValue The new value to set if the expected value matches.
+  * @param options Additional options for setting the value.
+  * @return `true` if the CAS operation was successful, `false` otherwise.
+  * @since 1.8.0
+  */
+  cas?: (key: KvKey, expectedValue: unknown, newValue: unknown, options?: KvStoreSetOptions) => Promise<boolean>;
+  /**
+  * Lists all entries in the store that match the given prefix.
+  * If no prefix is given, all entries are returned.
+  * @param prefix The prefix to filter keys by.  If not specified, all entries
+  *               are returned.
+  * @returns An async iterable of entries matching the prefix.
+  * @since 1.10.0
+  * @since 2.0.0 This method is now required instead of optional.
+  */
+  list(prefix?: KvKey): AsyncIterable<KvStoreListEntry>;
+}
+/**
+* A key–value store that stores values in memory.
+* Do not use this in production as it does not persist values.
+*
+* @since 0.5.0
+*/
+declare class MemoryKvStore implements KvStore {
+  #private;
+  /**
+  * {@inheritDoc KvStore.get}
+  */
+  get<T = unknown>(key: KvKey): Promise<T | undefined>;
+  /**
+  * {@inheritDoc KvStore.set}
+  */
+  set(key: KvKey, value: unknown, options?: KvStoreSetOptions): Promise<void>;
+  /**
+  * {@inheritDoc KvStore.delete}
+  */
+  delete(key: KvKey): Promise<void>;
+  /**
+  * {@inheritDoc KvStore.cas}
+  */
+  cas(key: KvKey, expectedValue: unknown, newValue: unknown, options?: KvStoreSetOptions): Promise<boolean>;
+  /**
+  * {@inheritDoc KvStore.list}
+  */
+  list(prefix?: KvKey): AsyncIterable<KvStoreListEntry>;
+}
+//#endregion
+export { KvKey, KvStore, KvStoreListEntry, KvStoreSetOptions, MemoryKvStore };

package/dist/{kv-cache-BqFnozz0.cjs → kv-cache-Bd2z9in6.cjs}

@@ -3,7 +3,7 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-CGaQZ11T.cjs');
-const require_http = require('./http-BjroyS-9.cjs');
+const require_http = require('./http-DGYGS8C8.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const es_toolkit = require_chunk.__toESM(require("es-toolkit"));
 const __fedify_vocab_runtime = require_chunk.__toESM(require("@fedify/vocab-runtime"));

package/dist/{kv-cache-6b2ldIo-.js → kv-cache-CFQBoGCe.js}

@@ -2,7 +2,7 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { doubleKnock, validateCryptoKey } from "./http-CCsNu78I.js";
+import { doubleKnock, validateCryptoKey } from "./http-C3ipH_7H.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{ld-C8i1kViF.js → ld-CR9Xg8mN.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-CIi8RNND.js";
-import { fetchKey, validateCryptoKey } from "./key-C7JS89OH.js";
+import { deno_default } from "./deno-D-Duks4b.js";
+import { fetchKey, validateCryptoKey } from "./key-DChkqRrm.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{middleware-DqJ1cmZE.cjs → middleware-B1XHFs0D.cjs}

@@ -4,10 +4,10 @@
         
 const require_chunk = require('./chunk-CGaQZ11T.cjs');
 const require_transformers = require('./transformers-3g8GZwkZ.cjs');
-const require_http = require('./http-BjroyS-9.cjs');
-const require_proof = require('./proof-C8qvlfLD.cjs');
+const require_http = require('./http-DGYGS8C8.cjs');
+const require_proof = require('./proof-DnzISmKI.cjs');
 const require_types = require('./types-Cd_hszr_.cjs');
-const require_kv_cache = require('./kv-cache-BqFnozz0.cjs');
+const require_kv_cache = require('./kv-cache-Bd2z9in6.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __fedify_vocab = require_chunk.__toESM(require("@fedify/vocab"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
@@ -339,7 +339,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-DILzU8Ot.cjs"));
+		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-Bt5MUXQg.cjs"));
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -994,25 +994,7 @@ async function handleActor(request, { identifier, context: context$2, actorDispa
 		return await onNotFound(request);
 	}
 	if (authorizePredicate != null) {
-		let key = await context$2.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"actor"
-			],
-			message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$2.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"actor"
-			],
-			message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await authorizePredicate(context$2, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context$2, identifier)) return await onUnauthorized(request);
 	}
 	const jsonLd = await actor.toJsonLd(context$2);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -1032,25 +1014,7 @@ async function handleObject(request, { values, context: context$2, objectDispatc
 	const object = await objectDispatcher(context$2, values);
 	if (object == null) return await onNotFound(request);
 	if (authorizePredicate != null) {
-		let key = await context$2.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"object"
-			],
-			message: "The third parameter of ObjectAuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$2.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"object"
-			],
-			message: "The fourth parameter of ObjectAuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await authorizePredicate(context$2, values, key, keyOwner)) return await onUnauthorized(request);
+		if (!await authorizePredicate(context$2, values)) return await onUnauthorized(request);
 	}
 	const jsonLd = await object.toJsonLd(context$2);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -1182,25 +1146,7 @@ async function handleCollection(request, { name, identifier, uriGetter, filter,
 		});
 	}
 	if (collectionCallbacks.authorizePredicate != null) {
-		let key = await context$2.getSignedKey();
-		key = key?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"collection"
-			],
-			message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-		} }) ?? null;
-		let keyOwner = await context$2.getSignedKeyOwner();
-		keyOwner = keyOwner?.clone({}, { $warning: {
-			category: [
-				"fedify",
-				"federation",
-				"collection"
-			],
-			message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-		} }) ?? null;
-		if (!await collectionCallbacks.authorizePredicate(context$2, identifier, key, keyOwner)) return await onUnauthorized(request);
+		if (!await collectionCallbacks.authorizePredicate(context$2, identifier)) return await onUnauthorized(request);
 	}
 	const jsonLd = await collection.toJsonLd(context$2);
 	return new Response(JSON.stringify(jsonLd), { headers: {
@@ -1851,28 +1797,7 @@ const verifyDefined = (callbacks) => {
 */
 const authIfNeeded = async (context$2, values, { authorizePredicate: authorize = void 0 }) => {
 	if (authorize === void 0) return;
-	const key = (await context$2.getSignedKey())?.clone({}, warning.key) ?? null;
-	const keyOwner = (await context$2.getSignedKeyOwner())?.clone({}, warning.keyOwner) ?? null;
-	if (!await authorize(context$2, values, key, keyOwner)) throw new UnauthorizedError();
-};
-/** Warning messages for `authIfNeeded`. */
-const warning = {
-	key: { $warning: {
-		category: [
-			"fedify",
-			"federation",
-			"collection"
-		],
-		message: "The third parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKey() method.  The third parameter will be removed in a future release."
-	} },
-	keyOwner: { $warning: {
-		category: [
-			"fedify",
-			"federation",
-			"collection"
-		],
-		message: "The fourth parameter of AuthorizePredicate is deprecated in favor of RequestContext.getSignedKeyOwner() method.  The fourth parameter will be removed in a future release."
-	} }
+	if (!await authorize(context$2, values)) throw new UnauthorizedError();
 };
 /**
 * Appends a cursor parameter to a URL if the cursor exists.