diff --git a/.changeset/bump-patch-1729717124346.md b/.changeset/bump-patch-1729717124346.md
new file mode 100644
index 0000000000000000000000000000000000000000..e1eaa7980afb1bf8e2912d275cc61cb5b6326686
--- /dev/null
+++ b/.changeset/bump-patch-1729717124346.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/pre.json b/.changeset/pre.json
index 0d6531af024a0f3a2a75f4d759574c0ed9037282..f28b23fe5d37e7a3543c28799113a8bf5edc163d 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -71,6 +71,7 @@
"brown-pants-press",
"bump-patch-1729526930133",
"bump-patch-1729648473274",
+ "bump-patch-1729717124346",
"chilled-boats-sip",
"chilled-files-relate",
"chilly-flowers-brake",
diff --git a/_templates/service/new/service.ejs.t b/_templates/service/new/service.ejs.t
index 699539365259ea580b52f19cc0edb60f38ef6904..bdd160b43cdfc50b5c00a43fca5145021afa5c35 100644
--- a/_templates/service/new/service.ejs.t
+++ b/_templates/service/new/service.ejs.t
@@ -3,6 +3,7 @@ to: ee/apps/<%= name %>/src/service.ts
---
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { broker } from '@rocket.chat/network-broker';
+import { startTracing } from '@rocket.chat/tracing';
import polka from 'polka';
import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
@@ -10,7 +11,9 @@ import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/reg
const PORT = process.env.PORT || <%= h.random() %>;
(async () => {
- const db = await getConnection();
+ const { db } = await getConnection();
+
+ startTracing({ service: '<%= name %>', db: client });
registerServiceModels(db, await getTrashCollection());
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 55bba48a1b49bf137f66a3f100b9b129a7f7eb40..bae262dff62f6563f4ec6ec9dc5dec9e30281e54 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,40 @@
# @rocket.chat/meteor
+## 7.0.0-rc.3
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/license@1.0.0-rc.3
+ - @rocket.chat/omnichannel-services@0.3.6-rc.3
+ - @rocket.chat/pdf-worker@0.2.6-rc.3
+ - @rocket.chat/presence@0.2.9-rc.3
+ - @rocket.chat/api-client@0.2.9-rc.3
+ - @rocket.chat/apps@0.2.0-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/cron@0.1.9-rc.3
+ - @rocket.chat/freeswitch@1.0.0-rc.3
+ - @rocket.chat/fuselage-ui-kit@12.0.0-rc.3
+ - @rocket.chat/gazzodown@12.0.0-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ - @rocket.chat/server-cloud-communication@0.0.2
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ - @rocket.chat/ui-theming@0.4.0-rc.0
+ - @rocket.chat/ui-avatar@8.0.0-rc.3
+ - @rocket.chat/ui-client@12.0.0-rc.3
+ - @rocket.chat/ui-video-conf@12.0.0-rc.3
+ - @rocket.chat/ui-voip@2.0.0-rc.3
+ - @rocket.chat/web-ui-registration@12.0.0-rc.3
+ - @rocket.chat/instance-status@0.1.9-rc.3
+ </details>
+
## 7.0.0-rc.2
### Patch Changes
diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index 5cd522d20533bb18710b031dbe9eac831ad5e3bf..c026236231d88d76072f0cb2f235c22ae314d6e4 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -664,7 +664,8 @@ API.v1.addRoute(
const settingsIds: string[] = [];
if (this.bodyParams.setDeploymentAs === 'new-workspace') {
- await WorkspaceCredentials.unsetCredentialByScope();
+ await WorkspaceCredentials.removeAllCredentials();
+
settingsIds.push(
'Cloud_Service_Agree_PrivacyTerms',
'Cloud_Workspace_Id',
diff --git a/apps/meteor/app/apps/server/bridges/cloud.ts b/apps/meteor/app/apps/server/bridges/cloud.ts
index 30ca897240f814d6455322346365182f51111e61..0f908ccfe0a39eebfbe63c24f086a89c7bb4f220 100644
--- a/apps/meteor/app/apps/server/bridges/cloud.ts
+++ b/apps/meteor/app/apps/server/bridges/cloud.ts
@@ -12,7 +12,7 @@ export class AppCloudBridge extends CloudWorkspaceBridge {
public async getWorkspaceToken(scope: string, appId: string): Promise<IWorkspaceToken> {
this.orch.debugLog(`App ${appId} is getting the workspace's token`);
- const token = await getWorkspaceAccessTokenWithScope(scope);
+ const token = await getWorkspaceAccessTokenWithScope({ scope });
return token;
}
diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
index 93cfa3266ecf9d189788163a16a11fcd98716132..6595c8e90fc484c735319e1e8232edf4eaeb2199 100644
--- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
+++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
@@ -1,6 +1,8 @@
import type { IWorkspaceCredentials } from '@rocket.chat/core-typings';
import { WorkspaceCredentials } from '@rocket.chat/models';
+import { SystemLogger } from '../../../../server/lib/logger/system';
+import { workspaceScopes } from '../oauthScopes';
import { getWorkspaceAccessTokenWithScope } from './getWorkspaceAccessTokenWithScope';
import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
@@ -24,20 +26,27 @@ export async function getWorkspaceAccessToken(forceNew = false, scope = '', save
return '';
}
- const workspaceCredentials = await WorkspaceCredentials.getCredentialByScope(scope);
- if (!workspaceCredentials) {
- throw new CloudWorkspaceAccessTokenError();
+ // Note: If no scope is given, it means we should assume the default scope, we store the default scopes
+ // in the global variable workspaceScopes.
+ if (scope === '') {
+ scope = workspaceScopes.join(' ');
}
- if (!hasWorkspaceAccessTokenExpired(workspaceCredentials) && !forceNew) {
+ const workspaceCredentials = await WorkspaceCredentials.getCredentialByScope(scope);
+ if (workspaceCredentials && !hasWorkspaceAccessTokenExpired(workspaceCredentials) && !forceNew) {
+ SystemLogger.debug(
+ `Workspace credentials cache hit using scope: ${scope}. Avoiding generating a new access token from cloud services.`,
+ );
return workspaceCredentials.accessToken;
}
- const accessToken = await getWorkspaceAccessTokenWithScope(scope, throwOnError);
+ SystemLogger.debug(`Workspace credentials cache miss using scope: ${scope}, fetching new access token from cloud services.`);
+
+ const accessToken = await getWorkspaceAccessTokenWithScope({ scope, throwOnError });
if (save) {
await WorkspaceCredentials.updateCredentialByScope({
- scope,
+ scope: accessToken.scope,
accessToken: accessToken.token,
expirationDate: accessToken.expiresAt,
});
diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts
index 3a04031ebb88e3c869729d9ba579cd1214e63545..1137b899967a98189a741558a7af49243076bd9b 100644
--- a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts
+++ b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts
@@ -8,10 +8,24 @@ import { CloudWorkspaceAccessTokenError } from './getWorkspaceAccessToken';
import { removeWorkspaceRegistrationInfo } from './removeWorkspaceRegistrationInfo';
import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
-export async function getWorkspaceAccessTokenWithScope(scope = '', throwOnError = false) {
+type WorkspaceAccessTokenWithScope = {
+ token: string;
+ expiresAt: Date;
+ scope: string;
+};
+
+type GetWorkspaceAccessTokenWithScopeParams = {
+ scope?: string;
+ throwOnError?: boolean;
+};
+
+export async function getWorkspaceAccessTokenWithScope({
+ scope = '',
+ throwOnError = false,
+}: GetWorkspaceAccessTokenWithScopeParams): Promise<WorkspaceAccessTokenWithScope> {
const { workspaceRegistered } = await retrieveRegistrationStatus();
- const tokenResponse = { token: '', expiresAt: new Date() };
+ const tokenResponse = { token: '', expiresAt: new Date(), scope: '' };
if (!workspaceRegistered) {
return tokenResponse;
@@ -62,6 +76,7 @@ export async function getWorkspaceAccessTokenWithScope(scope = '', throwOnError
return {
token: payload.access_token,
expiresAt,
+ scope: payload.scope,
};
} catch (err: any) {
if (err instanceof CloudWorkspaceAccessTokenError) {
diff --git a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
index 746904687d67837e6f723395f40974d2ae99dd27..63633c567845e9f5ad66a15d1bc4fc9dfefe2af7 100644
--- a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
+++ b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
@@ -1,5 +1,5 @@
import { applyLicense } from '@rocket.chat/license';
-import { Settings, WorkspaceCredentials } from '@rocket.chat/models';
+import { Settings } from '@rocket.chat/models';
import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
import { settings } from '../../../settings/server';
@@ -59,12 +59,6 @@ async function saveRegistrationDataBase({
{ _id: 'Cloud_Workspace_Registration_Client_Uri', value: registration_client_uri },
];
- await WorkspaceCredentials.updateCredentialByScope({
- scope: '',
- accessToken: '',
- expirationDate: new Date(0),
- });
-
const promises = [...settingsData.map(({ _id, value }) => Settings.updateValueById(_id, value))];
(await Promise.all(promises)).forEach((value, index) => {
diff --git a/apps/meteor/app/e2e/server/methods/updateGroupKey.ts b/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
index 6974ba225d9f9271b29073acfeb23071e578d6aa..5f7860107bd9803858a72c5fb28ec9f20907784e 100644
--- a/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
+++ b/apps/meteor/app/e2e/server/methods/updateGroupKey.ts
@@ -1,9 +1,13 @@
import type { ServerMethods } from '@rocket.chat/ddp-client';
-import { Subscriptions } from '@rocket.chat/models';
+import { Subscriptions, Rooms } from '@rocket.chat/models';
import { Meteor } from 'meteor/meteor';
import { methodDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
-import { notifyOnSubscriptionChangedById, notifyOnSubscriptionChanged } from '../../../lib/server/lib/notifyListener';
+import {
+ notifyOnSubscriptionChangedById,
+ notifyOnSubscriptionChanged,
+ notifyOnRoomChangedById,
+} from '../../../lib/server/lib/notifyListener';
declare module '@rocket.chat/ddp-client' {
// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -12,32 +16,45 @@ declare module '@rocket.chat/ddp-client' {
}
}
+export async function updateGroupKey(rid: string, uid: string, key: string, callerUserId: string) {
+ // I have a subscription to this room
+ const mySub = await Subscriptions.findOneByRoomIdAndUserId(rid, callerUserId);
+
+ if (mySub) {
+ // Setting the key to myself, can set directly to the final field
+ if (callerUserId === uid) {
+ const setGroupE2EKeyResponse = await Subscriptions.setGroupE2EKey(mySub._id, key);
+ // Case: I create an encrypted room before setting up my keys, and I reset the e2e keys
+ // Next login, I'll create the keys for the room, and set them here.
+ // However as I reset my keys, I'm on the `usersWaitingForKeys` queue
+ // So I need to remove myself from the queue and notify the time i reach here
+ // This way, I can provide the keys to other users
+ const { modifiedCount } = await Rooms.removeUsersFromE2EEQueueByRoomId(mySub.rid, [callerUserId]);
+ if (setGroupE2EKeyResponse.modifiedCount) {
+ void notifyOnSubscriptionChangedById(mySub._id);
+ }
+ if (modifiedCount) {
+ void notifyOnRoomChangedById(mySub.rid);
+ }
+ return;
+ }
+
+ // uid also has subscription to this room
+ const { value } = await Subscriptions.setGroupE2ESuggestedKey(uid, rid, key);
+ if (value) {
+ void notifyOnSubscriptionChanged(value);
+ }
+ }
+}
+
Meteor.methods<ServerMethods>({
async 'e2e.updateGroupKey'(rid, uid, key) {
- methodDeprecationLogger.method('e2e.updateGroupKey', '8.0.0');
const userId = Meteor.userId();
if (!userId) {
throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'e2e.acceptSuggestedGroupKey' });
}
- // I have a subscription to this room
- const mySub = await Subscriptions.findOneByRoomIdAndUserId(rid, userId);
-
- if (mySub) {
- // Setting the key to myself, can set directly to the final field
- if (userId === uid) {
- const setGroupE2EKeyResponse = await Subscriptions.setGroupE2EKey(mySub._id, key);
- if (setGroupE2EKeyResponse.modifiedCount) {
- void notifyOnSubscriptionChangedById(mySub._id);
- }
- return;
- }
-
- // uid also has subscription to this room
- const { value } = await Subscriptions.setGroupE2ESuggestedKey(uid, rid, key);
- if (value) {
- void notifyOnSubscriptionChanged(value);
- }
- }
+ methodDeprecationLogger.method('e2e.updateGroupKey', '8.0.0');
+ return updateGroupKey(rid, uid, key, userId);
},
});
diff --git a/apps/meteor/client/views/account/security/EndToEnd.tsx b/apps/meteor/client/views/account/security/EndToEnd.tsx
index 5546cbd00a884d7a13783703af3ee17d93036c1d..d2c3865d891bc857bf5c8a34b1220cfff6f90dfb 100644
--- a/apps/meteor/client/views/account/security/EndToEnd.tsx
+++ b/apps/meteor/client/views/account/security/EndToEnd.tsx
@@ -1,6 +1,7 @@
import { Box, PasswordInput, Field, FieldGroup, FieldLabel, FieldRow, FieldError, FieldHint, Button, Divider } from '@rocket.chat/fuselage';
import { useUniqueId } from '@rocket.chat/fuselage-hooks';
import { useToastMessageDispatch, useMethod, useTranslation, useLogout } from '@rocket.chat/ui-contexts';
+import { Accounts } from 'meteor/accounts-base';
import type { ComponentProps, ReactElement } from 'react';
import React, { useCallback, useEffect } from 'react';
import { Controller, useForm } from 'react-hook-form';
@@ -12,8 +13,8 @@ const EndToEnd = (props: ComponentProps<typeof Box>): ReactElement => {
const dispatchToastMessage = useToastMessageDispatch();
const logout = useLogout();
- const publicKey = localStorage.getItem('public_key');
- const privateKey = localStorage.getItem('private_key');
+ const publicKey = Accounts.storageLocation.getItem('public_key');
+ const privateKey = Accounts.storageLocation.getItem('private_key');
const resetE2eKey = useMethod('e2e.resetOwnE2EKey');
diff --git a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
index c3319ac32c4be0327e3e9318698e04228cbd8d97..7a9ca67724723ea4a36b87b59794014848379bd7 100644
--- a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
+++ b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
@@ -1,4 +1,5 @@
import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
+import { Accounts } from 'meteor/accounts-base';
import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
@@ -19,7 +20,7 @@ const RoomE2EESetup = () => {
const e2eRoomState = useE2EERoomState(room._id);
const { t } = useTranslation();
- const randomPassword = window.localStorage.getItem('e2e.randomPassword');
+ const randomPassword = Accounts.storageLocation.getItem('e2e.randomPassword');
const onSavePassword = useCallback(() => {
if (!randomPassword) {
diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts
index fc597d00857cc51efc7a60625a857977ba30bd94..0283f2eef783f61fc69617735a19f7ad6e66f238 100644
--- a/apps/meteor/ee/server/apps/communication/rest.ts
+++ b/apps/meteor/ee/server/apps/communication/rest.ts
@@ -189,7 +189,7 @@ export class AppsRestApi {
return API.v1.failure({ error: 'Invalid purchase type' });
}
- const response = await getWorkspaceAccessTokenWithScope('marketplace:purchase');
+ const response = await getWorkspaceAccessTokenWithScope({ scope: 'marketplace:purchase' });
if (!response.token) {
return API.v1.failure({ error: 'Unauthorized' });
}
@@ -289,7 +289,7 @@ export class AppsRestApi {
return API.v1.failure({ error: 'Invalid purchase type' });
}
- const token = await getWorkspaceAccessTokenWithScope('marketplace:purchase');
+ const token = await getWorkspaceAccessTokenWithScope({ scope: 'marketplace:purchase' });
if (!token) {
return API.v1.failure({ error: 'Unauthorized' });
}
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index f7a48e9a27ccca575c595886a70af0d31bc0b3b9..1f90a13a1af152fc2a38da86869fb1592f29e30f 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,19 @@
# rocketchat-services
+## 2.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 2.0.0-rc.2
### Patch Changes
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 6d635241a4f9e0d508d1a0b4e51c88f81d483e2a..39ec14932fe873e3fd64fd3ca8d77e86a30af4ec 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -1,7 +1,7 @@
{
"name": "rocketchat-services",
"private": true,
- "version": "2.0.0-rc.2",
+ "version": "2.0.0-rc.3",
"description": "Rocket.Chat Authorization service",
"main": "index.js",
"scripts": {
diff --git a/apps/meteor/server/database/utils.ts b/apps/meteor/server/database/utils.ts
index e07df1e9e737f4187fdce992c2a6bcfd618bfb04..ec3864586924d0126aa98f8da433d4cd1b0ca4da 100644
--- a/apps/meteor/server/database/utils.ts
+++ b/apps/meteor/server/database/utils.ts
@@ -1,6 +1,3 @@
-import { initDatabaseTracing } from '@rocket.chat/tracing';
import { MongoInternals } from 'meteor/mongo';
export const { db, client } = MongoInternals.defaultRemoteCollectionDriver().mongo;
-
-initDatabaseTracing(client);
diff --git a/apps/meteor/server/models/raw/WorkspaceCredentials.ts b/apps/meteor/server/models/raw/WorkspaceCredentials.ts
index b989ace8c2a311589f35043ce6193bafd91a108c..09706cdec4bbfdae1ed98f9b96f5361847524fed 100644
--- a/apps/meteor/server/models/raw/WorkspaceCredentials.ts
+++ b/apps/meteor/server/models/raw/WorkspaceCredentials.ts
@@ -10,31 +10,15 @@ export class WorkspaceCredentialsRaw extends BaseRaw<IWorkspaceCredentials> impl
}
protected modelIndexes(): IndexDescription[] {
- return [{ key: { scopes: 1, expirationDate: 1, accessToken: 1 }, unique: true }];
+ return [{ key: { scope: 1, expirationDate: 1, accessToken: 1 }, unique: true }];
}
getCredentialByScope(scope = ''): Promise<IWorkspaceCredentials | null> {
- const query: Filter<IWorkspaceCredentials> = {
- scopes: {
- $all: [scope],
- $size: 1,
- },
- };
+ const query: Filter<IWorkspaceCredentials> = { scope };
return this.findOne(query);
}
- unsetCredentialByScope(scope = ''): Promise<DeleteResult> {
- const query: Filter<IWorkspaceCredentials> = {
- scopes: {
- $all: [scope],
- $size: 1,
- },
- };
-
- return this.deleteOne(query);
- }
-
updateCredentialByScope({
scope,
accessToken,
@@ -46,18 +30,13 @@ export class WorkspaceCredentialsRaw extends BaseRaw<IWorkspaceCredentials> impl
}): Promise<UpdateResult> {
const record = {
$set: {
- scopes: [scope],
+ scope,
accessToken,
expirationDate,
},
};
- const query: Filter<IWorkspaceCredentials> = {
- scopes: {
- $all: [scope],
- $size: 1,
- },
- };
+ const query: Filter<IWorkspaceCredentials> = { scope };
return this.updateOne(query, record, { upsert: true });
}
diff --git a/apps/meteor/server/startup/migrations/v316.ts b/apps/meteor/server/startup/migrations/v316.ts
index c8641b896e77b36071ee3f677673a0ba068f03e2..210dafc4483fd3a12887c2791e812317f9b9fd74 100644
--- a/apps/meteor/server/startup/migrations/v316.ts
+++ b/apps/meteor/server/startup/migrations/v316.ts
@@ -1,16 +1,11 @@
-import { Settings, WorkspaceCredentials } from '@rocket.chat/models';
+import { Settings } from '@rocket.chat/models';
import { addMigration } from '../../lib/migrations';
addMigration({
version: 316,
- name: 'Remove Cloud_Workspace_Access_Token and Cloud_Workspace_Access_Token_Expires_At from the settings collection and add to the WorkspaceCredentials collection',
+ name: 'Remove Cloud_Workspace_Access_Token and Cloud_Workspace_Access_Token_Expires_At from the settings collection',
async up() {
- const workspaceCredentials = await WorkspaceCredentials.getCredentialByScope();
- if (workspaceCredentials) {
- return;
- }
-
const accessToken = ((await Settings.getValueById('Cloud_Workspace_Access_Token')) as string) || '';
const expirationDate = ((await Settings.getValueById('Cloud_Workspace_Access_Token_Expires_At')) as Date) || new Date(0);
@@ -21,11 +16,5 @@ addMigration({
if (expirationDate) {
await Settings.removeById('Cloud_Workspace_Access_Token_Expires_At');
}
-
- await WorkspaceCredentials.updateCredentialByScope({
- scope: '',
- accessToken,
- expirationDate,
- });
},
});
diff --git a/apps/meteor/server/tracing.ts b/apps/meteor/server/tracing.ts
index e08bfebb20ac3f3d86d134709ab8fb128f780064..8496ce1c49e3a3880a5245e9aabda5f41bd15c64 100644
--- a/apps/meteor/server/tracing.ts
+++ b/apps/meteor/server/tracing.ts
@@ -1,3 +1,5 @@
import { startTracing } from '@rocket.chat/tracing';
-startTracing({ service: 'core' });
+import { client } from './database/utils';
+
+startTracing({ service: 'core', db: client });
diff --git a/apps/meteor/tests/unit/app/e2e/server/methods/updateGroupKey.spec.ts b/apps/meteor/tests/unit/app/e2e/server/methods/updateGroupKey.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..9df3b2ab654d132a381b2420ebca6d88321400a7
--- /dev/null
+++ b/apps/meteor/tests/unit/app/e2e/server/methods/updateGroupKey.spec.ts
@@ -0,0 +1,63 @@
+import { expect } from 'chai';
+import { beforeEach, describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const models = {
+ Subscriptions: {
+ findOneByRoomIdAndUserId: sinon.stub(),
+ setGroupE2EKey: sinon.stub(),
+ setGroupE2ESuggestedKey: sinon.stub(),
+ },
+ Rooms: {
+ removeUsersFromE2EEQueueByRoomId: sinon.stub(),
+ },
+};
+
+const { updateGroupKey } = proxyquire.noCallThru().load('../../../../../../app/e2e/server/methods/updateGroupKey.ts', {
+ '../../../lib/server/lib/notifyListener': {
+ notifyOnSubscriptionChanged: sinon.stub(),
+ notifyOnRoomChangedById: sinon.stub(),
+ notifyOnSubscriptionChangedById: sinon.stub(),
+ },
+ '../../../lib/server/lib/deprecationWarningLogger': {
+ methodDeprecationLogger: {
+ method: sinon.stub(),
+ },
+ },
+ '@rocket.chat/models': models,
+ 'meteor/meteor': { Meteor: { methods: sinon.stub() } },
+});
+
+describe('updateGroupKey', () => {
+ beforeEach(() => {
+ models.Subscriptions.findOneByRoomIdAndUserId.reset();
+ models.Subscriptions.setGroupE2EKey.reset();
+ models.Subscriptions.setGroupE2ESuggestedKey.reset();
+ });
+
+ it('should do nothing if user has no subscription', async () => {
+ models.Subscriptions.findOneByRoomIdAndUserId.resolves(null);
+ const res = await updateGroupKey('rid', 'uid', 'key', 'callerUserId');
+
+ expect(res).to.be.undefined;
+ });
+ it('should suggest the key to the user when uid is different from callerUserId', async () => {
+ models.Subscriptions.findOneByRoomIdAndUserId.resolves({ _id: 'subscriptionId' });
+ models.Subscriptions.setGroupE2ESuggestedKey.resolves({ value: {} });
+ const res = await updateGroupKey('rid', 'uid', 'key', 'callerUserId');
+
+ expect(res).to.be.undefined;
+ expect(models.Subscriptions.setGroupE2ESuggestedKey.calledOnce).to.be.true;
+ });
+ it('should set the group key when uid is the callerUserId', async () => {
+ models.Subscriptions.findOneByRoomIdAndUserId.resolves({ _id: 'subscriptionId' });
+ models.Subscriptions.setGroupE2EKey.resolves({ modifiedCount: 1 });
+ models.Rooms.removeUsersFromE2EEQueueByRoomId.resolves({ modifiedCount: 1 });
+ const res = await updateGroupKey('rid', 'uid', 'key', 'uid');
+
+ expect(res).to.be.undefined;
+ expect(models.Subscriptions.setGroupE2EKey.calledOnce).to.be.true;
+ expect(models.Rooms.removeUsersFromE2EEQueueByRoomId.calledOnce).to.be.true;
+ });
+});
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 6e2bf8c8e98016b4d9ed752f45fab526810b0846..225633b3ed1e4f982ecaaa1ca75b8ac6d616a0bf 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,17 @@
# @rocket.chat/uikit-playground
+## 0.6.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/fuselage-ui-kit@12.0.0-rc.3
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ - @rocket.chat/ui-avatar@8.0.0-rc.3
+ </details>
+
## 0.6.0-rc.2
### Patch Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index a485363e7a170d1d185742b4a435eb623e736807..7bb2958314476aca3382fd5f217656da5f675978 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/uikit-playground",
"private": true,
- "version": "0.6.0-rc.2",
+ "version": "0.6.0-rc.3",
"type": "module",
"scripts": {
"dev": "vite",
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index b8b970166a83065941f2de5c484f7eb0af0e568b..6688e03f81c254192dbf54fbd54e9bf97241248c 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,19 @@
# @rocket.chat/account-service
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.4.9-rc.2
### Patch Changes
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index 601a7236d3adcf821456fbf664cb9130186f464d..d16650ab8d588346275c14fd50507810326bdafa 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/account-service",
"private": true,
- "version": "0.4.9-rc.2",
+ "version": "0.4.9-rc.3",
"description": "Rocket.Chat Account service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/account-service/src/service.ts b/ee/apps/account-service/src/service.ts
index b5279998a52bd8d8902005c83a14ed5c81b4c75e..e9e8cd8bef8322dafe143b3a7610e5e818030370 100755
--- a/ee/apps/account-service/src/service.ts
+++ b/ee/apps/account-service/src/service.ts
@@ -5,12 +5,12 @@ import polka from 'polka';
import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-startTracing({ service: 'account-service' });
-
const PORT = process.env.PORT || 3033;
(async () => {
- const db = await getConnection();
+ const { db, client } = await getConnection();
+
+ startTracing({ service: 'account-service', db: client });
registerServiceModels(db, await getTrashCollection());
diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md
index b9305ec47bba25366b757dfd736ed2f661d5236c..0ad246d9dc906ce2e452ca30bf32553eb716c8f7 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,19 @@
# @rocket.chat/authorization-service
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.4.9-rc.2
### Patch Changes
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 33bfdcbeff5b8b7415e3c218721e0d453ac12cd4..597d3e409bb29d6640855f702027ed57d06f1da2 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/authorization-service",
"private": true,
- "version": "0.4.9-rc.2",
+ "version": "0.4.9-rc.3",
"description": "Rocket.Chat Authorization service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/authorization-service/src/service.ts b/ee/apps/authorization-service/src/service.ts
index 699de7aeb518cb99967519512e5dfc5fee43c5c0..8b3350c5f7544a9aa2bfb990a9cede81cc68c76c 100755
--- a/ee/apps/authorization-service/src/service.ts
+++ b/ee/apps/authorization-service/src/service.ts
@@ -7,10 +7,10 @@ import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/reg
const PORT = process.env.PORT || 3034;
-startTracing({ service: 'authorization-service' });
-
(async () => {
- const db = await getConnection();
+ const { db, client } = await getConnection();
+
+ startTracing({ service: 'authorization-service', db: client });
registerServiceModels(db, await getTrashCollection());
diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md
index 129d086b7bc975ba037435cd3eaa3c43044216ed..1fd57b5ad9cde93c7ace1837f136d3df553a3d28 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,20 @@
# @rocket.chat/ddp-streamer
+## 0.3.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ - @rocket.chat/instance-status@0.1.9-rc.3
+ </details>
+
## 0.3.9-rc.2
### Patch Changes
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index b5e7e8c3c3d52827435164dd6191f5fca856f334..5d258120daa44fd3753eac81d9b36cc31c415897 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/ddp-streamer",
"private": true,
- "version": "0.3.9-rc.2",
+ "version": "0.3.9-rc.3",
"description": "Rocket.Chat DDP-Streamer service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/ddp-streamer/src/service.ts b/ee/apps/ddp-streamer/src/service.ts
index 4b43e1baed96e32e5234cb3eebc51b1120310b84..66ad72be40501bf5b80bd995982f046c3ca2269c 100755
--- a/ee/apps/ddp-streamer/src/service.ts
+++ b/ee/apps/ddp-streamer/src/service.ts
@@ -4,10 +4,10 @@ import { startTracing } from '@rocket.chat/tracing';
import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-startTracing({ service: 'ddp-streamer' });
-
(async () => {
- const db = await getConnection();
+ const { db, client } = await getConnection();
+
+ startTracing({ service: 'ddp-streamer', db: client });
registerServiceModels(db, await getTrashCollection());
diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md
index 9cdbcfaf9369d8464028fc30cab4401617aa6c97..3104ae81e3d2ea6413fba4bf18574cc5327d3b5b 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,20 @@
# @rocket.chat/omnichannel-transcript
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/omnichannel-services@0.3.6-rc.3
+ - @rocket.chat/pdf-worker@0.2.6-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.4.9-rc.2
### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index cd9c762a34f0734d8ac2f7311b5d42b87e670425..80e4b4e4df4fc733a582fbada4546fbfe65dbc29 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/omnichannel-transcript",
"private": true,
- "version": "0.4.9-rc.2",
+ "version": "0.4.9-rc.3",
"description": "Rocket.Chat service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/omnichannel-transcript/src/service.ts b/ee/apps/omnichannel-transcript/src/service.ts
index e313c0069e8d2aff0976a02880efa108487cbc34..e78d646bf9ea9826d0fc632076fde3171875f27e 100644
--- a/ee/apps/omnichannel-transcript/src/service.ts
+++ b/ee/apps/omnichannel-transcript/src/service.ts
@@ -6,12 +6,12 @@ import polka from 'polka';
import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-startTracing({ service: 'omnichannel-transcript' });
-
const PORT = process.env.PORT || 3036;
(async () => {
- const db = await getConnection();
+ const { db, client } = await getConnection();
+
+ startTracing({ service: 'omnichannel-transcript', db: client });
registerServiceModels(db, await getTrashCollection());
diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md
index 8678a5215b8f7804d40f4d78acab9b2c8a1ba964..297aa361b91b170863bc7e1760fe8a614cdc1fd8 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,19 @@
# @rocket.chat/presence-service
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/presence@0.2.9-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.4.9-rc.2
### Patch Changes
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 208a74795886f1110996122d54a3d7bc53a330f7..f9ca853ca5500747a96dc321a3f0011807bd0d68 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/presence-service",
"private": true,
- "version": "0.4.9-rc.2",
+ "version": "0.4.9-rc.3",
"description": "Rocket.Chat Presence service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/presence-service/src/service.ts b/ee/apps/presence-service/src/service.ts
index 5114c712dae7ae5269e9c92c69f9591057bbe59b..f1e86419fc695fed65a8031f7bc27322258536f2 100755
--- a/ee/apps/presence-service/src/service.ts
+++ b/ee/apps/presence-service/src/service.ts
@@ -5,12 +5,12 @@ import polka from 'polka';
import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-startTracing({ service: 'presence-service' });
-
const PORT = process.env.PORT || 3031;
(async () => {
- const db = await getConnection();
+ const { db, client } = await getConnection();
+
+ startTracing({ service: 'presence-service', db: client });
registerServiceModels(db, await getTrashCollection());
diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md
index bba8d6c8e5a16e995f7ccf386670f35a96caece1..39c2d5a39b3dc37c08137c3782bce0baa113b68f 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,19 @@
# @rocket.chat/queue-worker
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/omnichannel-services@0.3.6-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.4.9-rc.2
### Patch Changes
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 8aa8902d41f1b0c2e0f1d3629e9453ea41b35feb..fdde9ae58b4518dfd3dd18171f8a792bb2cdb88d 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/queue-worker",
"private": true,
- "version": "0.4.9-rc.2",
+ "version": "0.4.9-rc.3",
"description": "Rocket.Chat service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/queue-worker/src/service.ts b/ee/apps/queue-worker/src/service.ts
index a66d1a579badeaa219906421e8edd8cc0250833e..e936621e3389c2ef0eb41c49330d11c253048cb0 100644
--- a/ee/apps/queue-worker/src/service.ts
+++ b/ee/apps/queue-worker/src/service.ts
@@ -6,12 +6,12 @@ import polka from 'polka';
import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
-startTracing({ service: 'queue-worker' });
-
const PORT = process.env.PORT || 3038;
(async () => {
- const db = await getConnection();
+ const { db, client } = await getConnection();
+
+ startTracing({ service: 'queue-worker', db: client });
registerServiceModels(db, await getTrashCollection());
diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md
index a04b851bd289bf805225ff7217086564f75fbd8c..8585e179eecda13ade2368e3bb1b9ead66b2d08b 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,18 @@
# @rocket.chat/stream-hub-service
+## 0.4.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/network-broker@0.1.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.4.9-rc.2
### Patch Changes
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index 264d475b6798502e53edb67023bba966564e08c1..69efc6df3f5d8c4218c528da810a13bff826fd8f 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -1,7 +1,7 @@
{
"name": "@rocket.chat/stream-hub-service",
"private": true,
- "version": "0.4.9-rc.2",
+ "version": "0.4.9-rc.3",
"description": "Rocket.Chat Stream Hub service",
"scripts": {
"build": "tsc -p tsconfig.json",
diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts
index 26cea9676a029a8a16b9e1ef0c0da569a2794bf2..84567026733c760cb5b152ccc37552f14bb9491c 100755
--- a/ee/apps/stream-hub-service/src/service.ts
+++ b/ee/apps/stream-hub-service/src/service.ts
@@ -8,12 +8,12 @@ import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/reg
import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
import { StreamHub } from './StreamHub';
-startTracing({ service: 'stream-hub-service' });
-
const PORT = process.env.PORT || 3035;
(async () => {
- const db = await getConnection();
+ const { db, client } = await getConnection();
+
+ startTracing({ service: 'stream-hub-service', db: client });
registerServiceModels(db, await getTrashCollection());
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index f2ef08dda66172b57cab1d382c617ec0a4c14167..06bcacc17ccc179628df0e2954356c24a2d467a6 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/license
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ </details>
+
## 1.0.0-rc.2
### Patch Changes
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 5e9ad34fb5879c98194b2eff3afa696645301217..1d9fc2733d7f29ae58c9529b54e45b6a899d8c9e 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/license",
- "version": "1.0.0-rc.2",
+ "version": "1.0.0-rc.3",
"private": true,
"devDependencies": {
"@rocket.chat/jest-presets": "workspace:~",
diff --git a/ee/packages/network-broker/CHANGELOG.md b/ee/packages/network-broker/CHANGELOG.md
index 693cc81d6134e4413c2fe727543f9eabbc0f4cc3..84a7c6ee70c43e567ffbdd80397493943b152a42 100644
--- a/ee/packages/network-broker/CHANGELOG.md
+++ b/ee/packages/network-broker/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/network-broker
+## 0.1.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-services@0.7.1-rc.3
+ </details>
+
## 0.1.1-rc.2
### Patch Changes
diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
index 7df734e94a0f9ae276b4e5855bfd3bc8ff1c1bfe..d1cc71733da2a1ec06fd23caf3967c65c1b189c0 100644
--- a/ee/packages/network-broker/package.json
+++ b/ee/packages/network-broker/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/network-broker",
- "version": "0.1.1-rc.2",
+ "version": "0.1.1-rc.3",
"private": true,
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index eac24f84cd562f86614d2a799ecb3caddcabdba7..997a7b8401f23c9ad593cc5dda3af2e9c118a685 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,19 @@
# @rocket.chat/omnichannel-services
+## 0.3.6-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/pdf-worker@0.2.6-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.3.6-rc.2
### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index 9046be3d9f55385e6df92680f3c7a4689a9fdb4b..5c135d03243ef2e4e078cf9966c7a6c44afff8cb 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/omnichannel-services",
- "version": "0.3.6-rc.2",
+ "version": "0.3.6-rc.3",
"private": true,
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md
index dcb8559ed49416e85780aff790d6291b540e46e4..6455f81bbbf43c32263121a19ddfb05f69fbba65 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/pdf-worker
+## 0.2.6-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ </details>
+
## 0.2.6-rc.2
### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 9e5d97d2844c3486f7e829c0ee12431159759ef3..a5fe9ef3d217b87808f0feca07a9f16c4a54c6a8 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/pdf-worker",
- "version": "0.2.6-rc.2",
+ "version": "0.2.6-rc.3",
"private": true,
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index dc38c9f1994cf4e04a50608afae8ca6aa2024647..e57b75ee05ef0dba9b81491a13a04feda8b979a6 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,16 @@
# @rocket.chat/presence
+## 0.2.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/core-services@0.7.1-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.2.9-rc.2
### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 89dd73c6554557ab311405dc658929e202d7d86a..f6c909876ea67518951f40b38b9444c28861e47c 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/presence",
- "version": "0.2.9-rc.2",
+ "version": "0.2.9-rc.3",
"private": true,
"devDependencies": {
"@babel/core": "~7.25.8",
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index e56b16abb69d4aaccb4bac2f2a6904c634816379..cf72a20ae7fed649b502a585e0a7228e5413c4b8 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,15 @@
# @rocket.chat/api-client
+## 0.2.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ </details>
+
## 0.2.9-rc.2
### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index caa6c88b4d406fd9b6536f1e26615f6b5e780638..76d3d1f44d5095fc4ff3c9a2868fc0f5afccc608 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/api-client",
- "version": "0.2.9-rc.2",
+ "version": "0.2.9-rc.3",
"devDependencies": {
"@rocket.chat/jest-presets": "workspace:~",
"@types/jest": "~29.5.13",
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 590ef352c7cd8af41e0b02957338de7dbe7256e7..2e6b840e2142ec3d72b00fda9682590598140d42 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,15 @@
# @rocket.chat/apps
+## 0.2.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ </details>
+
## 0.2.0-rc.2
### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 4d213c8767992691100d527629a8b1db25337ae6..26db8fbe241b5d4c01e81d31b99364a2e82615cf 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/apps",
- "version": "0.2.0-rc.2",
+ "version": "0.2.0-rc.3",
"private": true,
"devDependencies": {
"eslint": "~8.45.0",
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 37f39bffb5cfcc69290b9d9bb63ecf955e2ecf9f..4f969ddabddd90930e4d5c116fb042c9041f3968 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,16 @@
# @rocket.chat/core-services
+## 0.7.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.7.1-rc.2
### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index 6461f4378c1502a21f1a75c0f3110ebc662b3b21..97a43a683fc6a505ede963b75cd3d291ca85ddbf 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/core-services",
- "version": "0.7.1-rc.2",
+ "version": "0.7.1-rc.3",
"private": true,
"devDependencies": {
"@babel/core": "~7.25.8",
diff --git a/packages/core-services/src/LocalBroker.ts b/packages/core-services/src/LocalBroker.ts
index 5a89e44659a9a8cf9fa5cda14884fed4dcff6771..4420ab1a9e2d0dbd9e07e21984a85056a6a2df56 100644
--- a/packages/core-services/src/LocalBroker.ts
+++ b/packages/core-services/src/LocalBroker.ts
@@ -1,6 +1,7 @@
import { EventEmitter } from 'events';
import { InstanceStatus } from '@rocket.chat/models';
+import { injectCurrentContext, tracerActiveSpan } from '@rocket.chat/tracing';
import { asyncLocalStorage } from '.';
import type { EventSignatures } from './events/Events';
@@ -17,17 +18,22 @@ export class LocalBroker implements IBroker {
private services = new Set<IServiceClass>();
async call(method: string, data: any): Promise<any> {
- const result = await asyncLocalStorage.run(
- {
- id: 'ctx.id',
- nodeID: 'ctx.nodeID',
- requestID: 'ctx.requestID',
- broker: this,
+ return tracerActiveSpan(
+ `action ${method}`,
+ {},
+ () => {
+ return asyncLocalStorage.run(
+ {
+ id: 'ctx.id',
+ nodeID: 'ctx.nodeID',
+ requestID: 'ctx.requestID',
+ broker: this,
+ },
+ (): any => this.methods.get(method)?.(...data),
+ );
},
- (): any => this.methods.get(method)?.(...data),
+ injectCurrentContext(),
);
-
- return result;
}
async destroyService(instance: ServiceClass): Promise<void> {
diff --git a/packages/core-services/src/lib/mongo.ts b/packages/core-services/src/lib/mongo.ts
index b41d838cd4a78a7da691284c47a8099feb74e38f..d61eab6021452b7ed13b96e820de4021b718767c 100644
--- a/packages/core-services/src/lib/mongo.ts
+++ b/packages/core-services/src/lib/mongo.ts
@@ -1,4 +1,4 @@
-import { initDatabaseTracing, isTracingEnabled } from '@rocket.chat/tracing';
+import { isTracingEnabled } from '@rocket.chat/tracing';
import { MongoClient } from 'mongodb';
import type { Db, Collection, MongoClientOptions, Document } from 'mongodb';
@@ -21,28 +21,27 @@ function connectDb(options?: MongoClientOptions): Promise<MongoClient> {
let db: Db;
-export const getConnection = ((): ((options?: MongoClientOptions) => Promise<Db>) => {
+export const getConnection = ((): ((options?: MongoClientOptions) => Promise<{ db: Db; client: MongoClient }>) => {
let client: MongoClient;
- return async (options): Promise<Db> => {
+ return async (options): Promise<{ db: Db; client: MongoClient }> => {
if (db) {
- return db;
+ return { db, client };
}
if (client == null) {
client = await connectDb(options);
db = client.db(name);
}
- initDatabaseTracing(client);
-
// if getConnection was called multiple times before it was connected, wait for the connection
- return client.db(name);
+ return { client, db: client.db(name) };
};
})();
export async function getTrashCollection<T extends Document>(): Promise<Collection<T>> {
if (!db) {
- db = await getConnection();
+ const { db: clientDb } = await getConnection();
+ db = clientDb;
}
return db.collection<T>('rocketchat__trash');
}
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index 35ade27cad536c9b92f75fb9aecbc36a016ebbbd..722b482bf227ac3a72fc86049bac9267cb48a7ad 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,7 @@
# @rocket.chat/core-typings
+## 7.0.0-rc.3
+
## 7.0.0-rc.2
## 7.0.0-rc.1
diff --git a/packages/core-typings/src/ee/IWorkspaceCredentials.ts b/packages/core-typings/src/ee/IWorkspaceCredentials.ts
index 1acf4570f3cf512741d8f5f0f9fc6caa9b67d035..1fda00d0c8b3eb6a680760ee18f5d0bdeda3ab3a 100644
--- a/packages/core-typings/src/ee/IWorkspaceCredentials.ts
+++ b/packages/core-typings/src/ee/IWorkspaceCredentials.ts
@@ -2,7 +2,7 @@ import type { IRocketChatRecord } from '../IRocketChatRecord';
export interface IWorkspaceCredentials extends IRocketChatRecord {
_id: string;
- scopes: string[];
+ scope: string;
expirationDate: Date;
accessToken: string;
}
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index d940035b4a0a978f8702f1c78a1d5ae803b8eff6..4ca2dea1a48cb62ebfd39c02655a49882df59372 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,15 @@
# @rocket.chat/cron
+## 0.1.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.1.9-rc.2
### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 1fced5836b56b91979be9e9e01036aedf366a82d..833fc0638dfa511f48352ec37d9b5cc638ea2ea2 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/cron",
- "version": "0.1.9-rc.2",
+ "version": "0.1.9-rc.3",
"private": true,
"devDependencies": {
"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index d3784ec7f94332a6bc193043431b0b3dfc609a26..d1f900a25efed1f83db63b0efc617146765262ce 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,16 @@
# @rocket.chat/ddp-client
+## 0.3.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/api-client@0.2.9-rc.3
+ </details>
+
## 0.3.9-rc.2
### Patch Changes
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index fa5acd8ee51ff563ccc0122f65f8f57821ee3c3a..904fc7b1b07593de527c5cc28f0bb21b8061395c 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/ddp-client",
- "version": "0.3.9-rc.2",
+ "version": "0.3.9-rc.3",
"devDependencies": {
"@rocket.chat/jest-presets": "workspace:~",
"@types/jest": "~29.5.13",
diff --git a/packages/freeswitch/CHANGELOG.md b/packages/freeswitch/CHANGELOG.md
index c1905c5a597930e0f4d3228f650c7e1d9a284477..ed60ac56c64547d85c3b1251a6826810168d873d 100644
--- a/packages/freeswitch/CHANGELOG.md
+++ b/packages/freeswitch/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/freeswitch
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ </details>
+
## 1.0.0-rc.2
### Patch Changes
diff --git a/packages/freeswitch/package.json b/packages/freeswitch/package.json
index 376108bab0ad5dd86e6d2874fabda9c5c918cfa7..f4362426a0f6320f3822959e3de643465e38dafb 100644
--- a/packages/freeswitch/package.json
+++ b/packages/freeswitch/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/freeswitch",
- "version": "1.0.0-rc.2",
+ "version": "1.0.0-rc.3",
"private": true,
"devDependencies": {
"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index df0ce069ab335d072e06c53e73156850a1dee7fd..078efc4715c340a10bfe4d63ab85a4d3afa29fbd 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,18 @@
# Change Log
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/gazzodown@12.0.0-rc.3
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ - @rocket.chat/ui-avatar@8.0.0-rc.3
+ - @rocket.chat/ui-video-conf@12.0.0-rc.3
+ </details>
+
## 12.0.0-rc.2
### Patch Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index eb50d9e5a15089389517e3b65b5493e5cbbb6286..56fa8c3246668bb858bfd0d24bc46b78b6555257 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/fuselage-ui-kit",
- "version": "12.0.0-rc.2",
+ "version": "12.0.0-rc.3",
"private": true,
"description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
@@ -101,10 +101,10 @@
"@rocket.chat/icons": "*",
"@rocket.chat/prettier-config": "*",
"@rocket.chat/styled": "*",
- "@rocket.chat/ui-avatar": "8.0.0-rc.2",
- "@rocket.chat/ui-contexts": "12.0.0-rc.2",
+ "@rocket.chat/ui-avatar": "8.0.0-rc.3",
+ "@rocket.chat/ui-contexts": "12.0.0-rc.3",
"@rocket.chat/ui-kit": "0.37.0-rc.0",
- "@rocket.chat/ui-video-conf": "12.0.0-rc.2",
+ "@rocket.chat/ui-video-conf": "12.0.0-rc.3",
"@tanstack/react-query": "*",
"react": "~17.0.2",
"react-dom": "*"
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index da317aade28d5b21e55f90677c558c9365d4212b..58f2357ec2def1c9791d0bd7d9f7a84ea63365c9 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,16 @@
# @rocket.chat/gazzodown
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ - @rocket.chat/ui-client@12.0.0-rc.3
+ </details>
+
## 12.0.0-rc.2
### Patch Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index 7ac29d9b83878794c0944b0bd2a0a1f75e36db4e..3207e71b022cd4c412a30186a0003acc57497b13 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/gazzodown",
- "version": "12.0.0-rc.2",
+ "version": "12.0.0-rc.3",
"private": true,
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
@@ -75,8 +75,8 @@
"@rocket.chat/fuselage-tokens": "*",
"@rocket.chat/message-parser": "0.31.31",
"@rocket.chat/styled": "*",
- "@rocket.chat/ui-client": "12.0.0-rc.2",
- "@rocket.chat/ui-contexts": "12.0.0-rc.2",
+ "@rocket.chat/ui-client": "12.0.0-rc.3",
+ "@rocket.chat/ui-contexts": "12.0.0-rc.3",
"katex": "*",
"react": "*"
},
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index df55f1a30e156f46eb6320d894f0ff2eafe647d7..1dfec3d3d92f90648f173ad2aea81d01a1985d82 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/instance-status
+## 0.1.9-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/models@1.0.0-rc.3
+ </details>
+
## 0.1.9-rc.2
### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 01a5cd75852592a126aae299c4e5b41b78cad656..05a5d3899e9aa7749581e7498f8c01098e8715f0 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/instance-status",
- "version": "0.1.9-rc.2",
+ "version": "0.1.9-rc.3",
"private": true,
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:^",
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index 413396856655b5297f9bf6213bd823907e65e472..c87095501486d382ced4db4146e75dfc498a6b2d 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/livechat Change Log
+## 1.20.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/gazzodown@12.0.0-rc.3
+ </details>
+
## 1.20.1-rc.2
### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index c5affb93aa2af3c0a9869953dd09248a25fc8647..dab0fe2c0a9048579460f1106bf597a27c3ff092 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/livechat",
- "version": "1.20.1-rc.2",
+ "version": "1.20.1-rc.3",
"files": [
"/build"
],
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 5b5bb17cc6737a53281f9600862cfbf186df628a..29bba8c7605cfc3039a0c10f400114351bc27643 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/model-typings
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ </details>
+
## 1.0.0-rc.2
### Patch Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 75cb376bba910490fc06322e7e493ddc82645658..5d81916a6bb1125a798bd05b8d1889afb506ffb9 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/model-typings",
- "version": "1.0.0-rc.2",
+ "version": "1.0.0-rc.3",
"private": true,
"devDependencies": {
"@types/node-rsa": "^1.1.4",
diff --git a/packages/model-typings/src/models/IWorkspaceCredentialsModel.ts b/packages/model-typings/src/models/IWorkspaceCredentialsModel.ts
index 58b9a8a5049d2d9f2c456f1720d7d78c319894d8..fa13dfa82977ca3a5e0ce48c4081c967d427610f 100644
--- a/packages/model-typings/src/models/IWorkspaceCredentialsModel.ts
+++ b/packages/model-typings/src/models/IWorkspaceCredentialsModel.ts
@@ -5,7 +5,6 @@ import type { IBaseModel } from './IBaseModel';
export interface IWorkspaceCredentialsModel extends IBaseModel<IWorkspaceCredentials> {
getCredentialByScope(scope?: string): Promise<IWorkspaceCredentials | null>;
- unsetCredentialByScope(scope?: string): Promise<DeleteResult>;
updateCredentialByScope(credentials: { scope: string; accessToken: string; expirationDate: Date }): Promise<UpdateResult>;
removeAllCredentials(): Promise<DeleteResult>;
}
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 897dbca44163c744fa744cfb9525780f7067e3db..9778f5366e8ecd83170e9b04f6ca4207c3ddc154 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/models
+## 1.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/model-typings@1.0.0-rc.3
+ </details>
+
## 1.0.0-rc.2
### Patch Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index f138766a4dd3fdc7419a3eef42d11c8afcfb6e6d..58c96184b34596c43ecf213b72ca0acb957a00de 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/models",
- "version": "1.0.0-rc.2",
+ "version": "1.0.0-rc.3",
"private": true,
"devDependencies": {
"@rocket.chat/jest-presets": "workspace:~",
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index b106998092319eae0e62cbbc2425349faf33eac5..9c320da06e8bbf4391d5a0a024bf0def6219cd24 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/rest-typings
+## 7.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ </details>
+
## 7.0.0-rc.2
### Patch Changes
diff --git a/packages/tracing/src/index.ts b/packages/tracing/src/index.ts
index 8e97dabc63c532959b06874f23fb44e3a9a33d6f..95e726fd44209ef5b517e1ca6a77a01526ad6ae5 100644
--- a/packages/tracing/src/index.ts
+++ b/packages/tracing/src/index.ts
@@ -2,8 +2,9 @@ import { context, propagation, SpanStatusCode, trace } from '@opentelemetry/api'
import type { Span, SpanOptions, Tracer } from '@opentelemetry/api';
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
import { NodeSDK } from '@opentelemetry/sdk-node';
+import type { MongoClient } from 'mongodb';
-export { initDatabaseTracing } from './traceDatabaseCalls';
+import { initDatabaseTracing } from './traceDatabaseCalls';
let tracer: Tracer | undefined;
@@ -11,7 +12,11 @@ export function isTracingEnabled() {
return ['yes', 'true'].includes(String(process.env.TRACING_ENABLED).toLowerCase());
}
-export const startTracing = ({ service }: { service: string }) => {
+export const startTracing = ({ service, db }: { service: string; db: MongoClient }) => {
+ if (!isTracingEnabled()) {
+ return;
+ }
+
const exporter = new OTLPTraceExporter();
const sdk = new NodeSDK({
@@ -22,6 +27,8 @@ export const startTracing = ({ service }: { service: string }) => {
sdk.start();
tracer = trace.getTracer(service);
+
+ initDatabaseTracing(tracer, db);
};
export function tracerSpan<F extends (span?: Span) => ReturnType<F>>(
diff --git a/packages/tracing/src/traceDatabaseCalls.ts b/packages/tracing/src/traceDatabaseCalls.ts
index 6ddde0b39753f908f0776e8eeb1f6eed381bbc8a..8f5f2ba4a7bd15cd1dc662cd34f5c51ac9a8157c 100644
--- a/packages/tracing/src/traceDatabaseCalls.ts
+++ b/packages/tracing/src/traceDatabaseCalls.ts
@@ -1,15 +1,8 @@
+import type { Tracer } from '@opentelemetry/api';
import { trace, context, SpanStatusCode } from '@opentelemetry/api';
import type { MongoClient } from 'mongodb';
-import { isTracingEnabled } from '.';
-
-const tracer = trace.getTracer('core');
-
-export const initDatabaseTracing = (client: MongoClient) => {
- if (!isTracingEnabled()) {
- return;
- }
-
+export const initDatabaseTracing = (tracer: Tracer, client: MongoClient) => {
const DurationStart = new Map();
client.on('commandStarted', (event) => {
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index 69b982da2b704d4b061ec0986e8f0a17f671868d..a8931e77564fb8153d023c66631dafc37fb21a18 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/ui-avatar
+## 8.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ </details>
+
## 8.0.0-rc.2
### Patch Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 4eeeb05e99562b6075d1aef6b6c9ac3e2982876b..188b5cba0e479f81ce826902170df8731b9681e0 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/ui-avatar",
- "version": "8.0.0-rc.2",
+ "version": "8.0.0-rc.3",
"private": true,
"devDependencies": {
"@babel/core": "~7.25.8",
@@ -30,7 +30,7 @@
],
"peerDependencies": {
"@rocket.chat/fuselage": "*",
- "@rocket.chat/ui-contexts": "12.0.0-rc.2",
+ "@rocket.chat/ui-contexts": "12.0.0-rc.3",
"react": "~17.0.2"
},
"volta": {
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index 2c467a91aff259a8facd17f3cb3efd2d84ba9b9f..cee0baffbac03fbe95a7d00addfd904be2817e36 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,15 @@
# @rocket.chat/ui-client
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ - @rocket.chat/ui-avatar@8.0.0-rc.3
+ </details>
+
## 12.0.0-rc.2
### Patch Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index 4811cdbd44b574599622a734f677f207ff5fbb9d..94684b465d05b04029b50389252ee63383fa5e24 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/ui-client",
- "version": "12.0.0-rc.2",
+ "version": "12.0.0-rc.3",
"private": true,
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
@@ -60,8 +60,8 @@
"@rocket.chat/fuselage": "*",
"@rocket.chat/fuselage-hooks": "*",
"@rocket.chat/icons": "*",
- "@rocket.chat/ui-avatar": "8.0.0-rc.2",
- "@rocket.chat/ui-contexts": "12.0.0-rc.2",
+ "@rocket.chat/ui-avatar": "8.0.0-rc.3",
+ "@rocket.chat/ui-contexts": "12.0.0-rc.3",
"react": "*",
"react-i18next": "*"
},
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index cd3a2999445df8bc8075f1286b475c5d57e5251a..674ccf92fa78ab7839363f6656e7b19501694a3e 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,16 @@
# @rocket.chat/ui-contexts
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/core-typings@7.0.0-rc.3
+ - @rocket.chat/rest-typings@7.0.0-rc.3
+ - @rocket.chat/ddp-client@0.3.9-rc.3
+ </details>
+
## 12.0.0-rc.2
### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 2be1327ded89274438f4f1a7ac3829f17cace266..82d74e0e221e1f8b7fbc298692b775c8b15e7ca9 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/ui-contexts",
- "version": "12.0.0-rc.2",
+ "version": "12.0.0-rc.3",
"private": true,
"devDependencies": {
"@rocket.chat/core-typings": "workspace:^",
diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md
index ea3fb9a440eb3ee661f0b28c759a7319a5cada04..78fb1ed355db635370598395e5875dee6eb30a9c 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,15 @@
# @rocket.chat/ui-video-conf
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ - @rocket.chat/ui-avatar@8.0.0-rc.3
+ </details>
+
## 12.0.0-rc.2
### Patch Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index 4d15b5745c12b9384fc496d7402aea475ec6bb40..9b063ed2dd204b5c2dd7bcdbd71ba5db90c2a17a 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/ui-video-conf",
- "version": "12.0.0-rc.2",
+ "version": "12.0.0-rc.3",
"private": true,
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
@@ -58,8 +58,8 @@
"@rocket.chat/fuselage-hooks": "*",
"@rocket.chat/icons": "*",
"@rocket.chat/styled": "*",
- "@rocket.chat/ui-avatar": "8.0.0-rc.2",
- "@rocket.chat/ui-contexts": "12.0.0-rc.2",
+ "@rocket.chat/ui-avatar": "8.0.0-rc.3",
+ "@rocket.chat/ui-contexts": "12.0.0-rc.3",
"react": "~17.0.2",
"react-dom": "^17.0.2"
},
diff --git a/packages/ui-voip/CHANGELOG.md b/packages/ui-voip/CHANGELOG.md
index 5bb5779af93ece627fd266e746e8fd6b99575f08..08dcddb94073ffaef1703f6be022ddbdae61e158 100644
--- a/packages/ui-voip/CHANGELOG.md
+++ b/packages/ui-voip/CHANGELOG.md
@@ -1,5 +1,16 @@
# @rocket.chat/ui-voip
+## 2.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ - @rocket.chat/ui-avatar@8.0.0-rc.3
+ - @rocket.chat/ui-client@12.0.0-rc.3
+ </details>
+
## 2.0.0-rc.2
### Patch Changes
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index f1e79d3352ed9ec4e449378f14d66faaa9f95901..ff25c679589996d48f1b890f4c8e4618e5f412be 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/ui-voip",
- "version": "2.0.0-rc.2",
+ "version": "2.0.0-rc.3",
"private": true,
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
@@ -67,9 +67,9 @@
"@rocket.chat/fuselage-hooks": "*",
"@rocket.chat/icons": "*",
"@rocket.chat/styled": "*",
- "@rocket.chat/ui-avatar": "8.0.0-rc.2",
- "@rocket.chat/ui-client": "12.0.0-rc.2",
- "@rocket.chat/ui-contexts": "12.0.0-rc.2",
+ "@rocket.chat/ui-avatar": "8.0.0-rc.3",
+ "@rocket.chat/ui-client": "12.0.0-rc.3",
+ "@rocket.chat/ui-contexts": "12.0.0-rc.3",
"react": "~17.0.2",
"react-aria": "~3.23.1",
"react-dom": "^17.0.2"
diff --git a/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
index a10084934cd43d26ff1e2e0ae4e19b8aa07ef3e7..249582107b5f52197734e53dbf54b15fcab0ae36 100644
--- a/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
+++ b/packages/ui-voip/src/components/VoipActionButton/VoipActionButton.tsx
@@ -11,9 +11,9 @@ type ActionButtonProps = Pick<ComponentPropsWithoutRef<typeof IconButton>, 'clas
const VoipActionButton = ({ disabled, label, pressed, icon, danger, success, className, onClick }: ActionButtonProps) => (
<IconButton
medium
+ secondary
danger={danger}
success={success}
- secondary={success || danger}
className={className}
icon={<Icon name={icon} />}
title={label}
diff --git a/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap b/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap
index 2f4b29aa9de8b5aa3800b6d785dcb85b19ea50e6..516c82d68465b708ee2b82aab512ce40bc793357 100644
--- a/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap
+++ b/packages/ui-voip/src/components/VoipActionButton/__snapshots__/VoipActionButton.spec.tsx.snap
@@ -25,7 +25,7 @@ exports[`renders NeutralButton without crashing 1`] = `
<div>
<button
aria-label="Neutral Button"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button"
title="Neutral Button"
type="button"
>
diff --git a/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap b/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap
index 093545e64d058858a85f4d1963a33a05edc7d37b..b75d8457b899ac6ef6a8c61b571c4b8005ed8fe2 100644
--- a/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap
+++ b/packages/ui-voip/src/components/VoipActions/__snapshots__/VoipActions.spec.tsx.snap
@@ -22,7 +22,7 @@ exports[`renders IncomingActions without crashing 1`] = `
</button>
<button
aria-label="Turn_off_microphone"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
disabled=""
title="Turn_off_microphone"
type="button"
@@ -36,7 +36,7 @@ exports[`renders IncomingActions without crashing 1`] = `
</button>
<button
aria-label="Open_Dialpad"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
disabled=""
title="Open_Dialpad"
type="button"
@@ -50,7 +50,7 @@ exports[`renders IncomingActions without crashing 1`] = `
</button>
<button
aria-label="Transfer_call"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
disabled=""
title="Transfer_call"
type="button"
@@ -89,7 +89,7 @@ exports[`renders OngoingActions without crashing 1`] = `
>
<button
aria-label="Turn_off_microphone"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
title="Turn_off_microphone"
type="button"
>
@@ -102,7 +102,7 @@ exports[`renders OngoingActions without crashing 1`] = `
</button>
<button
aria-label="Hold"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
title="Hold"
type="button"
>
@@ -115,7 +115,7 @@ exports[`renders OngoingActions without crashing 1`] = `
</button>
<button
aria-label="Open_Dialpad"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
title="Open_Dialpad"
type="button"
>
@@ -128,7 +128,7 @@ exports[`renders OngoingActions without crashing 1`] = `
</button>
<button
aria-label="Transfer_call"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
title="Transfer_call"
type="button"
>
@@ -166,7 +166,7 @@ exports[`renders OutgoingActions without crashing 1`] = `
>
<button
aria-label="Turn_off_microphone"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
disabled=""
title="Turn_off_microphone"
type="button"
@@ -180,7 +180,7 @@ exports[`renders OutgoingActions without crashing 1`] = `
</button>
<button
aria-label="Hold"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
disabled=""
title="Hold"
type="button"
@@ -194,7 +194,7 @@ exports[`renders OutgoingActions without crashing 1`] = `
</button>
<button
aria-label="Open_Dialpad"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
disabled=""
title="Open_Dialpad"
type="button"
@@ -208,7 +208,7 @@ exports[`renders OutgoingActions without crashing 1`] = `
</button>
<button
aria-label="Transfer_call"
- class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
+ class="rcx-box rcx-box--full rcx-button--medium-square rcx-button--icon-secondary rcx-button--square rcx-button--icon rcx-button rcx-button-group__item"
disabled=""
title="Transfer_call"
type="button"
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index c19d639a683a379dee779d91000ab963642abcca..4b1b4e7adf1f8ae0c521b5b4f6103ad3ca267b5c 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,14 @@
# @rocket.chat/web-ui-registration
+## 12.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+ - @rocket.chat/ui-contexts@12.0.0-rc.3
+ </details>
+
## 12.0.0-rc.2
### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index 7c723b6c104fc5cc685366d98b7805154a030f81..1a67d0c9a0c856f85d981ae53055e7a8b91a4cb3 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -1,6 +1,6 @@
{
"name": "@rocket.chat/web-ui-registration",
- "version": "12.0.0-rc.2",
+ "version": "12.0.0-rc.3",
"private": true,
"homepage": "https://rocket.chat",
"main": "./dist/index.js",
@@ -49,7 +49,7 @@
"peerDependencies": {
"@rocket.chat/layout": "*",
"@rocket.chat/tools": "0.2.2",
- "@rocket.chat/ui-contexts": "12.0.0-rc.2",
+ "@rocket.chat/ui-contexts": "12.0.0-rc.3",
"@tanstack/react-query": "*",
"react": "*",
"react-hook-form": "*",