Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): replace oauth2-server #35085

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

chore(deps): replace oauth2-server #35085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88b9a76
Replace oauth2-server by a maintained forker
julio-rocketchat Feb 1, 2025
37cf68a
Fix conflict
julio-rocketchat Feb 1, 2025
eb23aac
Fix lint
julio-rocketchat Feb 1, 2025
63b9220
Merge branch 'develop' into replace-oauth2-server-lib
julio-rocketchat Feb 2, 2025
7cbb029
Merge branch 'develop' into replace-oauth2-server-lib
julio-rocketchat Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@
"@nivo/heatmap": "0.88.0",
"@nivo/line": "0.88.0",
"@nivo/pie": "0.88.0",
"@node-oauth/oauth2-server": "5.2.0",
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.54.2",
"@opentelemetry/sdk-node": "^0.54.2",
Expand Down Expand Up @@ -392,7 +393,6 @@
"node-gcm": "1.1.4",
"node-rsa": "^1.1.1",
"nodemailer": "^6.9.16",
"oauth2-server": "3.1.1",
"object-path": "^0.11.8",
"path": "^0.12.7",
"path-to-regexp": "^6.3.0",
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/server/oauth2-server/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { OAuthApps, OAuthAuthCodes, OAuthAccessTokens, OAuthRefreshTokens } from '@rocket.chat/models';
import type {
AuthorizationCode,
AuthorizationCodeModel,
Expand All @@ -8,7 +7,8 @@ import type {
RefreshTokenModel,
Token,
User,
} from 'oauth2-server';
} from '@node-oauth/oauth2-server';
import { OAuthApps, OAuthAuthCodes, OAuthAccessTokens, OAuthRefreshTokens } from '@rocket.chat/models';

export type ModelConfig = {
debug?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/server/oauth2-server/oauth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import OAuthServer, { OAuthError, UnauthorizedRequestError } from '@node-oauth/oauth2-server';
import { OAuthApps, Users } from '@rocket.chat/models';
import express from 'express';
import type { Express, NextFunction, Request, Response } from 'express';
import { Accounts } from 'meteor/accounts-base';
import OAuthServer, { OAuthError, UnauthorizedRequestError } from 'oauth2-server';

import type { ModelConfig } from './model';
import { Model } from './model';
Expand Down
92 changes: 27 additions & 65 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4542,6 +4542,24 @@ __metadata:
languageName: node
linkType: hard

"@node-oauth/formats@npm:1.0.0":
version: 1.0.0
resolution: "@node-oauth/formats@npm:1.0.0"
checksum: 10/354f11d38dacc8ba64666132ae6cd27f390a55d3dcfc983a7f9514de7b08707ec8b0753ce2140c639b9a342b595d41e3f591a23e3122ccc17af155179b26eac5
languageName: node
linkType: hard

"@node-oauth/oauth2-server@npm:5.2.0":
version: 5.2.0
resolution: "@node-oauth/oauth2-server@npm:5.2.0"
dependencies:
"@node-oauth/formats": "npm:1.0.0"
basic-auth: "npm:2.0.1"
type-is: "npm:1.6.18"
checksum: 10/0ae8b1a1fb175699a813d865a01da45aa9daa12619b9e8d1e0981ca081eb617e64444e2ce4af0d22a052719e3002bb937f37085d4a51622e560752d74cad5733
languageName: node
linkType: hard

"@nodelib/fs.scandir@npm:2.1.5":
version: 2.1.5
resolution: "@nodelib/fs.scandir@npm:2.1.5"
Expand Down Expand Up @@ -8201,6 +8219,7 @@ __metadata:
"@nivo/heatmap": "npm:0.88.0"
"@nivo/line": "npm:0.88.0"
"@nivo/pie": "npm:0.88.0"
"@node-oauth/oauth2-server": "npm:5.2.0"
"@opentelemetry/api": "npm:^1.9.0"
"@opentelemetry/exporter-trace-otlp-grpc": "npm:^0.54.2"
"@opentelemetry/sdk-node": "npm:^0.54.2"
Expand Down Expand Up @@ -8483,7 +8502,6 @@ __metadata:
node-rsa: "npm:^1.1.1"
nodemailer: "npm:^6.9.16"
nyc: "npm:^15.1.0"
oauth2-server: "npm:3.1.1"
object-path: "npm:^0.11.8"
outdent: "npm:~0.8.0"
path: "npm:^0.12.7"
Expand Down Expand Up @@ -15077,20 +15095,13 @@ __metadata:
languageName: node
linkType: hard

"bluebird@npm:3.7.2, bluebird@npm:^3.1.5, bluebird@npm:^3.5.0":
"bluebird@npm:^3.1.5, bluebird@npm:^3.5.0":
version: 3.7.2
resolution: "bluebird@npm:3.7.2"
checksum: 10/007c7bad22c5d799c8dd49c85b47d012a1fe3045be57447721e6afbd1d5be43237af1db62e26cb9b0d9ba812d2e4ca3bac82f6d7e016b6b88de06ee25ceb96e7
languageName: node
linkType: hard

"bluebird@npm:^2.10.0":
version: 2.11.0
resolution: "bluebird@npm:2.11.0"
checksum: 10/f8271257f248f3a95caa3b54a99c96c91132f6d62c2b2aa367bc63bab6e3b9a240ae6a95d893f70715ef52647af9d4e4afe0a04267c31c94cc5873d2add96a3b
languageName: node
linkType: hard

"blueimp-md5@npm:^2.16.0":
version: 2.19.0
resolution: "blueimp-md5@npm:2.19.0"
Expand Down Expand Up @@ -16455,23 +16466,6 @@ __metadata:
languageName: node
linkType: hard

"co-bluebird@npm:^1.1.0":
version: 1.1.0
resolution: "co-bluebird@npm:1.1.0"
dependencies:
bluebird: "npm:^2.10.0"
co-use: "npm:^1.1.0"
checksum: 10/d78e6d05ccd531fb5fc644a263dd9b3d62137f0b5c7e869ce5d22301fc9cddeeba953f625170e157de8629a05d1e11fbecf85a5582b5fb3c86afe78b7a85c2c5
languageName: node
linkType: hard

"co-use@npm:^1.1.0":
version: 1.1.0
resolution: "co-use@npm:1.1.0"
checksum: 10/b71977870ad31b23236d72cc283742adad810838aa89c326dbc0afe2272ff4ddb282c8ca0668ba151ab0d090264fb0a01ceb600e434261a6cce5ccc080bd1654
languageName: node
linkType: hard

"co@npm:^4.6.0":
version: 4.6.0
resolution: "co@npm:4.6.0"
Expand Down Expand Up @@ -23881,13 +23875,6 @@ __metadata:
languageName: node
linkType: hard

"is-generator@npm:^1.0.2":
version: 1.0.3
resolution: "is-generator@npm:1.0.3"
checksum: 10/416ab44184fcb75923fd07cdffd05cbfc27c13d75ab9d5df441180f9689def4ba4e430a249b1b39669c651e9ea697c107493391e8265ab78ffe22e5eafb34c6b
languageName: node
linkType: hard

"is-gif@npm:^3.0.0":
version: 3.0.0
resolution: "is-gif@npm:3.0.0"
Expand Down Expand Up @@ -28432,20 +28419,6 @@ __metadata:
languageName: node
linkType: hard

"oauth2-server@npm:3.1.1":
version: 3.1.1
resolution: "oauth2-server@npm:3.1.1"
dependencies:
basic-auth: "npm:2.0.1"
bluebird: "npm:3.7.2"
lodash: "npm:4.17.19"
promisify-any: "npm:2.0.1"
statuses: "npm:1.5.0"
type-is: "npm:1.6.18"
checksum: 10/5038ca4101ab869e76d66c5819636ddca57b8adc2816ccddb7897ac156d25b107528a8f1ea2acfe8e8071350878e7beda639c4c45165fd78cf6397de0d736edf
languageName: node
linkType: hard

"object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
version: 4.1.1
resolution: "object-assign@npm:4.1.1"
Expand Down Expand Up @@ -30859,17 +30832,6 @@ __metadata:
languageName: node
linkType: hard

"promisify-any@npm:2.0.1":
version: 2.0.1
resolution: "promisify-any@npm:2.0.1"
dependencies:
bluebird: "npm:^2.10.0"
co-bluebird: "npm:^1.1.0"
is-generator: "npm:^1.0.2"
checksum: 10/304f5834a53f25d8d8949f7d43e579142fcf041861fafe5618e375b9679db0b953b6401f42c32b14d921a051fd9aef430df647f1e278135ef93456da52b4544b
languageName: node
linkType: hard

"prompts@npm:^2.0.1":
version: 2.4.2
resolution: "prompts@npm:2.4.2"
Expand Down Expand Up @@ -34099,20 +34061,20 @@ __metadata:
languageName: node
linkType: hard

"statuses@npm:1.5.0, statuses@npm:>= 1.4.0 < 2, statuses@npm:~1.5.0":
version: 1.5.0
resolution: "statuses@npm:1.5.0"
checksum: 10/c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
languageName: node
linkType: hard

"statuses@npm:2.0.1":
version: 2.0.1
resolution: "statuses@npm:2.0.1"
checksum: 10/18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
languageName: node
linkType: hard

"statuses@npm:>= 1.4.0 < 2, statuses@npm:~1.5.0":
version: 1.5.0
resolution: "statuses@npm:1.5.0"
checksum: 10/c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
languageName: node
linkType: hard

"stealthy-require@npm:^1.1.1":
version: 1.1.1
resolution: "stealthy-require@npm:1.1.1"
Expand Down
Loading