diff --git a/.changeset/mighty-shirts-sell.md b/.changeset/mighty-shirts-sell.md new file mode 100644 index 000000000000..7ff8c1fca455 --- /dev/null +++ b/.changeset/mighty-shirts-sell.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fixed an issue where the webclient didn't properly clear the message caches from memory when a room is deleted. When this happened to basic DMs and the user started a new DM with the same target user, the client would show the old messages in the room history even though they no longer existed in the server. diff --git a/.changeset/spotty-tips-sell.md b/.changeset/spotty-tips-sell.md new file mode 100644 index 000000000000..8505e004a3c2 --- /dev/null +++ b/.changeset/spotty-tips-sell.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fix multi-instance data formats being lost diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages index e99aa0bdfb67..fd33bef3892f 100644 --- a/apps/meteor/.meteor/packages +++ b/apps/meteor/.meteor/packages @@ -15,34 +15,34 @@ rocketchat:streamer rocketchat:version rocketchat:user-presence -accounts-base@2.2.8 +accounts-base@2.2.9 accounts-facebook@1.3.3 accounts-github@1.5.0 accounts-google@1.4.0 accounts-meteor-developer@1.5.0 -accounts-oauth@1.4.2 -accounts-password@2.3.4 +accounts-oauth@1.4.3 +accounts-password@2.4.0 accounts-twitter@1.5.0 pauli:accounts-linkedin google-oauth@1.4.4 -oauth@2.2.0 +oauth@2.2.1 oauth2@1.3.2 check@1.3.2 -ddp-rate-limiter@1.2.0 +ddp-rate-limiter@1.2.1 rate-limit@1.1.1 email@2.2.5 http@2.0.0 meteor-base@1.5.1 ddp-common@1.4.0 -webapp@1.13.5 +webapp@1.13.6 -mongo@1.16.7 +mongo@1.16.8 reload@1.3.1 -service-configuration@1.3.1 +service-configuration@1.3.2 session@1.2.1 shell-server@0.5.0 @@ -58,15 +58,15 @@ routepolicy@1.1.1 webapp-hashing@1.1.1 facts-base@1.0.1 -tracker@1.3.2 +tracker@1.3.3 reactive-dict@1.3.1 reactive-var@1.0.12 -babel-compiler@7.10.4 +babel-compiler@7.10.5 standard-minifier-css@1.9.2 dynamic-import@0.7.3 -ecmascript@0.16.7 -typescript@4.9.4 +ecmascript@0.16.8 +typescript@4.9.5 autoupdate@1.8.0 diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release index 6641d0478a10..c500c39d6da2 100644 --- a/apps/meteor/.meteor/release +++ b/apps/meteor/.meteor/release @@ -1 +1 @@ -METEOR@2.13.3 +METEOR@2.14 diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions index 6dab889e3e38..8c135becc110 100644 --- a/apps/meteor/.meteor/versions +++ b/apps/meteor/.meteor/versions @@ -1,18 +1,18 @@ -accounts-base@2.2.8 +accounts-base@2.2.9 accounts-facebook@1.3.3 accounts-github@1.5.0 accounts-google@1.4.0 accounts-meteor-developer@1.5.0 -accounts-oauth@1.4.2 -accounts-password@2.3.4 +accounts-oauth@1.4.3 +accounts-password@2.4.0 accounts-twitter@1.5.0 allow-deny@1.1.1 autoupdate@1.8.0 -babel-compiler@7.10.4 +babel-compiler@7.10.5 babel-runtime@1.5.1 base64@1.0.12 binary-heap@1.0.11 -boilerplate-generator@1.7.1 +boilerplate-generator@1.7.2 caching-compiler@1.2.2 callback-hook@1.5.1 check@1.3.2 @@ -21,21 +21,21 @@ coffeescript-compiler@2.4.1 ddp@1.4.1 ddp-client@2.6.1 ddp-common@1.4.0 -ddp-rate-limiter@1.2.0 -ddp-server@2.6.2 +ddp-rate-limiter@1.2.1 +ddp-server@2.7.0 diff-sequence@1.1.2 dispatch:run-as-user@1.1.1 dynamic-import@0.7.3 -ecmascript@0.16.7 +ecmascript@0.16.8 ecmascript-runtime@0.8.1 ecmascript-runtime-client@0.12.1 ecmascript-runtime-server@0.11.0 ejson@1.1.3 email@2.2.5 es5-shim@4.8.0 -facebook-oauth@1.11.2 +facebook-oauth@1.11.3 facts-base@1.0.1 -fetch@0.1.3 +fetch@0.1.4 geojson-utils@1.0.11 github-oauth@1.4.1 google-oauth@1.4.4 @@ -45,22 +45,22 @@ id-map@1.1.1 inter-process-messaging@0.1.1 kadira:flow-router@2.12.1 localstorage@1.2.0 -logging@1.3.2 -meteor@1.11.3 +logging@1.3.3 +meteor@1.11.4 meteor-base@1.5.1 meteor-developer-oauth@1.3.2 meteorhacks:inject-initial@1.0.5 minifier-css@1.6.4 minimongo@1.9.3 -modern-browsers@0.1.9 -modules@0.19.0 +modern-browsers@0.1.10 +modules@0.20.0 modules-runtime@0.13.1 -mongo@1.16.7 +mongo@1.16.8 mongo-decimal@0.1.3 mongo-dev-server@1.1.0 mongo-id@1.0.8 -npm-mongo@4.16.0 -oauth@2.2.0 +npm-mongo@4.17.2 +oauth@2.2.1 oauth1@1.5.1 oauth2@1.3.2 ordered-dict@1.1.0 @@ -70,7 +70,7 @@ pauli:linkedin-oauth@6.0.0 promise@0.12.2 random@1.2.1 rate-limit@1.1.1 -react-fast-refresh@0.2.7 +react-fast-refresh@0.2.8 reactive-dict@1.3.1 reactive-var@1.0.12 reload@1.3.1 @@ -84,19 +84,19 @@ rocketchat:streamer@1.1.0 rocketchat:user-presence@2.6.3 rocketchat:version@1.0.0 routepolicy@1.1.1 -service-configuration@1.3.1 +service-configuration@1.3.2 session@1.2.1 sha@1.0.9 shell-server@0.5.0 -socket-stream-client@0.5.1 +socket-stream-client@0.5.2 standard-minifier-css@1.9.2 -tracker@1.3.2 +tracker@1.3.3 twitter-oauth@1.3.3 -typescript@4.9.4 +typescript@4.9.5 underscore@1.0.13 url@1.3.2 -webapp@1.13.5 +webapp@1.13.6 webapp-hashing@1.1.1 zodern:caching-minifier@0.5.0 -zodern:standard-minifier-js@5.1.2 -zodern:types@1.0.9 +zodern:standard-minifier-js@5.3.1 +zodern:types@1.0.11 diff --git a/apps/meteor/app/2fa/server/definitions/MeteorUser.d.ts b/apps/meteor/app/2fa/server/definitions/MeteorUser.d.ts new file mode 100644 index 000000000000..5c7d97a21230 --- /dev/null +++ b/apps/meteor/app/2fa/server/definitions/MeteorUser.d.ts @@ -0,0 +1,12 @@ +declare module 'meteor/meteor' { + namespace Meteor { + interface UserServices { + totp?: { + enabled: boolean; + hashedBackup: string[]; + secret: string; + tempSecret?: string; + }; + } + } +} diff --git a/apps/meteor/app/2fa/server/methods/disable.ts b/apps/meteor/app/2fa/server/methods/disable.ts index 8768f86c0424..0927b3f854ac 100644 --- a/apps/meteor/app/2fa/server/methods/disable.ts +++ b/apps/meteor/app/2fa/server/methods/disable.ts @@ -26,6 +26,10 @@ Meteor.methods({ }); } + if (!user.services?.totp) { + return false; + } + const verified = await TOTP.verify({ secret: user.services.totp.secret, token: code, diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx index b016251dc252..62ed7070737d 100644 --- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx +++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx @@ -13,6 +13,7 @@ import { afterLogoutCleanUpCallback } from '../../../lib/callbacks/afterLogoutCl import { useReactiveValue } from '../../hooks/useReactiveValue'; import { createReactiveSubscriptionFactory } from '../../lib/createReactiveSubscriptionFactory'; import { useCreateFontStyleElement } from '../../views/account/accessibility/hooks/useCreateFontStyleElement'; +import { useClearRemovedRoomsHistory } from './hooks/useClearRemovedRoomsHistory'; import { useDeleteUser } from './hooks/useDeleteUser'; import { useEmailVerificationWarning } from './hooks/useEmailVerificationWarning'; import { useUpdateAvatar } from './hooks/useUpdateAvatar'; @@ -51,6 +52,7 @@ const UserProvider = ({ children }: UserProviderProps): ReactElement => { createFontStyleElement(user?.settings?.preferences?.fontSize); useEmailVerificationWarning(user ?? undefined); + useClearRemovedRoomsHistory(userId); useDeleteUser(); useUpdateAvatar(); diff --git a/apps/meteor/client/providers/UserProvider/hooks/useClearRemovedRoomsHistory.ts b/apps/meteor/client/providers/UserProvider/hooks/useClearRemovedRoomsHistory.ts new file mode 100644 index 000000000000..50d12c3d334b --- /dev/null +++ b/apps/meteor/client/providers/UserProvider/hooks/useClearRemovedRoomsHistory.ts @@ -0,0 +1,20 @@ +import { useStream } from '@rocket.chat/ui-contexts'; +import { useEffect } from 'react'; + +import { RoomHistoryManager } from '../../../../app/ui-utils/client'; + +export const useClearRemovedRoomsHistory = (userId: string | null) => { + const subscribeToNotifyUser = useStream('notify-user'); + + useEffect(() => { + if (!userId) { + return; + } + + return subscribeToNotifyUser(`${userId}/subscriptions-changed`, (event, data) => { + if (event === 'removed' && data.rid) { + RoomHistoryManager.clear(data.rid); + } + }); + }, [userId, subscribeToNotifyUser]); +}; diff --git a/apps/meteor/definition/externals/meteor/meteor.d.ts b/apps/meteor/definition/externals/meteor/meteor.d.ts index 774c65f39f65..8aed1992c0cf 100644 --- a/apps/meteor/definition/externals/meteor/meteor.d.ts +++ b/apps/meteor/definition/externals/meteor/meteor.d.ts @@ -42,8 +42,6 @@ declare module 'meteor/meteor' { const server: any; const runAsUser: (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; interface MethodThisType { twoFactorChecked: boolean | undefined; diff --git a/apps/meteor/ee/server/local-services/instance/service.ts b/apps/meteor/ee/server/local-services/instance/service.ts index 4caab1ba9f16..5da11ede98d6 100644 --- a/apps/meteor/ee/server/local-services/instance/service.ts +++ b/apps/meteor/ee/server/local-services/instance/service.ts @@ -3,8 +3,9 @@ import os from 'os'; import { License, ServiceClassInternal } from '@rocket.chat/core-services'; import { InstanceStatus } from '@rocket.chat/instance-status'; import { InstanceStatus as InstanceStatusRaw } from '@rocket.chat/models'; +import EJSON from 'ejson'; import type { BrokerNode } from 'moleculer'; -import { ServiceBroker, Transporters } from 'moleculer'; +import { ServiceBroker, Transporters, Serializers } from 'moleculer'; import { StreamerCentral } from '../../../../server/modules/streamer/streamer.module'; import type { IInstanceService } from '../../sdk/types/IInstanceService'; @@ -13,6 +14,18 @@ import { getTransporter } from './getTransporter'; const hostIP = process.env.INSTANCE_IP ? String(process.env.INSTANCE_IP).trim() : 'localhost'; +const { Base } = Serializers; + +class EJSONSerializer extends Base { + serialize(obj: any): Buffer { + return Buffer.from(EJSON.stringify(obj)); + } + + deserialize(buf: Buffer): any { + return EJSON.parse(buf.toString()); + } +} + export class InstanceService extends ServiceClassInternal implements IInstanceService { protected name = 'instance'; @@ -83,7 +96,7 @@ export class InstanceService extends ServiceClassInternal implements IInstanceSe this.broker = new ServiceBroker({ nodeID: InstanceStatus.id(), transporter: this.transporter, - + serializer: new EJSONSerializer(), ...getLogger(process.env), }); diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 15c3f9b9d0f3..e16e0829df67 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -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", diff --git a/apps/meteor/ee/server/startup/broker.ts b/apps/meteor/ee/server/startup/broker.ts index 0b00632e9578..daae4ace4e05 100644 --- a/apps/meteor/ee/server/startup/broker.ts +++ b/apps/meteor/ee/server/startup/broker.ts @@ -13,13 +13,13 @@ const { SERIALIZER = 'EJSON', MOLECULER_LOG_LEVEL = 'warn', BALANCE_STRATEGY = 'RoundRobin', - BALANCE_PREFER_LOCAL = 'false', + BALANCE_PREFER_LOCAL = 'true', RETRY_FACTOR = '2', RETRY_MAX_DELAY = '1000', RETRY_DELAY = '100', RETRY_RETRIES = '5', RETRY_ENABLED = 'false', - REQUEST_TIMEOUT = '10', + REQUEST_TIMEOUT = '60', HEARTBEAT_INTERVAL = '10', HEARTBEAT_TIMEOUT = '30', BULKHEAD_ENABLED = 'false', diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 7014208a431a..b65f7bc00a02 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -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", @@ -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", diff --git a/apps/meteor/tsconfig.json b/apps/meteor/tsconfig.json index e07772b269a9..b57502d54633 100644 --- a/apps/meteor/tsconfig.json +++ b/apps/meteor/tsconfig.json @@ -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 diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index d329a1ecf115..5ae5f167dc50 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -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", diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 4ce9bf82593b..92e61764f49b 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -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" diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 3cbaa92df1f3..5edb7f4114ad 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -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", @@ -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", diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index a0b22ecd479c..0f5c5fa63dd7 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -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" diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index f7351f4f4390..37b876f8cd50 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -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" diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 08d934965d02..01c0e8b5ce7c 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -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" diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index b4c0fcbb3444..e36df001de61 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -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" diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index e7b096aa1d5a..68ba14c8de31 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -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": { diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index cfebaa8c0295..35db429365ea 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -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" } } diff --git a/packages/agenda/package.json b/packages/agenda/package.json index 5c2c636bf805..d0841f474357 100644 --- a/packages/agenda/package.json +++ b/packages/agenda/package.json @@ -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", diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 7a837367a71b..0ba76e16e391 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -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" }, diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index c29651b4fc9d..f6806383ecba 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -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" }, diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts index 98785805714c..29864ae81ed1 100644 --- a/packages/core-typings/src/IUser.ts +++ b/packages/core-typings/src/IUser.ts @@ -71,6 +71,7 @@ export interface IUserServices { enabled: boolean; hashedBackup: string[]; secret: string; + tempSecret?: string; }; email2fa?: { enabled: boolean; diff --git a/packages/cron/package.json b/packages/cron/package.json index e34474d4a81d..956f3b5f7064 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -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" } } diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index f0870f4cddd2..f34a4335aeeb 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -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" }, diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 7d53342cc5ee..5e89e978adb9 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -7,7 +7,7 @@ "@types/node-rsa": "^1.1.3", "eslint": "~8.45.0", "jest": "~29.6.4", - "mongodb": "^4.17.1", + "mongodb": "^4.17.2", "ts-jest": "~29.1.1", "typescript": "~5.3.2" }, diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index cf5fa38050e7..759e0097ec36 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -7,7 +7,7 @@ "eslint": "~8.45.0", "jest": "~29.6.4", "jest-environment-jsdom": "~29.6.4", - "mongodb": "^4.17.1", + "mongodb": "^4.17.2", "ts-jest": "~29.1.1", "typescript": "~5.3.2" }, diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 53e6966c99ec..f5473f669bcf 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -15,7 +15,7 @@ "eslint": "~8.45.0", "eslint-plugin-react-hooks": "^4.6.0", "jest": "~29.6.4", - "mongodb": "^4.17.1", + "mongodb": "^4.17.2", "react": "~17.0.2", "ts-jest": "~29.1.1", "typescript": "~5.3.2", diff --git a/yarn.lock b/yarn.lock index bcb5af86810d..2c6bdf0a9946 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8849,7 +8849,7 @@ __metadata: 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 @@ -8884,7 +8884,7 @@ __metadata: human-interval: ^2.0.1 jest: ~29.6.4 moment-timezone: ~0.5.43 - mongodb: ^4.17.1 + mongodb: ^4.17.2 ts-jest: ~29.1.1 typescript: ~5.3.2 languageName: unknown @@ -8953,7 +8953,7 @@ __metadata: 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 @@ -9014,7 +9014,7 @@ __metadata: eslint: ~8.45.0 fibers: ^5.0.3 jest: ~29.6.4 - mongodb: ^4.17.1 + mongodb: ^4.17.2 prettier: ~2.8.8 typescript: ~5.3.2 languageName: unknown @@ -9030,7 +9030,7 @@ __metadata: "@rocket.chat/message-parser": ~0.31.28 "@rocket.chat/ui-kit": "workspace:~" eslint: ~8.45.0 - mongodb: ^4.17.1 + mongodb: ^4.17.2 prettier: ~2.8.8 typescript: ~5.3.2 languageName: unknown @@ -9047,7 +9047,7 @@ __metadata: "@types/jest": ~29.5.7 eslint: ~8.45.0 jest: ~29.6.4 - mongodb: ^4.17.1 + mongodb: ^4.17.2 ts-jest: ~29.1.1 typescript: ~5.3.2 languageName: unknown @@ -9114,7 +9114,7 @@ __metadata: "@rocket.chat/ui-contexts": "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 @@ -9130,7 +9130,7 @@ __metadata: 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 pino-pretty: ^7.6.1 @@ -9467,7 +9467,7 @@ __metadata: "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/models": "workspace:^" eslint: ~8.45.0 - mongodb: ^4.17.1 + mongodb: ^4.17.2 prettier: ~2.8.8 typescript: ~5.3.2 languageName: unknown @@ -9812,6 +9812,7 @@ __metadata: "@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" @@ -9963,7 +9964,7 @@ __metadata: 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 @@ -10084,7 +10085,7 @@ __metadata: "@types/node-rsa": ^1.1.3 eslint: ~8.45.0 jest: ~29.6.4 - mongodb: ^4.17.1 + mongodb: ^4.17.2 ts-jest: ~29.1.1 typescript: ~5.3.2 languageName: unknown @@ -10138,7 +10139,7 @@ __metadata: 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 ts-jest: ~29.1.1 typescript: ~5.3.2 @@ -10175,7 +10176,7 @@ __metadata: 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 @@ -10284,7 +10285,7 @@ __metadata: 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 @@ -10310,7 +10311,7 @@ __metadata: babel-jest: ^29.0.3 eslint: ~8.45.0 jest: ~29.6.4 - mongodb: ^4.17.1 + mongodb: ^4.17.2 typescript: ~5.3.2 languageName: unknown linkType: soft @@ -10351,7 +10352,7 @@ __metadata: 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 @@ -10412,7 +10413,7 @@ __metadata: eslint: ~8.45.0 jest: ~29.6.4 jest-environment-jsdom: ~29.6.4 - mongodb: ^4.17.1 + mongodb: ^4.17.2 ts-jest: ~29.1.1 typescript: ~5.3.2 languageName: unknown @@ -10502,7 +10503,7 @@ __metadata: 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 @@ -10656,7 +10657,7 @@ __metadata: eslint: ~8.45.0 eslint-plugin-react-hooks: ^4.6.0 jest: ~29.6.4 - mongodb: ^4.17.1 + mongodb: ^4.17.2 react: ~17.0.2 ts-jest: ~29.1.1 typescript: ~5.3.2 @@ -14177,9 +14178,9 @@ __metadata: languageName: node linkType: hard -"@types/meteor@npm:^2.9.5": - version: 2.9.5 - resolution: "@types/meteor@npm:2.9.5" +"@types/meteor@npm:^2.9.8": + version: 2.9.8 + resolution: "@types/meteor@npm:2.9.8" dependencies: "@types/connect": "*" "@types/jquery": "*" @@ -14188,7 +14189,7 @@ __metadata: "@types/react": "*" "@types/underscore": "*" mongodb: ^4.3.1 - checksum: e16d072fe0f0ddaf2a8ac6b442580126c6d38e9e2ac36d72551d401a9a86c1dfa42e17b28ac28842b43ed0106b1c47126348332b3fcca3c86ef0d266c1201da9 + checksum: ac3bf4236af60779424571bd59fe3861ace36aa257311d3269cf3e0003e1f9aa7855cf833dbff0fe5ec5bcc6c0661401c13faf00117d203ef2aa98ac3a5a8eb9 languageName: node linkType: hard @@ -30818,9 +30819,9 @@ __metadata: languageName: node linkType: hard -"mongodb@npm:4.17.1, mongodb@npm:^4.3.1": - version: 4.17.1 - resolution: "mongodb@npm:4.17.1" +"mongodb@npm:^4.17.2": + version: 4.17.2 + resolution: "mongodb@npm:4.17.2" dependencies: "@aws-sdk/credential-providers": ^3.186.0 "@mongodb-js/saslprep": ^1.1.0 @@ -30832,13 +30833,13 @@ __metadata: optional: true "@mongodb-js/saslprep": optional: true - checksum: e7f280570d0f23d60c308b2a484ed55762ec8e523946c0de1a0b3b398f24efcf1916a745e5407f32cd1c105b2f19d8ac75474c92f73cdf651affe3430a963f54 + checksum: 483d91b9b7f042162559ad781308e2f3df8c1217d87bffe65152ea5e7365c6b8de31b44533fa95dd596cb71d86fdbeecc703e1465f6cbd139ba63505fcf7add2 languageName: node linkType: hard -"mongodb@patch:mongodb@npm:4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch::locator=rocket.chat%40workspace%3A.": +"mongodb@npm:^4.3.1": version: 4.17.1 - resolution: "mongodb@patch:mongodb@npm%3A4.17.1#.yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch::version=4.17.1&hash=ed42e6&locator=rocket.chat%40workspace%3A." + resolution: "mongodb@npm:4.17.1" dependencies: "@aws-sdk/credential-providers": ^3.186.0 "@mongodb-js/saslprep": ^1.1.0 @@ -30850,7 +30851,7 @@ __metadata: optional: true "@mongodb-js/saslprep": optional: true - checksum: 7aa00b4000e8f01b18386b6d11033a3216de97ea892a7f10a9c0d0da40a51d91b1c9cbb0e51ff5691487e0fc926d06b5aebb944747153e6fbdaca08cf71d601c + checksum: e7f280570d0f23d60c308b2a484ed55762ec8e523946c0de1a0b3b398f24efcf1916a745e5407f32cd1c105b2f19d8ac75474c92f73cdf651affe3430a963f54 languageName: node linkType: hard @@ -36556,7 +36557,7 @@ __metadata: 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 npm-run-all: ^4.1.5 pino: ^8.15.0