aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-02-28 16:29:42 +0100
committerChocobozzz <me@florianbigard.com>2020-02-28 16:32:46 +0100
commit3637106d7af7a72a9ec80a6b2769c6241f60d909 (patch)
tree68ad3dca5fcd9985cdfa36b4603f030da2e0c339
parentbdd428a6d9138d751f8cde82867022a93f1a76cc (diff)
downloadPeerTube-3637106d7af7a72a9ec80a6b2769c6241f60d909.tar.gz
PeerTube-3637106d7af7a72a9ec80a6b2769c6241f60d909.tar.zst
PeerTube-3637106d7af7a72a9ec80a6b2769c6241f60d909.zip
Upgrade oauth server dependency
-rw-r--r--package.json4
-rw-r--r--yarn.lock60
2 files changed, 20 insertions, 44 deletions
diff --git a/package.json b/package.json
index 9e01a12b4..9a64bc357 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,9 @@
78 "swagger-cli": "swagger-cli", 78 "swagger-cli": "swagger-cli",
79 "sass-lint": "sass-lint" 79 "sass-lint": "sass-lint"
80 }, 80 },
81 "resolutions": {
82 "oauth2-server": "^3.1.0-beta.1"
83 },
81 "dependencies": { 84 "dependencies": {
82 "apicache": "^1.4.0", 85 "apicache": "^1.4.0",
83 "async": "^3.0.1", 86 "async": "^3.0.1",
@@ -116,6 +119,7 @@
116 "morgan": "^1.5.3", 119 "morgan": "^1.5.3",
117 "multer": "^1.1.0", 120 "multer": "^1.1.0",
118 "nodemailer": "^6.0.0", 121 "nodemailer": "^6.0.0",
122 "oauth2-server": "3.1.0-beta.1",
119 "parse-torrent": "^7.0.0", 123 "parse-torrent": "^7.0.0",
120 "password-generator": "^2.0.2", 124 "password-generator": "^2.0.2",
121 "pem": "^1.12.3", 125 "pem": "^1.12.3",
diff --git a/yarn.lock b/yarn.lock
index e103e2f4c..571bcce8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -733,12 +733,7 @@ base64id@2.0.0:
733 resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" 733 resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
734 integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== 734 integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
735 735
736basic-auth@1.1.0: 736basic-auth@^2.0.0, basic-auth@~2.0.0:
737 version "1.1.0"
738 resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-1.1.0.tgz#45221ee429f7ee1e5035be3f51533f1cdfd29884"
739 integrity sha1-RSIe5Cn37h5QNb4/UVM/HN/SmIQ=
740
741basic-auth@~2.0.0:
742 version "2.0.1" 737 version "2.0.1"
743 resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" 738 resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
744 integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== 739 integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
@@ -882,17 +877,12 @@ block-stream2@^2.0.0:
882 dependencies: 877 dependencies:
883 readable-stream "^3.4.0" 878 readable-stream "^3.4.0"
884 879
885bluebird@3.5.0:
886 version "3.5.0"
887 resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
888 integrity sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=
889
890bluebird@^2.10.0: 880bluebird@^2.10.0:
891 version "2.11.0" 881 version "2.11.0"
892 resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1" 882 resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
893 integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE= 883 integrity sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=
894 884
895bluebird@^3.0.5, bluebird@^3.5.0: 885bluebird@^3.0.5, bluebird@^3.5.0, bluebird@^3.5.1:
896 version "3.7.2" 886 version "3.7.2"
897 resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" 887 resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
898 integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== 888 integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -3546,11 +3536,6 @@ lodash.isequal@^4.5.0:
3546 resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" 3536 resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
3547 integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= 3537 integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
3548 3538
3549lodash@4.17.4:
3550 version "4.17.4"
3551 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
3552 integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=
3553
3554lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15: 3539lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15:
3555 version "4.17.15" 3540 version "4.17.15"
3556 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" 3541 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -3727,7 +3712,7 @@ mime-db@1.43.0:
3727 resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" 3712 resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
3728 integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== 3713 integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
3729 3714
3730mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.19, mime-types@~2.1.24: 3715mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24:
3731 version "2.1.26" 3716 version "2.1.26"
3732 resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" 3717 resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
3733 integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== 3718 integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
@@ -4180,17 +4165,17 @@ oauth-sign@~0.9.0:
4180 resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" 4165 resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
4181 integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== 4166 integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
4182 4167
4183oauth2-server@3.0.0: 4168oauth2-server@3.0.0, oauth2-server@3.1.0-beta.1, oauth2-server@^3.1.0-beta.1:
4184 version "3.0.0" 4169 version "3.1.0-beta.1"
4185 resolved "https://registry.yarnpkg.com/oauth2-server/-/oauth2-server-3.0.0.tgz#c46276b74c3d28634d59ee981f76b58a6459cc28" 4170 resolved "https://registry.yarnpkg.com/oauth2-server/-/oauth2-server-3.1.0-beta.1.tgz#159ee4d32d148c2dc7a39f7b1ce872e039b91a41"
4186 integrity sha1-xGJ2t0w9KGNNWe6YH3a1imRZzCg= 4171 integrity sha512-FWLl/YC5NGvGzAtclhmlY9fG0nKwDP7xPiPOi5fZ4APO34BmF/vxsEp22spJNuSOrGEsp9W7jKtFCI3UBSvx5w==
4187 dependencies: 4172 dependencies:
4188 basic-auth "1.1.0" 4173 basic-auth "^2.0.0"
4189 bluebird "3.5.0" 4174 bluebird "^3.5.1"
4190 lodash "4.17.4" 4175 lodash "^4.17.10"
4191 promisify-any "2.0.1" 4176 promisify-any "^2.0.1"
4192 statuses "1.3.1" 4177 statuses "^1.5.0"
4193 type-is "1.6.15" 4178 type-is "^1.6.16"
4194 4179
4195object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1: 4180object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1:
4196 version "4.1.1" 4181 version "4.1.1"
@@ -4718,7 +4703,7 @@ promise.prototype.finally@^3.1.2:
4718 es-abstract "^1.17.0-next.0" 4703 es-abstract "^1.17.0-next.0"
4719 function-bind "^1.1.1" 4704 function-bind "^1.1.1"
4720 4705
4721promisify-any@2.0.1: 4706promisify-any@^2.0.1:
4722 version "2.0.1" 4707 version "2.0.1"
4723 resolved "https://registry.yarnpkg.com/promisify-any/-/promisify-any-2.0.1.tgz#403e00a8813f175242ab50fe33a69f8eece47305" 4708 resolved "https://registry.yarnpkg.com/promisify-any/-/promisify-any-2.0.1.tgz#403e00a8813f175242ab50fe33a69f8eece47305"
4724 integrity sha1-QD4AqIE/F1JCq1D+M6afjuzkcwU= 4709 integrity sha1-QD4AqIE/F1JCq1D+M6afjuzkcwU=
@@ -5645,12 +5630,7 @@ standard-as-callback@^2.0.1:
5645 resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.0.1.tgz#ed8bb25648e15831759b6023bdb87e6b60b38126" 5630 resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.0.1.tgz#ed8bb25648e15831759b6023bdb87e6b60b38126"
5646 integrity sha512-NQOxSeB8gOI5WjSaxjBgog2QFw55FV8TkS6Y07BiB3VJ8xNTvUYm0wl0s8ObgQ5NhdpnNfigMIKjgPESzgr4tg== 5631 integrity sha512-NQOxSeB8gOI5WjSaxjBgog2QFw55FV8TkS6Y07BiB3VJ8xNTvUYm0wl0s8ObgQ5NhdpnNfigMIKjgPESzgr4tg==
5647 5632
5648statuses@1.3.1: 5633"statuses@>= 1.5.0 < 2", statuses@^1.5.0, statuses@~1.5.0:
5649 version "1.3.1"
5650 resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
5651 integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
5652
5653"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
5654 version "1.5.0" 5634 version "1.5.0"
5655 resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" 5635 resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
5656 integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= 5636 integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
@@ -6201,15 +6181,7 @@ type-fest@^0.8.1:
6201 resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" 6181 resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
6202 integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== 6182 integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
6203 6183
6204type-is@1.6.15: 6184type-is@^1.6.16, type-is@^1.6.4, type-is@~1.6.17, type-is@~1.6.18:
6205 version "1.6.15"
6206 resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
6207 integrity sha1-yrEPtJCeRByChC6v4a1kbIGARBA=
6208 dependencies:
6209 media-typer "0.3.0"
6210 mime-types "~2.1.15"
6211
6212type-is@^1.6.4, type-is@~1.6.17, type-is@~1.6.18:
6213 version "1.6.18" 6185 version "1.6.18"
6214 resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" 6186 resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
6215 integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== 6187 integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==