Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…

…turbo

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [NEW] Community Edition Watermark (#25844)
  [BREAK] remove unused endpoints and restify others (#25889)
  Chore: add underscore to ddp-streamer
  [IMPROVE] VoIP admin page cleanup: remove unused settings (#25993)
  Regression: Fix micro services (#26054)
  Regression: Fix threads list (#26052)
  [NEW] VoIP Input/Output Device Selection (#25966)
  Chore: Account/Profile to TS (#25929)

apps/meteor/app/lib/server/startup/settings.ts

@@ -3210,7 +3210,6 @@ settingsRegistry.addGroup('Call_Center', function () {
 		this.add('VoIP_Enabled', false, {
 			type: 'boolean',
 			public: true,
-			alert: 'Experimental_Feature_Alert',
 			enableQuery: {
 				_id: 'Livechat_enabled',
 				value: true,
@@ -3225,22 +3224,6 @@ settingsRegistry.addGroup('Call_Center', function () {
 			},
 		});
 		this.section('Server_Configuration', function () {
-			this.add('VoIP_Server_Host', '', {
-				type: 'string',
-				public: true,
-				enableQuery: {
-					_id: 'VoIP_Enabled',
-					value: true,
-				},
-			});
-			this.add('VoIP_Server_Websocket_Port', 0, {
-				type: 'int',
-				public: true,
-				enableQuery: {
-					_id: 'VoIP_Enabled',
-					value: true,
-				},
-			});
 			this.add('VoIP_Server_Name', '', {
 				type: 'string',
 				public: true,

apps/meteor/app/livechat/imports/server/rest/departments.ts

@@ -2,7 +2,7 @@ import { isLivechatDepartmentProps } from '@rocket.chat/rest-typings';
 import { Match, check } from 'meteor/check';
 
 import { API } from '../../../../api/server';
-import { hasPermission } from '../../../../authorization/server';
+import { hasPermission, hasAtLeastOnePermission } from '../../../../authorization/server';
 import { LivechatDepartment, LivechatDepartmentAgents } from '../../../../models/server';
 import { Livechat } from '../../../server/lib/Livechat';
 import {
@@ -18,6 +18,10 @@ API.v1.addRoute(
 	{ authRequired: true, validateParams: isLivechatDepartmentProps },
 	{
 		async get() {
+			if (!hasAtLeastOnePermission(this.userId, ['view-livechat-departments', 'view-l-room'])) {
+				return API.v1.unauthorized();
+			}
+
 			const { offset, count } = this.getPaginationItems();
 			const { sort } = this.parseJsonQuery();
 
@@ -76,6 +80,10 @@ API.v1.addRoute(
 	{ authRequired: true },
 	{
 		async get() {
+			if (!hasAtLeastOnePermission(this.userId, ['view-livechat-departments', 'view-l-room'])) {
+				return API.v1.unauthorized();
+			}
+
 			check(this.urlParams, {
 				_id: String,
 			});

apps/meteor/app/livechat/server/api.js

@@ -13,5 +13,4 @@ import '../imports/server/rest/visitors.js';
 import '../imports/server/rest/visitors.ts';
 import '../imports/server/rest/dashboards.js';
 import '../imports/server/rest/queue.js';
-import '../imports/server/rest/officeHour.js';
 import '../imports/server/rest/businessHours.js';

apps/meteor/app/livechat/server/index.js

@@ -31,7 +31,6 @@ import './methods/getAgentData';
 import './methods/getAgentOverviewData';
 import './methods/getAnalyticsChartData';
 import './methods/getAnalyticsOverviewData';
-import './methods/getInitialData';
 import './methods/getNextAgent';
 import './methods/getRoutingConfig';
 import './methods/loadHistory';
@@ -61,7 +60,6 @@ import './methods/sendOfflineMessage';
 import './methods/setCustomField';
 import './methods/setDepartmentForVisitor';
 import './methods/startVideoCall';
-import './methods/startFileUploadRoom';
 import './methods/transfer';
 import './methods/webhookTest';
 import './methods/setUpConnection';

apps/meteor/client/components/CustomFieldsForm.js

@@ -112,7 +112,13 @@ const CustomFieldsAssembler = ({ formValues, formHandlers, customFields, ...prop
 		return null;
 	});
 
-export default function CustomFieldsForm({ jsonCustomFields, customFieldsData, setCustomFieldsData, onLoadFields = () => {}, ...props }) {
+export default function CustomFieldsForm({
+	jsonCustomFields = undefined,
+	customFieldsData,
+	setCustomFieldsData,
+	onLoadFields = () => {},
+	...props
+}) {
 	const accountsCustomFieldsJson = useSetting('Accounts_CustomFields');
 
 	const [customFields] = useState(() => {

apps/meteor/client/components/Omnichannel/Tags.tsx

@@ -22,7 +22,7 @@ const Tags = ({
 	const t = useTranslation();
 	const forms = useFormsSubscription() as any;
 
-	const { value: tagsResult, phase: stateTags } = useEndpointData('/v1/livechat/tags.list');
+	const { value: tagsResult, phase: stateTags } = useEndpointData('/v1/livechat/tags');
 
 	// TODO: Refactor the formsSubscription to use components instead of hooks (since the only thing the hook does is return a component)
 	const { useCurrentChatTags } = forms;

apps/meteor/client/contexts/CallContext.ts

@@ -1,5 +1,6 @@
-import type { IVoipRoom } from '@rocket.chat/core-typings';
+import type { CallStates, IVoipRoom } from '@rocket.chat/core-typings';
 import { ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-typings';
+import { Device } from '@rocket.chat/ui-contexts';
 import { createContext, useContext, useMemo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
@@ -29,6 +30,8 @@ type CallContextReady = {
 	openRoom: (rid: IVoipRoom['_id']) => void;
 	createRoom: (caller: ICallerInfo) => IVoipRoom['_id'];
 	closeRoom: (data?: { comment?: string; tags?: string[] }) => void;
+	changeAudioOutputDevice: (selectedAudioDevices: Device) => void;
+	changeAudioInputDevice: (selectedAudioDevices: Device) => void;
 };
 type CallContextError = {
 	enabled: true;
@@ -84,6 +87,16 @@ export const useCallActions = (): CallActionsType => {
 	return context.actions;
 };
 
+export const useCallerStatus = (): CallStates => {
+	const context = useContext(CallContext);
+
+	if (isCallContextReady(context)) {
+		return context.voipClient.callState;
+	}
+
+	return 'INITIAL';
+};
+
 export const useCallerInfo = (): VoIpCallerInfo => {
 	const context = useContext(CallContext);
 
@@ -188,3 +201,23 @@ export const useOpenedRoomInfo = (): CallContextReady['openedRoomInfo'] => {
 
 	return context.openedRoomInfo;
 };
+
+export const useChangeAudioOutputDevice = (): CallContextReady['changeAudioOutputDevice'] => {
+	const context = useContext(CallContext);
+
+	if (!isCallContextReady(context)) {
+		throw new Error('useChangeAudioOutputDevice only if Calls are enabled and ready');
+	}
+
+	return context.changeAudioOutputDevice;
+};
+
+export const useChangeAudioInputDevice = (): CallContextReady['changeAudioOutputDevice'] => {
+	const context = useContext(CallContext);
+
+	if (!isCallContextReady(context)) {
+		throw new Error('useChangeAudioInputDevice only if Calls are enabled and ready');
+	}
+
+	return context.changeAudioInputDevice;
+};

apps/meteor/client/hooks/useUpdateAvatar.ts

@@ -1,31 +1,20 @@
-import { IUser } from '@rocket.chat/core-typings';
+import { AvatarObject, AvatarServiceObject, AvatarReset, AvatarUrlObj, IUser } from '@rocket.chat/core-typings';
 import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
 import { useMemo, useCallback } from 'react';
 
 import { useEndpointAction } from './useEndpointAction';
 import { useEndpointUpload } from './useEndpointUpload';
 
-type AvatarUrlObj = {
-	avatarUrl: string;
-};
-
-type AvatarReset = 'reset';
-
-type AvatarServiceObject = {
-	blob: Blob;
-	contentType: string;
-	service: string;
-};
-
-type AvatarObject = AvatarReset | AvatarUrlObj | FormData | AvatarServiceObject;
-
 const isAvatarReset = (avatarObj: AvatarObject): avatarObj is AvatarReset => avatarObj === 'reset';
 const isServiceObject = (avatarObj: AvatarObject): avatarObj is AvatarServiceObject =>
 	!isAvatarReset(avatarObj) && typeof avatarObj === 'object' && 'service' in avatarObj;
 const isAvatarUrl = (avatarObj: AvatarObject): avatarObj is AvatarUrlObj =>
 	!isAvatarReset(avatarObj) && typeof avatarObj === 'object' && 'service' && 'avatarUrl' in avatarObj;
 
-export const useUpdateAvatar = (avatarObj: AvatarObject, userId: IUser['_id']): (() => void) => {
+export const useUpdateAvatar = (
+	avatarObj: AvatarObject,
+	userId: IUser['_id'],
+): (() => Promise<{ success: boolean } | null | undefined>) => {
 	const t = useTranslation();
 	const avatarUrl = isAvatarUrl(avatarObj) ? avatarObj.avatarUrl : '';