From 5ad7f1d5d7c3c1b1319fbb3b67139d8a977c7312 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 21 Feb 2025 13:27:19 -0600 Subject: [PATCH] userMiddleware -> tokenMiddleware --- packages/mastoapi/middleware/mod.ts | 2 +- .../{userMiddleware.ts => tokenMiddleware.ts} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename packages/mastoapi/middleware/{userMiddleware.ts => tokenMiddleware.ts} (86%) diff --git a/packages/mastoapi/middleware/mod.ts b/packages/mastoapi/middleware/mod.ts index 7cdd6748..e4c346e1 100644 --- a/packages/mastoapi/middleware/mod.ts +++ b/packages/mastoapi/middleware/mod.ts @@ -1,2 +1,2 @@ export { paginationMiddleware } from './paginationMiddleware.ts'; -export { userMiddleware } from './userMiddleware.ts'; +export { tokenMiddleware } from './tokenMiddleware.ts'; diff --git a/packages/mastoapi/middleware/userMiddleware.ts b/packages/mastoapi/middleware/tokenMiddleware.ts similarity index 86% rename from packages/mastoapi/middleware/userMiddleware.ts rename to packages/mastoapi/middleware/tokenMiddleware.ts index 71a375eb..9b666ed1 100644 --- a/packages/mastoapi/middleware/userMiddleware.ts +++ b/packages/mastoapi/middleware/tokenMiddleware.ts @@ -20,12 +20,12 @@ interface User { /** We only accept "Bearer" type. */ const BEARER_REGEX = new RegExp(`^Bearer (${nip19.BECH32_REGEX.source})$`); -export function userMiddleware(opts: { privileged: true; required: false }): never; +export function tokenMiddleware(opts: { privileged: true; required: false }): never; // @ts-ignore The types are right. -export function userMiddleware(opts: { privileged: false; required: true }): DittoMiddleware<{ user: User }>; -export function userMiddleware(opts: { privileged: true; required?: boolean }): DittoMiddleware<{ user: User }>; -export function userMiddleware(opts: { privileged: false; required?: boolean }): DittoMiddleware<{ user?: User }>; -export function userMiddleware(opts: { privileged: boolean; required?: boolean }): DittoMiddleware<{ user?: User }> { +export function tokenMiddleware(opts: { privileged: false; required: true }): DittoMiddleware<{ user: User }>; +export function tokenMiddleware(opts: { privileged: true; required?: boolean }): DittoMiddleware<{ user: User }>; +export function tokenMiddleware(opts: { privileged: false; required?: boolean }): DittoMiddleware<{ user?: User }>; +export function tokenMiddleware(opts: { privileged: boolean; required?: boolean }): DittoMiddleware<{ user?: User }> { const { privileged, required = privileged } = opts; if (privileged && !required) {