From 53a2440e3cbc2e8e7c8224d2b78c4f6fbd3f43a6 Mon Sep 17 00:00:00 2001 From: Armin Date: Mon, 25 Mar 2019 13:15:37 +0100 Subject: [PATCH] Add needed env var PRIVATE_KEY_PASSPHRASE + fix WebFinger test --- backend/src/activitypub/ActivityPub.js | 2 +- backend/src/activitypub/utils/index.js | 1 - backend/src/server.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/activitypub/ActivityPub.js b/backend/src/activitypub/ActivityPub.js index b89bc16da..1f0c0e4c8 100644 --- a/backend/src/activitypub/ActivityPub.js +++ b/backend/src/activitypub/ActivityPub.js @@ -22,6 +22,7 @@ let activityPub = null export { activityPub } export default class ActivityPub { + constructor (activityPubEndpointUri, internalGraphQlUri) { this.endpoint = activityPubEndpointUri this.dataSource = new NitroDataSource(internalGraphQlUri) @@ -56,7 +57,6 @@ export default class ActivityPub { } }, async (err, response, toActorObject) => { if (err) return reject(err) - debug(`name = ${toActorName}@${this.host}`) // save shared inbox toActorObject = JSON.parse(toActorObject) await this.dataSource.addSharedInboxEndpoint(toActorObject.endpoints.sharedInbox) diff --git a/backend/src/activitypub/utils/index.js b/backend/src/activitypub/utils/index.js index e6853cecb..a83dcc829 100644 --- a/backend/src/activitypub/utils/index.js +++ b/backend/src/activitypub/utils/index.js @@ -19,7 +19,6 @@ export function extractIdFromActivityId (uri) { return splitted[splitted.indexOf('status') + 1] } - export function constructIdFromName (name, fromDomain = activityPub.endpoint) { return `${fromDomain}/activitypub/users/${name}` } diff --git a/backend/src/server.js b/backend/src/server.js index c546c74c3..efa9a17c0 100644 --- a/backend/src/server.js +++ b/backend/src/server.js @@ -13,7 +13,7 @@ import decode from './jwt/decode' dotenv.config() // check env and warn -const requiredEnvVars = ['MAPBOX_TOKEN', 'JWT_SECRET'] +const requiredEnvVars = ['MAPBOX_TOKEN', 'JWT_SECRET', 'PRIVATE_KEY_PASSPHRASE'] requiredEnvVars.forEach(env => { if (!process.env[env]) { throw new Error(`ERROR: "${env}" env variable is missing.`)