From 1073c08c1077c7331fda2c4c063d49a3531b24a0 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Wed, 8 Feb 2023 08:27:36 -0500 Subject: [PATCH] Merge pull request #11601 from overleaf/em-upgrade-oauth2-server Upgrade oauth2-server GitOrigin-RevId: 428dddb53cd66d5385380d678c680a6e9cededb5 --- package-lock.json | 82 +++++++++++++++++++-------------------- services/web/package.json | 2 +- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0fa12258c9..6a1a19b920 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4752,6 +4752,26 @@ "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==", "optional": true }, + "node_modules/@node-oauth/formats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@node-oauth/formats/-/formats-1.0.0.tgz", + "integrity": "sha512-DwSbLtdC8zC5B5gTJkFzJj5s9vr9SGzOgQvV9nH7tUVuMSScg0EswAczhjIapOmH3Y8AyP7C4Jv7b8+QJObWZA==" + }, + "node_modules/@node-oauth/oauth2-server": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@node-oauth/oauth2-server/-/oauth2-server-4.3.0.tgz", + "integrity": "sha512-QxSWMPwiEFwZczFbZRJjmzsRT9rgb3FhBw/rZlFe9+ZrOWEc6r7mFCcvX14ekxLHSxAxZEYIgzUtE4yHfKiTxg==", + "dependencies": { + "@node-oauth/formats": "^1.0.0", + "basic-auth": "2.0.1", + "bluebird": "3.7.2", + "promisify-any": "2.0.1", + "type-is": "1.6.18" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@node-rs/crc32": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/@node-rs/crc32/-/crc32-0.1.8.tgz", @@ -24124,27 +24144,6 @@ "node": "*" } }, - "node_modules/oauth2-server": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/oauth2-server/-/oauth2-server-3.1.1.tgz", - "integrity": "sha512-4dv+fE9hrK+xTaCygOLh/kQeFzbFr7UqSyHvBDbrQq8Hg52sAkV2vTsyH3Z42hoeaKpbhM7udhL8Y4GYbl6TGQ==", - "dependencies": { - "basic-auth": "2.0.1", - "bluebird": "3.7.2", - "lodash": "4.17.19", - "promisify-any": "2.0.1", - "statuses": "1.5.0", - "type-is": "1.6.18" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/oauth2-server/node_modules/lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -34398,6 +34397,7 @@ "@lezer/common": "^1.0.2", "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.3", + "@node-oauth/oauth2-server": "^4.3.0", "@opentelemetry/api": "^1.0.4", "@opentelemetry/auto-instrumentations-web": "^0.27.2", "@opentelemetry/context-zone": "^1.2.0", @@ -34511,7 +34511,6 @@ "nodemailer-mandrill-transport": "^1.2.0", "nodemailer-ses-transport": "^1.5.1", "nvd3": "^1.8.6", - "oauth2-server": "^3.0.1", "otplib": "^12.0.1", "p-limit": "^2.3.0", "parse-data-url": "^2.0.0", @@ -40416,6 +40415,23 @@ "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==", "optional": true }, + "@node-oauth/formats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@node-oauth/formats/-/formats-1.0.0.tgz", + "integrity": "sha512-DwSbLtdC8zC5B5gTJkFzJj5s9vr9SGzOgQvV9nH7tUVuMSScg0EswAczhjIapOmH3Y8AyP7C4Jv7b8+QJObWZA==" + }, + "@node-oauth/oauth2-server": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@node-oauth/oauth2-server/-/oauth2-server-4.3.0.tgz", + "integrity": "sha512-QxSWMPwiEFwZczFbZRJjmzsRT9rgb3FhBw/rZlFe9+ZrOWEc6r7mFCcvX14ekxLHSxAxZEYIgzUtE4yHfKiTxg==", + "requires": { + "@node-oauth/formats": "^1.0.0", + "basic-auth": "2.0.1", + "bluebird": "3.7.2", + "promisify-any": "2.0.1", + "type-is": "1.6.18" + } + }, "@node-rs/crc32": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/@node-rs/crc32/-/crc32-0.1.8.tgz", @@ -43530,6 +43546,7 @@ "@lezer/generator": "^1.1.3", "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.3", + "@node-oauth/oauth2-server": "^4.3.0", "@opentelemetry/api": "^1.0.4", "@opentelemetry/auto-instrumentations-web": "^0.27.2", "@opentelemetry/context-zone": "^1.2.0", @@ -43708,7 +43725,6 @@ "nodemailer-mandrill-transport": "^1.2.0", "nodemailer-ses-transport": "^1.5.1", "nvd3": "^1.8.6", - "oauth2-server": "^3.0.1", "otplib": "^12.0.1", "p-limit": "^2.3.0", "parse-data-url": "^2.0.0", @@ -58896,26 +58912,6 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, - "oauth2-server": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/oauth2-server/-/oauth2-server-3.1.1.tgz", - "integrity": "sha512-4dv+fE9hrK+xTaCygOLh/kQeFzbFr7UqSyHvBDbrQq8Hg52sAkV2vTsyH3Z42hoeaKpbhM7udhL8Y4GYbl6TGQ==", - "requires": { - "basic-auth": "2.0.1", - "bluebird": "3.7.2", - "lodash": "4.17.19", - "promisify-any": "2.0.1", - "statuses": "1.5.0", - "type-is": "1.6.18" - }, - "dependencies": { - "lodash": { - "version": "4.17.19", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", - "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" - } - } - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", diff --git a/services/web/package.json b/services/web/package.json index 0a20595740..755cbab1cb 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -85,6 +85,7 @@ "@lezer/common": "^1.0.2", "@lezer/highlight": "^1.1.3", "@lezer/lr": "^1.3.3", + "@node-oauth/oauth2-server": "^4.3.0", "@opentelemetry/api": "^1.0.4", "@opentelemetry/auto-instrumentations-web": "^0.27.2", "@opentelemetry/context-zone": "^1.2.0", @@ -198,7 +199,6 @@ "nodemailer-mandrill-transport": "^1.2.0", "nodemailer-ses-transport": "^1.5.1", "nvd3": "^1.8.6", - "oauth2-server": "^3.0.1", "otplib": "^12.0.1", "p-limit": "^2.3.0", "parse-data-url": "^2.0.0",