Skip to content

Commit

Permalink
chore: bump meteor 2.4 (RocketChat#31535)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ggazzo
ggazzo authored Jan 25, 2024
1 parent 8cdd0e6 commit e72e39e
Show file tree
Hide file tree
Showing 28 changed files with 109 additions and 95 deletions.
24 changes: 12 additions & 12 deletions apps/meteor/.meteor/packages
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,34 @@ rocketchat:streamer
rocketchat:version
rocketchat:user-presence

[email protected].8
[email protected].9
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].2
accounts-password@2.3.4
[email protected].3
accounts-password@2.4.0
[email protected]

pauli:accounts-linkedin
[email protected]
[email protected].0
[email protected].1
[email protected]

[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected]

[email protected]
[email protected]
[email protected].5
[email protected].6

[email protected].7
[email protected].8

[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]

Expand All @@ -58,15 +58,15 @@ [email protected]
[email protected]
[email protected]

[email protected].2
[email protected].3
[email protected]
[email protected]

[email protected].4
[email protected].5
[email protected]
[email protected]
[email protected].7
[email protected].4
[email protected].8
[email protected].5

[email protected]

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/.meteor/release
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@2.13.3
METEOR@2.14
50 changes: 25 additions & 25 deletions apps/meteor/.meteor/versions
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[email protected].8
[email protected].9
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].2
accounts-password@2.3.4
[email protected].3
accounts-password@2.4.0
[email protected]
[email protected]
[email protected]
[email protected].4
[email protected].5
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected]
Expand All @@ -21,21 +21,21 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
ddp-server@2.6.2
[email protected].1
ddp-server@2.7.0
[email protected]
dispatch:[email protected]
[email protected]
[email protected].7
[email protected].8
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected].3
[email protected].4
[email protected]
[email protected]
[email protected]
Expand All @@ -45,22 +45,22 @@ [email protected]
[email protected]
kadira:[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected].3
[email protected].4
[email protected]
[email protected]
meteorhacks:[email protected]
[email protected]
[email protected]
[email protected].9
modules@0.19.0
[email protected].10
modules@0.20.0
[email protected]
[email protected].7
[email protected].8
[email protected]
[email protected]
[email protected]
npm-mongo@4.16.0
[email protected].0
npm-mongo@4.17.2
[email protected].1
[email protected]
[email protected]
[email protected]
Expand All @@ -70,7 +70,7 @@ pauli:[email protected]
[email protected]
[email protected]
[email protected]
[email protected].7
[email protected].8
[email protected]
[email protected]
[email protected]
Expand All @@ -84,19 +84,19 @@ rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected].4
[email protected].5
[email protected]
[email protected]
[email protected].5
[email protected].6
[email protected]
zodern:[email protected]
zodern:standard-minifier-js@5.1.2
zodern:[email protected].9
zodern:standard-minifier-js@5.3.1
zodern:[email protected].11
12 changes: 12 additions & 0 deletions apps/meteor/app/2fa/server/definitions/MeteorUser.d.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
declare module 'meteor/meteor' {
namespace Meteor {
interface UserServices {
totp?: {
enabled: boolean;
hashedBackup: string[];
secret: string;
tempSecret?: string;
};
}
}
}
4 changes: 4 additions & 0 deletions apps/meteor/app/2fa/server/methods/disable.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ Meteor.methods<ServerMethods>({
});
}

if (!user.services?.totp) {
return false;
}

const verified = await TOTP.verify({
secret: user.services.totp.secret,
token: code,
Expand Down
2 changes: 0 additions & 2 deletions apps/meteor/definition/externals/meteor/meteor.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ declare module 'meteor/meteor' {
const server: any;

const runAsUser: <T>(userId: string, scope: () => T) => T;
// https://github.com/meteor/meteor/pull/12274 - Function is there on meteor 2.9, but meteor.d.ts doesn't have it registered
function userAsync(options?: { fields?: Mongo.FieldSpecifier | undefined }): Promise<Meteor.User | null>;

interface MethodThisType {
twoFactorChecked: boolean | undefined;
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/ee/server/services/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"jaeger-client": "^3.19.0",
"mem": "^8.1.1",
"moleculer": "^0.14.31",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.6.1",
"pino": "^8.15.0",
"sodium-native": "^3.3.0",
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
"@types/lodash.get": "^4.4.8",
"@types/mailparser": "^3.4.3",
"@types/marked": "^4.0.8",
"@types/meteor": "^2.9.8",
"@types/meteor-collection-hooks": "^0.8.8",
"@types/mkdirp": "^1.0.2",
"@types/mocha": "github:whitecolor/mocha-types",
Expand Down Expand Up @@ -377,7 +378,7 @@
"moment": "^2.29.4",
"moment-timezone": "^0.5.43",
"mongo-message-queue": "^1.0.0",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.6.1",
"node-abort-controller": "^3.1.1",
"node-dogstatsd": "^0.0.7",
Expand Down
5 changes: 1 addition & 4 deletions apps/meteor/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
"paths": {
/* Support absolute /imports/* with a leading '/' */
"/*": ["*"],
"meteor/*": [
"../../node_modules/@types/meteor/*",
".meteor/local/types/packages.d.ts"
]
"meteor/*": ["./node_modules/@types/meteor/*", ".meteor/local/types/packages.d.ts"]
},
"preserveSymlinks": true

Expand Down
2 changes: 1 addition & 1 deletion ee/apps/account-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"gc-stats": "^1.4.0",
"mem": "^8.1.1",
"moleculer": "^0.14.31",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.4.0",
"pino": "^8.15.0",
"polka": "^0.5.2",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/authorization-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"gc-stats": "^1.4.0",
"mem": "^8.1.1",
"moleculer": "^0.14.31",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.4.0",
"pino": "^8.15.0",
"polka": "^0.5.2"
Expand Down
4 changes: 2 additions & 2 deletions ee/apps/ddp-streamer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"jaeger-client": "^3.19.0",
"mem": "^8.1.1",
"moleculer": "^0.14.31",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.4.0",
"pino": "^8.15.0",
"polka": "^0.5.2",
Expand All @@ -48,7 +48,7 @@
"@rocket.chat/eslint-config": "workspace:^",
"@types/ejson": "^2.2.1",
"@types/gc-stats": "^1.4.2",
"@types/meteor": "^2.9.5",
"@types/meteor": "^2.9.8",
"@types/node": "^14.18.63",
"@types/polka": "^0.5.6",
"@types/sharp": "^0.30.5",
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/omnichannel-transcript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"moleculer": "^0.14.31",
"moment-timezone": "^0.5.43",
"mongo-message-queue": "^1.0.0",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.4.0",
"pino": "^8.15.0",
"polka": "^0.5.2"
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/presence-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"gc-stats": "^1.4.0",
"mem": "^8.1.1",
"moleculer": "^0.14.31",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.4.0",
"pino": "^8.15.0",
"polka": "^0.5.2"
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/queue-worker/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"moleculer": "^0.14.31",
"moment-timezone": "^0.5.43",
"mongo-message-queue": "^1.0.0",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.4.0",
"pino": "^8.15.0",
"polka": "^0.5.2"
Expand Down
2 changes: 1 addition & 1 deletion ee/apps/stream-hub-service/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"gc-stats": "^1.4.0",
"mem": "^8.1.1",
"moleculer": "^0.14.31",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"nats": "^2.4.0",
"pino": "^8.15.0",
"polka": "^0.5.2"
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/omnichannel-services/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"mem": "^8.1.1",
"moment-timezone": "^0.5.43",
"mongo-message-queue": "^1.0.0",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"pino": "^8.15.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/presence/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"mongodb": "^4.17.1"
"mongodb": "^4.17.2"
}
}
2 changes: 1 addition & 1 deletion packages/agenda/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"debug": "~4.1.1",
"human-interval": "^2.0.1",
"moment-timezone": "~0.5.43",
"mongodb": "^4.17.1"
"mongodb": "^4.17.2"
},
"devDependencies": {
"@types/debug": "^4.1.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/core-services/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"babel-jest": "^29.5.0",
"eslint": "~8.45.0",
"jest": "~29.6.4",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"prettier": "~2.8.8",
"typescript": "~5.3.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core-typings/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:^",
"eslint": "~8.45.0",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"prettier": "~2.8.8",
"typescript": "~5.3.2"
},
Expand Down
1 change: 1 addition & 0 deletions packages/core-typings/src/IUser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export interface IUserServices {
enabled: boolean;
hashedBackup: string[];
secret: string;
tempSecret?: string;
};
email2fa?: {
enabled: boolean;
Expand Down
2 changes: 1 addition & 1 deletion packages/cron/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/random": "workspace:^",
"mongodb": "^4.17.1"
"mongodb": "^4.17.2"
}
}
2 changes: 1 addition & 1 deletion packages/instance-status/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:^",
"eslint": "~8.45.0",
"mongodb": "^4.17.1",
"mongodb": "^4.17.2",
"prettier": "~2.8.8",
"typescript": "~5.3.2"
},
Expand Down
Loading

0 comments on commit e72e39e

Please sign in to comment.