X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fjob-queue%2Fhandlers%2Futils%2Factivitypub-http-utils.ts;h=d3bde6e6a25f2d57897d02e1dcc4ce6b7f79faba;hb=001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd;hp=4961d4502e2a5b43ceb2ed7f6c6c2f49854ebf2e;hpb=df66d81583e07ce049daeeef1edc6a87b57b3684;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/job-queue/handlers/utils/activitypub-http-utils.ts b/server/lib/job-queue/handlers/utils/activitypub-http-utils.ts index 4961d4502..d3bde6e6a 100644 --- a/server/lib/job-queue/handlers/utils/activitypub-http-utils.ts +++ b/server/lib/job-queue/handlers/utils/activitypub-http-utils.ts @@ -2,7 +2,8 @@ import { buildSignedActivity } from '../../../../helpers/activitypub' import { getServerActor } from '../../../../helpers/utils' import { ActorModel } from '../../../../models/activitypub/actor' import { sha256 } from '../../../../helpers/core-utils' -import { HTTP_SIGNATURE } from '../../../../initializers' +import { HTTP_SIGNATURE } from '../../../../initializers/constants' +import { MActor } from '../../../../typings/models' type Payload = { body: any, signatureActorId?: number } @@ -19,7 +20,8 @@ async function computeBody (payload: Payload) { } async function buildSignedRequestOptions (payload: Payload) { - let actor: ActorModel | null + let actor: MActor | null + if (payload.signatureActorId) { actor = await ActorModel.load(payload.signatureActorId) if (!actor) throw new Error('Unknown signature actor id.') @@ -28,7 +30,7 @@ async function buildSignedRequestOptions (payload: Payload) { actor = await getServerActor() } - const keyId = actor.getWebfingerUrl() + const keyId = actor.url return { algorithm: HTTP_SIGNATURE.ALGORITHM, authorizationHeaderName: HTTP_SIGNATURE.HEADER_NAME,