From 48eb49a763720a50e27967134c606090839481a3 Mon Sep 17 00:00:00 2001 From: Ersun Warncke Date: Tue, 18 Sep 2018 03:43:02 -0400 Subject: [PATCH 1/2] add sso passport modules --- services/web/package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/web/package.json b/services/web/package.json index 8b8879375c..0bacc0d2d1 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -63,6 +63,7 @@ "marked": "^0.3.5", "method-override": "^2.3.3", "metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.7.1", + "minimist": "1.2.0", "mocha": "^5.0.1", "mongojs": "2.4.0", "mongoose": "4.11.4", @@ -75,11 +76,14 @@ "nvd3": "^1.8.6", "optimist": "0.6.1", "passport": "^0.3.2", + "passport-google-oauth20": "^1.0.0", "passport-ldapauth": "^0.6.0", "passport-local": "^1.0.0", "passport-oauth2": "^1.4.0", "passport-oauth2-refresh": "^1.0.0", + "passport-orcid": "0.0.3", "passport-saml": "^0.15.0", + "passport-twitter": "^1.0.4", "pug": "^2.0.0-beta6", "react": "^15.4.2", "react-dom": "^15.4.2", @@ -99,8 +103,7 @@ "v8-profiler": "^5.2.3", "valid-url": "^1.0.9", "xml2js": "0.2.0", - "yauzl": "^2.8.0", - "minimist": "1.2.0" + "yauzl": "^2.8.0" }, "devDependencies": { "autoprefixer": "^6.6.1", From 256e374af031d550fd4c0f276d9ed5d9ea9790a9 Mon Sep 17 00:00:00 2001 From: Ersun Warncke Date: Wed, 19 Sep 2018 12:13:14 -0400 Subject: [PATCH 2/2] update shrinkwrap --- services/web/npm-shrinkwrap.json | 125 +++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 5 deletions(-) diff --git a/services/web/npm-shrinkwrap.json b/services/web/npm-shrinkwrap.json index dde80a9a3c..8fe259f82c 100644 --- a/services/web/npm-shrinkwrap.json +++ b/services/web/npm-shrinkwrap.json @@ -1545,6 +1545,11 @@ } } }, + "chownr": { + "version": "1.1.1", + "from": "chownr@>=1.0.1 <2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz" + }, "ci-info": { "version": "1.1.3", "from": "ci-info@>=1.0.0 <2.0.0", @@ -3482,6 +3487,12 @@ "resolved": "https://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz", "dev": true, "dependencies": { + "minimist": { + "version": "0.0.10", + "from": "minimist@>=0.0.1 <0.1.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "dev": true + }, "optimist": { "version": "0.6.0", "from": "optimist@0.6.0", @@ -3603,6 +3614,11 @@ "from": "fs-extra@>=4.0.2 <5.0.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz" }, + "fs-minipass": { + "version": "1.2.5", + "from": "fs-minipass@>=1.2.5 <2.0.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz" + }, "fs.realpath": { "version": "1.0.0", "from": "fs.realpath@>=1.0.0 <2.0.0", @@ -6696,6 +6712,38 @@ "from": "lynx@0.1.1", "resolved": "https://registry.npmjs.org/lynx/-/lynx-0.1.1.tgz" }, + "mailchimp-api-v3": { + "version": "1.12.0", + "from": "mailchimp-api-v3@>=1.12.0 <2.0.0", + "resolved": "https://registry.npmjs.org/mailchimp-api-v3/-/mailchimp-api-v3-1.12.0.tgz", + "dependencies": { + "bluebird": { + "version": "3.5.2", + "from": "bluebird@>=3.4.0 <4.0.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.2.tgz" + }, + "lodash": { + "version": "4.17.11", + "from": "lodash@>=4.17.10 <5.0.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz" + }, + "safe-buffer": { + "version": "5.1.2", + "from": "safe-buffer@>=5.1.2 <6.0.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + }, + "tar": { + "version": "4.4.6", + "from": "tar@>=4.0.2 <5.0.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.6.tgz" + }, + "yallist": { + "version": "3.0.2", + "from": "yallist@>=3.0.2 <4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz" + } + } + }, "mailcomposer": { "version": "3.3.2", "from": "mailcomposer@3.3.2", @@ -6981,9 +7029,31 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz" }, "minimist": { - "version": "0.0.8", - "from": "minimist@0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + "version": "1.2.0", + "from": "minimist@1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz" + }, + "minipass": { + "version": "2.3.4", + "from": "minipass@>=2.3.3 <3.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz", + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "from": "safe-buffer@^5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + }, + "yallist": { + "version": "3.0.2", + "from": "yallist@^3.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz" + } + } + }, + "minizlib": { + "version": "1.1.0", + "from": "minizlib@>=1.1.0 <2.0.0", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz" }, "mixin-deep": { "version": "1.3.1", @@ -7002,7 +7072,14 @@ "mkdirp": { "version": "0.5.1", "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz" + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "dependencies": { + "minimist": { + "version": "0.0.8", + "from": "minimist@0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz" + } + } }, "mocha": { "version": "5.0.1", @@ -7312,6 +7389,12 @@ "resolved": "https://registry.npmjs.org/async/-/async-0.2.9.tgz", "dev": true }, + "minimist": { + "version": "0.0.10", + "from": "minimist@>=0.0.1 <0.1.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "dev": true + }, "optimist": { "version": "0.6.0", "from": "optimist@0.6.0", @@ -8145,7 +8228,14 @@ "optimist": { "version": "0.6.1", "from": "optimist@0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz" + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "dependencies": { + "minimist": { + "version": "0.0.10", + "from": "minimist@>=0.0.1 <0.1.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz" + } + } }, "optionator": { "version": "0.8.2", @@ -8318,6 +8408,11 @@ "from": "passport@>=0.3.2 <0.4.0", "resolved": "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz" }, + "passport-google-oauth20": { + "version": "1.0.0", + "from": "passport-google-oauth20@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz" + }, "passport-ldapauth": { "version": "0.6.0", "from": "passport-ldapauth@>=0.6.0 <0.7.0", @@ -8328,6 +8423,11 @@ "from": "passport-local@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz" }, + "passport-oauth1": { + "version": "1.1.0", + "from": "passport-oauth1@>=1.0.0 <2.0.0", + "resolved": "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz" + }, "passport-oauth2": { "version": "1.4.0", "from": "passport-oauth2@>=1.4.0 <2.0.0", @@ -8338,6 +8438,11 @@ "from": "passport-oauth2-refresh@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/passport-oauth2-refresh/-/passport-oauth2-refresh-1.0.0.tgz" }, + "passport-orcid": { + "version": "0.0.3", + "from": "https://registry.npmjs.org/passport-orcid/-/passport-orcid-0.0.3.tgz", + "resolved": "https://registry.npmjs.org/passport-orcid/-/passport-orcid-0.0.3.tgz" + }, "passport-saml": { "version": "0.15.0", "from": "passport-saml@>=0.15.0 <0.16.0", @@ -8372,6 +8477,11 @@ "from": "passport-strategy@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" }, + "passport-twitter": { + "version": "1.0.4", + "from": "https://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.4.tgz", + "resolved": "https://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.4.tgz" + }, "path-browserify": { "version": "0.0.0", "from": "path-browserify@0.0.0", @@ -12502,6 +12612,11 @@ "from": "xtend@>=4.0.1 <5.0.0", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz" }, + "xtraverse": { + "version": "0.1.0", + "from": "xtraverse@>=0.1.0 <0.2.0", + "resolved": "https://registry.npmjs.org/xtraverse/-/xtraverse-0.1.0.tgz" + }, "y18n": { "version": "3.2.1", "from": "y18n@>=3.2.1 <4.0.0",