From 53a2440e3cbc2e8e7c8224d2b78c4f6fbd3f43a6 Mon Sep 17 00:00:00 2001 From: Armin Date: Mon, 25 Mar 2019 13:15:37 +0100 Subject: [PATCH 1/6] 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.`) From 5ec77f3cc1e00f0c32dc8a8409fb3ad7e41925c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 27 Mar 2019 00:55:09 +0100 Subject: [PATCH 2/6] Put PRIVATE_KEY_PASSPHRASE in kubernetes config --- deployment/human-connection/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployment/human-connection/configmap.yaml b/deployment/human-connection/configmap.yaml index 592bae1c0..5e4d6ba89 100644 --- a/deployment/human-connection/configmap.yaml +++ b/deployment/human-connection/configmap.yaml @@ -10,6 +10,7 @@ NEO4J_AUTH: "none" CLIENT_URI: "https://nitro-staging.human-connection.org" MAPBOX_TOKEN: "pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ" + PRIVATE_KEY_PASSPHRASE: "a7dsf78sadg87ad87sfagsadg78" metadata: name: configmap namespace: human-connection From 82bb4c4d7d70e77db5cb9a33ce8803145c7e8c93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 27 Mar 2019 11:26:07 +0100 Subject: [PATCH 3/6] Fix lint --- backend/src/activitypub/ActivityPub.js | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/activitypub/ActivityPub.js b/backend/src/activitypub/ActivityPub.js index 1f0c0e4c8..3ce27e109 100644 --- a/backend/src/activitypub/ActivityPub.js +++ b/backend/src/activitypub/ActivityPub.js @@ -22,7 +22,6 @@ let activityPub = null export { activityPub } export default class ActivityPub { - constructor (activityPubEndpointUri, internalGraphQlUri) { this.endpoint = activityPubEndpointUri this.dataSource = new NitroDataSource(internalGraphQlUri) From 1daaf28a5e7b99e25fd0703feb4e9514ec2771eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 27 Mar 2019 11:51:22 +0100 Subject: [PATCH 4/6] Remove --verbose on Travis CI --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c6690bb5f..309beb07d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ install: script: - docker-compose exec backend yarn run lint - - docker-compose exec backend yarn run test --ci + - docker-compose exec backend yarn run test --ci --verbose=false - docker-compose exec backend yarn run db:reset - docker-compose exec backend yarn run db:seed - docker-compose exec backend yarn run test:cucumber @@ -28,7 +28,7 @@ script: - docker-compose exec backend yarn run db:reset - docker-compose exec backend yarn run db:seed - docker-compose exec webapp yarn run lint - - docker-compose exec webapp yarn run test --ci + - docker-compose exec webapp yarn run test --ci --verbose=false - docker-compose exec -d backend yarn run test:cypress - yarn run cypress:run --record --key $CYPRESS_TOKEN From 82843857b3d9844e53eb21eaae0589b94b536065 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 27 Mar 2019 11:53:55 +0000 Subject: [PATCH 5/6] Bump graphql from 14.1.1 to 14.2.0 in /backend Bumps [graphql](https://github.com/graphql/graphql-js) from 14.1.1 to 14.2.0. - [Release notes](https://github.com/graphql/graphql-js/releases) - [Commits](https://github.com/graphql/graphql-js/compare/v14.1.1...v14.2.0) Signed-off-by: dependabot[bot] --- backend/package.json | 2 +- backend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index 46c228485..83417635d 100644 --- a/backend/package.json +++ b/backend/package.json @@ -51,7 +51,7 @@ "dotenv": "~7.0.0", "express": "~4.16.4", "faker": "~4.1.0", - "graphql": "~14.1.1", + "graphql": "~14.2.0", "graphql-custom-directives": "~0.2.14", "graphql-iso-date": "~3.6.1", "graphql-middleware": "~3.0.2", diff --git a/backend/yarn.lock b/backend/yarn.lock index 8df148093..53f6926dc 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3805,10 +3805,10 @@ graphql-yoga@~1.17.4: graphql-tools "^4.0.0" subscriptions-transport-ws "^0.9.8" -"graphql@^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", graphql@^14.0.2, graphql@~14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0" - integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q== +"graphql@^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", graphql@^14.0.2, graphql@~14.2.0: + version "14.2.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.0.tgz#ff25813ad6d186f3975977d56bc2d2434871f3b9" + integrity sha512-dlFHRtxsL4sBy1C1e3v64IUd5ndZhAOHZ/z3Dr4Nm6+cvr9elrnz4BhMF9h9mRBBnhUCGLc4GH4xvPbKG6sUeA== dependencies: iterall "^1.2.2" From d49b01319d492c94ec1a18897456d8dd2dc215e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 27 Mar 2019 11:54:27 +0000 Subject: [PATCH 6/6] Bump graphql from 14.1.1 to 14.2.0 in /webapp Bumps [graphql](https://github.com/graphql/graphql-js) from 14.1.1 to 14.2.0. - [Release notes](https://github.com/graphql/graphql-js/releases) - [Commits](https://github.com/graphql/graphql-js/compare/v14.1.1...v14.2.0) Signed-off-by: dependabot[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 66e799de8..f135428d5 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -46,7 +46,7 @@ "cross-env": "~5.2.0", "date-fns": "2.0.0-alpha.27", "express": "~4.16.4", - "graphql": "~14.1.1", + "graphql": "~14.2.0", "jsonwebtoken": "~8.5.1", "linkify-it": "~2.1.0", "nuxt": "~2.4.5", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index d4f901803..e5a5af435 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -4981,10 +4981,10 @@ graphql-upload@^8.0.2: http-errors "^1.7.1" object-path "^0.11.4" -graphql@^14.0.2, graphql@~14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0" - integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q== +graphql@^14.0.2, graphql@~14.2.0: + version "14.2.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.2.0.tgz#ff25813ad6d186f3975977d56bc2d2434871f3b9" + integrity sha512-dlFHRtxsL4sBy1C1e3v64IUd5ndZhAOHZ/z3Dr4Nm6+cvr9elrnz4BhMF9h9mRBBnhUCGLc4GH4xvPbKG6sUeA== dependencies: iterall "^1.2.2"