diff --git a/.gitignore b/.gitignore index edbc006876eb63d615a9683f8c1e95190fe41c5d..4b7078ed0f56fbd1f63ca7099ba95d24e2a3ef4a 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ testapp api .vscode .wallaby.js +config/local*.js diff --git a/config/local-test.json b/config/local-test.json index 0967ef424bce6791893e9a57bb952f80fd536e93..f22319d304423fbcc718e4bd59b3c583c17a83dd 100644 --- a/config/local-test.json +++ b/config/local-test.json @@ -1 +1 @@ -{} +{"pubsweet-server":{"secret":"f28f119d282c7e62654e123b91dfc9760e86e5054c8cdf279b2ef50ab76c155fc4af2a59d96471b8fc43e4c1df0db368322ec773f845887ffdd27fc1d59b2dd8"}} diff --git a/package.json b/package.json index eacef110e56c47ec3f063ab592489a86a36f02d9..85fb7e38d2d0c82ea0385c1545dce314633cc519 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,6 @@ "isomorphic-fetch": "^2.2.1", "joi": "^11.0.2", "pouchdb": "^6.3.4", - "pubsweet-server": "git+https://gitlab.coko.foundation/pubsweet/pubsweet-server.git" + "pubsweet-server": "^1.0.0-beta.2" } } diff --git a/yarn.lock b/yarn.lock index 4a3bdd7b3ab5ee729844e44ded0183d4633603ad..bb6696746bd8ede13cd15fb82ef8c9d779b120eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -272,9 +272,9 @@ attempt-x@^1.1.0, attempt-x@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/attempt-x/-/attempt-x-1.1.1.tgz#fba64e96ce03c3e0bd92c92622061c4df387cb76" -authsome@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/authsome/-/authsome-0.0.6.tgz#505a2555a87e29f47af9a0d511bc553558073d72" +authsome@0.0.9: + version "0.0.9" + resolved "https://registry.yarnpkg.com/authsome/-/authsome-0.0.9.tgz#08b34f1797b3539e6a362f0fb11a01ae0613f928" aws-sign2@~0.6.0: version "0.6.0" @@ -485,6 +485,10 @@ block-stream@*: dependencies: inherits "~2.0.0" +bluebird@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" + body-parser@1.18.2, body-parser@^1.15.2: version "1.18.2" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454" @@ -767,15 +771,6 @@ config@^1.26.2: json5 "0.4.0" os-homedir "1.0.2" -connect@3.6.5: - version "3.6.5" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.5.tgz#fb8dde7ba0763877d0ec9df9dac0b4b40e72c7da" - dependencies: - debug "2.6.9" - finalhandler "1.0.6" - parseurl "~1.3.2" - utils-merge "1.0.1" - console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" @@ -1028,6 +1023,10 @@ dont-sniff-mimetype@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz#5932890dc9f4e2f19e5eb02a20026e5e5efc8f58" +dotenv@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d" + double-ended-queue@2.1.0-0: version "2.1.0-0" resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" @@ -1503,18 +1502,6 @@ fill-range@^2.1.0: repeat-element "^1.1.2" repeat-string "^1.5.2" -finalhandler@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f" - dependencies: - debug "2.6.9" - encodeurl "~1.0.1" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.3.1" - unpipe "~1.0.0" - finalhandler@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" @@ -1860,9 +1847,9 @@ hawk@~6.0.2: hoek "4.x.x" sntp "2.x.x" -helmet-csp@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.5.1.tgz#5f3deec8f922fa7e074dbc3987c168a50573c36d" +helmet-csp@2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.6.0.tgz#c1f5595afbc5f83e5f1e6c15f842f07a10f6ea04" dependencies: camelize "1.0.0" content-security-policy-builder "1.1.0" @@ -1871,15 +1858,14 @@ helmet-csp@2.5.1: platform "1.3.4" helmet@^3.8.1: - version "3.8.2" - resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.8.2.tgz#64f988b8e9d8773ad201da455b8b6a754c229aaa" + version "3.9.0" + resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.9.0.tgz#7b2cf015a2d109bca83ede7924420799c0e67dee" dependencies: - connect "3.6.5" dns-prefetch-control "0.1.0" dont-sniff-mimetype "1.0.0" expect-ct "0.1.0" frameguard "3.0.0" - helmet-csp "2.5.1" + helmet-csp "2.6.0" hide-powered-by "1.0.0" hpkp "2.0.0" hsts "2.1.0" @@ -4058,7 +4044,11 @@ pretty-format@^21.2.1: ansi-regex "^3.0.0" ansi-styles "^3.2.0" -private@^0.1.6, private@^0.1.7, private@~0.1.5: +private@^0.1.6, private@~0.1.5: + version "0.1.8" + resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" + +private@^0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1" @@ -4111,17 +4101,19 @@ pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" -"pubsweet-server@git+https://gitlab.coko.foundation/pubsweet/pubsweet-server.git": - version "1.0.0-alpha.3" - resolved "git+https://gitlab.coko.foundation/pubsweet/pubsweet-server.git#f181396a127fa4ddb5aac51816692378d5b95fe4" +pubsweet-server@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-1.0.0-beta.2.tgz#d22165460cd71007ad195207bdbcdcd9e4d327a1" dependencies: "@pubsweet/logger" "^0.0.1" - authsome "0.0.6" + authsome "0.0.9" bcrypt "^1.0.2" + bluebird "^3.5.1" body-parser "^1.15.2" colors "^1.1.2" config "^1.26.2" cookie-parser "^1.4.3" + dotenv "^4.0.0" express "^4.16.1" helmet "^3.8.1" http-status-codes "^1.0.6" @@ -4168,8 +4160,8 @@ punycode@^1.4.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" q@^1.1.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1" + version "1.5.1" + resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" qs@6.5.1, qs@~6.5.1: version "6.5.1" @@ -4753,7 +4745,11 @@ staged-git-files@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/staged-git-files/-/staged-git-files-0.0.4.tgz#d797e1b551ca7a639dec0237dc6eb4bb9be17d35" -"statuses@>= 1.3.1 < 2", statuses@~1.3.1: +"statuses@>= 1.3.1 < 2": + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + +statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"