From 3f5478d94bb4ab3df6ab159829e33e0f8c2678fb Mon Sep 17 00:00:00 2001 From: Moon Man Date: Wed, 27 Dec 2023 09:42:48 -0500 Subject: [PATCH] fix busted types --- module.d.ts | 7 ++++++- src/activity.ts | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/module.d.ts b/module.d.ts index adb9a07..3fa44c1 100644 --- a/module.d.ts +++ b/module.d.ts @@ -11,7 +11,12 @@ declare module "activitypub-http-signatures" { sign: (options: { url: string, method: string, headers: any[] }) => string; }; - export const parse: (params: { url: string, method: string, headers: Record }) => { + type parse = (params: { url: string, method: string, headers: Record }) => { verify: (publicKey: string) => boolean; }; + + export default { + Sha256Signer, + parse + }; } diff --git a/src/activity.ts b/src/activity.ts index 64479f7..2308773 100644 --- a/src/activity.ts +++ b/src/activity.ts @@ -5,7 +5,7 @@ import { fillRoute } from "./router.js"; import { streamToString, hashDigest } from "./util.js"; import { signedFetch, SignedInit, getActor} from "./net.js"; import { getById as getUserById, getKeyId } from "./user.js"; -import { parse as parseSignedRequest } from "activitypub-http-signatures"; +import parser from "activitypub-http-signatures"; import type { Request, Response } from "express"; import { addFollower } from "./follower.js"; @@ -59,7 +59,7 @@ export const handleInboxPost = async (req: Request, res: Response) => { } // OK validate request signature - const signature = parseSignedRequest({ + const signature = parser.parse({ url: req.originalUrl, method: "POST", headers: req.headers as Record