why

apps/meteor/app/livechat/server/api/v1/room.ts

@@ -327,7 +327,7 @@ API.v1.addRoute(
 				throw new Error('This_conversation_is_already_closed');
 			}
 
-			if (!(await Omnichannel.isRoomEnabled(room))) {
+			if (!(await Omnichannel.isWithinMACLimit(room))) {
 				throw new Error('error-mac-limit-reached');
 			}
 
@@ -417,7 +417,7 @@ API.v1.addRoute(
 				throw new Error('error-invalid-room');
 			}
 
-			if (!(await Omnichannel.isRoomEnabled(room))) {
+			if (!(await Omnichannel.isWithinMACLimit(room))) {
 				throw new Error('error-mac-limit-reached');
 			}
 

apps/meteor/app/livechat/server/api/v1/transcript.ts

@@ -46,7 +46,7 @@ API.v1.addRoute(
 				throw new Error('error-transcript-not-requested');
 			}
 
-			if (!(await Omnichannel.isRoomEnabled(room))) {
+			if (!(await Omnichannel.isWithinMACLimit(room))) {
 				throw new Error('error-mac-limit-reached');
 			}
 

apps/meteor/app/livechat/server/api/v1/videoCall.ts

@@ -28,7 +28,7 @@ API.v1.addRoute(
 				throw new Error('invalid-room');
 			}
 
-			if (!(await Omnichannel.isRoomEnabled(room as IOmnichannelRoom))) {
+			if (!(await Omnichannel.isWithinMACLimit(room as IOmnichannelRoom))) {
 				throw new Error('error-mac-limit-reached');
 			}
 
@@ -84,7 +84,7 @@ API.v1.addRoute(
 				throw new Error('invalid-room');
 			}
 
-			if (!(await Omnichannel.isRoomEnabled(room as IOmnichannelRoom))) {
+			if (!(await Omnichannel.isWithinMACLimit(room as IOmnichannelRoom))) {
 				throw new Error('error-mac-limit-reached');
 			}
 

apps/meteor/app/livechat/server/hooks/checkMAC.ts

@@ -21,7 +21,7 @@ callbacks.add('beforeSaveMessage', async (message, room) => {
 		return message;
 	}
 
-	const canSendMessage = await Omnichannel.isRoomEnabled(room as IOmnichannelRoom);
+	const canSendMessage = await Omnichannel.isWithinMACLimit(room as IOmnichannelRoom);
 	if (!canSendMessage) {
 		throw new Error('error-mac-limit-reached');
 	}

apps/meteor/app/livechat/server/lib/Livechat.js

@@ -411,7 +411,7 @@ export const Livechat = {
 			throw new Meteor.Error('error-transcript-already-requested', 'Transcript already requested');
 		}
 
-		if (!(await Omnichannel.isRoomEnabled(room))) {
+		if (!(await Omnichannel.isWithinMACLimit(room))) {
 			throw new Error('error-mac-limit-reached');
 		}
 

apps/meteor/app/livechat/server/lib/LivechatTyped.ts

@@ -521,7 +521,7 @@ class LivechatClass {
 			throw new Error('error-invalid-room');
 		}
 
-		if (!(await Omnichannel.isRoomEnabled(room))) {
+		if (!(await Omnichannel.isWithinMACLimit(room))) {
 			throw new Error('error-mac-limit-reached');
 		}
 

apps/meteor/app/livechat/server/lib/QueueManager.ts

@@ -22,7 +22,7 @@ export const queueInquiry = async (inquiry: ILivechatInquiryRecord, defaultAgent
 
 	await callbacks.run('livechat.beforeRouteChat', inquiry, inquiryAgent);
 	const room = await LivechatRooms.findOneById(inquiry.rid, { projection: { v: 1 } });
-	if (!room || !(await Omnichannel.isRoomEnabled(room))) {
+	if (!room || !(await Omnichannel.isWithinMACLimit(room))) {
 		logger.error({ msg: 'MAC limit reached, not routing inquiry', inquiry });
 		// We'll queue these inquiries so when new license is applied, they just start rolling again
 		// Minimizing disruption

apps/meteor/app/livechat/server/lib/RoutingManager.ts

@@ -178,7 +178,7 @@ export const RoutingManager: Routing = {
 			return false;
 		}
 
-		if (!(await Omnichannel.isRoomEnabled(room))) {
+		if (!(await Omnichannel.isWithinMACLimit(room))) {
 			throw new Error('error-mac-limit-reached');
 		}
 
@@ -269,7 +269,7 @@ export const RoutingManager: Routing = {
 	},
 
 	async transferRoom(room, guest, transferData) {
-		if (!(await Omnichannel.isRoomEnabled(room))) {
+		if (!(await Omnichannel.isWithinMACLimit(room))) {
 			throw new Error('error-mac-limit-reached');
 		}
 

apps/meteor/app/livechat/server/methods/returnAsInquiry.ts

@@ -30,7 +30,7 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		if (!(await Omnichannel.isRoomEnabled(room))) {
+		if (!(await Omnichannel.isWithinMACLimit(room))) {
 			throw new Meteor.Error('error-mac-limit-reached', 'MAC limit reached', { method: 'livechat:returnAsInquiry' });
 		}
 

apps/meteor/app/livechat/server/methods/takeInquiry.ts

@@ -50,7 +50,7 @@ export const takeInquiry = async (
 	}
 
 	const room = await LivechatRooms.findOneById(inquiry.rid);
-	if (!room || !(await Omnichannel.isRoomEnabled(room))) {
+	if (!room || !(await Omnichannel.isWithinMACLimit(room))) {
 		throw new Error('error-mac-limit-reached');
 	}
 

apps/meteor/app/livechat/server/methods/transfer.ts

@@ -50,7 +50,7 @@ Meteor.methods<ServerMethods>({
 			throw new Meteor.Error('room-closed', 'Room closed', { method: 'livechat:transfer' });
 		}
 
-		if (!(await Omnichannel.isRoomEnabled(room))) {
+		if (!(await Omnichannel.isWithinMACLimit(room))) {
 			throw new Meteor.Error('error-mac-limit-reached', 'MAC limit reached', { method: 'livechat:transfer' });
 		}
 

apps/meteor/client/hooks/useLicense.ts

@@ -1,13 +1,12 @@
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
 import type { OperationResult } from '@rocket.chat/rest-typings';
-import { useEndpoint, usePermission, useSingleStream } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSingleStream } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { useEffect } from 'react';
 
 export const useLicense = (): UseQueryResult<OperationResult<'GET', '/v1/licenses.info'>> => {
 	const getLicenses = useEndpoint('GET', '/v1/licenses.info');
-	const canViewLicense = usePermission('view-privileged-setting');
 
 	const queryClient = useQueryClient();
 
@@ -26,9 +25,6 @@ export const useLicense = (): UseQueryResult<OperationResult<'GET', '/v1/license
 	return useQuery(
 		['licenses', 'getLicenses'],
 		() => {
-			if (!canViewLicense) {
-				throw new Error('unauthorized api call');
-			}
 			return getLicenses({});
 		},
 		{

apps/meteor/server/services/omnichannel/service.ts

@@ -61,12 +61,8 @@ export class OmnichannelService extends ServiceClassInternal implements IOmnicha
 		return this.queueWorker;
 	}
 
-	async isRoomEnabled(room: AtLeast<IOmnichannelRoom, 'v'>): Promise<boolean> {
+	async isWithinMACLimit(room: AtLeast<IOmnichannelRoom, 'v'>): Promise<boolean> {
 		const currentMonth = moment.utc().format('YYYY-MM');
 		return room.v?.activity?.includes(currentMonth) || !(await License.shouldPreventAction('monthlyActiveContacts'));
 	}
-
-	async checkMACLimit(): Promise<boolean> {
-		return !(await License.shouldPreventAction('monthlyActiveContacts'));
-	}
 }

ee/packages/license/src/token.ts

@@ -5,7 +5,7 @@ import { verify, sign, getPairs } from '@rocket.chat/jwt';
 import type { ILicenseV3 } from './definition/ILicenseV3';
 
 const PUBLIC_LICENSE_KEY_V2 =
-	'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUFxV1Nza2Q5LzZ6Ung4a3lQY2ljcwpiMzJ3Mnd4VnV3N3lCVDk2clEvOEQreU1lQ01POXdTU3BIYS85bkZ5d293RXRpZ3B0L3dyb1BOK1ZHU3didHdQCkZYQmVxRWxCbmRHRkFsODZlNStFbGlIOEt6L2hHbkNtSk5tWHB4RUsyUkUwM1g0SXhzWVg3RERCN010eC9pcXMKY2pCL091dlNCa2ppU2xlUzdibE5JVC9kQTdLNC9DSjNvaXUwMmJMNEV4Y2xDSGVwenFOTWVQM3dVWmdweE9uZgpOT3VkOElYWUs3M3pTY3VFOEUxNTdZd3B6Q0twVmFIWDdaSmY4UXVOc09PNVcvYUlqS2wzTDYyNjkrZUlPRXJHCndPTm1hSG56Zmc5RkxwSmh6Z3BPMzhhVm43NnZENUtLakJhaldza1krNGEyZ1NRbUtOZUZxYXFPb3p5RUZNMGUKY0ZXWlZWWjNMZWg0dkVNb1lWUHlJeng5Nng4ZjIveW1QbmhJdXZRdjV3TjRmeWVwYTdFWTVVQ2NwNzF6OGtmUAo0RmNVelBBMElEV3lNaWhYUi9HNlhnUVFaNEdiL3FCQmh2cnZpSkNGemZZRGNKZ0w3RmVnRllIUDNQR0wwN1FnCnZMZXZNSytpUVpQcnhyYnh5U3FkUE9rZ3VyS2pWclhUVXI0QTlUZ2lMeUlYNVVsSnEzRS9SVjdtZk9xWm5MVGEKU0NWWEhCaHVQbG5DR1pSMDFUb1RDZktoTUcxdTBDRm5MMisxNWhDOWZxT21XdjlRa2U0M3FsSjBQZ0YzVkovWAp1eC9tVHBuazlnbmJHOUpIK21mSDM5Um9GdlROaW5Zd1NNdll6dXRWT242OXNPemR3aERsYTkwbDNBQ2g0eENWCks3Sk9YK3VIa29OdTNnMmlWeGlaVU0wQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=';
+	'-----BEGIN PUBLIC KEY-----MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4PZJT08Moo8nKT9eDFYfXkhuAbuhOJyXW8aqGU6iSKGrheIt0Z9FVpY4Wkf/BGUmlCCXTIZEGlixZtMWbHVBfnKgdG285lLufGME1lb7QQi8li4Ij9OcAYf1xdVeCrUrBCYxKqyycqu1AjzJSr4b6y2rWIU3oz1sfD8daDKUOLLlAyeYvlmCAcJdGkVyMr6bJnN418T0lNrl2CCrWq8lV/JsLciuo0TGBCHS2SdNjKmDjKA7MRufPcMVjb4oSmGbNBcTm68/l1SP+bnl00EnPAgD1iunlxba1KgWGXINqB2koFkbbH2VAiztX1Z7MERhEGz7BStXGBNFtpdGrhSzUQIDAQAB-----END PUBLIC KEY-----';
 
 const PUBLIC_LICENSE_KEY_V3 = PUBLIC_LICENSE_KEY_V2;
 

packages/core-services/src/types/IOmnichannelService.ts

@@ -4,6 +4,5 @@ import type { IServiceClass } from './ServiceClass';
 
 export interface IOmnichannelService extends IServiceClass {
 	getQueueWorker(): IOmnichannelQueue;
-	isRoomEnabled(_room: AtLeast<IOmnichannelRoom, 'v'>): Promise<boolean>;
-	checkMACLimit(): Promise<boolean>;
+	isWithinMACLimit(_room: AtLeast<IOmnichannelRoom, 'v'>): Promise<boolean>;
 }