Merge github.com:Human-Connection/Human-Connection into 236-list-social-media-accounts

.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
 

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",

backend/src/activitypub/ActivityPub.js

@@ -56,7 +56,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)

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}`
 }

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.`)

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"
 

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

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",

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"