fix: livechat agent status set to available after reactivation

.changeset/nice-ducks-shout.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed auto-availability of reactivated livechat agents; they now stay 'Not Available' until manually set to 'Available'

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

@@ -39,7 +39,7 @@ const handleDeactivateUser = async (user: IUser) => {
 
 const handleActivateUser = async (user: IUser) => {
 	if (isAgent(user) && user.username) {
-		await LivechatTyped.addAgent(user.username);
+		await LivechatTyped.afterAgentUserActivated(user);
 	}
 };
 

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

@@ -1682,6 +1682,14 @@ class LivechatClass {
 		return false;
 	}
 
+	async afterAgentUserActivated(user: IUser) {
+		if (!user.roles.includes('livechat-agent')) {
+			throw new Error('invalid-user-role');
+		}
+		await Users.setOperator(user._id, true);
+		callbacks.runAsync('livechat.onNewAgentCreated', user._id);
+	}
+
 	async addManager(username: string) {
 		check(username, String);
 

apps/meteor/tests/data/livechat/users.ts

@@ -1,5 +1,5 @@
 import { faker } from "@faker-js/faker";
-import type { IUser } from "@rocket.chat/core-typings";
+import type { ILivechatAgent, IUser } from "@rocket.chat/core-typings";
 import { IUserCredentialsHeader, password } from "../user";
 import { createUser, login } from "../users.helper";
 import { createAgent, makeAgentAvailable } from "./rooms";
@@ -24,6 +24,13 @@ export const createBotAgent = async (): Promise<{
 
 export const getRandomVisitorToken = (): string => faker.string.alphanumeric(17);
 
+export const getAgent = async (userId: string): Promise<ILivechatAgent> => {
+    const { body } = await request.get(api(`livechat/users/agent/${userId}`))
+        .set(credentials)
+        .expect(200);
+    return body.user;
+}
+
 export const removeAgent = async (userId: string): Promise<void> => {
     await request.delete(api(`livechat/users/agent/${userId}`))
         .set(credentials)

apps/meteor/tests/end-to-end/api/01-users.js

@@ -9,6 +9,8 @@ import { getCredentials, api, request, credentials, apiEmail, apiUsername, log,
 import { MAX_BIO_LENGTH, MAX_NICKNAME_LENGTH } from '../../data/constants.ts';
 import { customFieldText, clearCustomFields, setCustomFields } from '../../data/custom-fields.js';
 import { imgURL } from '../../data/interactions';
+import { createAgent, makeAgentAvailable } from '../../data/livechat/rooms';
+import { removeAgent, getAgent } from '../../data/livechat/users';
 import { updatePermission, updateSetting } from '../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../data/rooms.helper';
 import { adminEmail, preferences, password, adminUsername } from '../../data/user';
@@ -3114,6 +3116,21 @@ describe('[Users]', function () {
 
 	describe('[/users.setActiveStatus]', () => {
 		let user;
+		let agent;
+		let agentUser;
+
+		before(async () => {
+			agentUser = await createUser();
+			const agentUserCredentials = await login(agentUser.username, password);
+			await createAgent(agentUser.username);
+			await makeAgentAvailable(agentUserCredentials);
+
+			agent = {
+				user: agentUser,
+				credentials: agentUserCredentials,
+			};
+		});
+
 		before((done) => {
 			const username = `user.test.${Date.now()}`;
 			const email = `${username}@rocket.chat`;
@@ -3156,6 +3173,12 @@ describe('[Users]', function () {
 				.end(() => updatePermission('edit-other-user-active-status', ['admin']).then(done));
 			user = undefined;
 		});
+
+		after(async () => {
+			await removeAgent(agent.user._id);
+			await deleteUser(agent.user);
+		});
+
 		it('should set other user active status to false when the logged user has the necessary permission(edit-other-user-active-status)', (done) => {
 			request
 				.post(api('users.setActiveStatus'))
@@ -3484,6 +3507,39 @@ describe('[Users]', function () {
 
 			await deleteUser(testUser);
 		});
+		it('should make agents not-available when the user is deactivated', async () => {
+			await makeAgentAvailable(agent.credentials);
+			await request
+				.post(api('users.setActiveStatus'))
+				.set(credentials)
+				.send({
+					activeStatus: false,
+					userId: agent.user._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200);
+
+			const agentInfo = await getAgent(agent.user._id);
+			expect(agentInfo).to.have.property('statusLivechat', 'not-available');
+		});
+
+		it('should not make agents available when the user is activated', async () => {
+			let agentInfo = await getAgent(agent.user._id);
+			expect(agentInfo).to.have.property('statusLivechat', 'not-available');
+
+			await request
+				.post(api('users.setActiveStatus'))
+				.set(credentials)
+				.send({
+					activeStatus: true,
+					userId: agent.user._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200);
+
+			agentInfo = await getAgent(agent.user._id);
+			expect(agentInfo).to.have.property('statusLivechat', 'not-available');
+		});
 	});
 
 	describe('[/users.deactivateIdle]', () => {