fix: validation on bot field used by js.sdk (#34214)

RocketChat · Dec 20, 2024 · 0fce342 · 0fce342
1 parent de793a8
commit 0fce342
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/apps/meteor/app/lib/server/methods/sendMessage.ts b/apps/meteor/app/lib/server/methods/sendMessage.ts
@@ -132,7 +132,7 @@ Meteor.methods<ServerMethods>({
 			ts: Match.Maybe(Date),
 			t: Match.Maybe(String),
 			otrAck: Match.Maybe(String),
-			bot: Match.Maybe(Boolean),
+			bot: Match.Maybe(Object),
 			content: Match.Maybe(Object),
 			e2e: Match.Maybe(String),
 			e2eMentions: Match.Maybe(Object),

diff --git a/apps/meteor/client/components/message/MessageHeader.tsx b/apps/meteor/client/components/message/MessageHeader.tsx
@@ -72,7 +72,7 @@ const MessageHeader = ({ message }: MessageHeaderProps): ReactElement => {
 					</>
 				)}
 			</MessageNameContainer>
-			{shouldShowRolesList && <MessageRoles roles={roles} isBot={message.bot} />}
+			{shouldShowRolesList && <MessageRoles roles={roles} isBot={!!message.bot} />}
 			<MessageTimestamp id={`${message._id}-time`} title={formatDateAndTime(message.ts)}>
 				{formatTime(message.ts)}
 			</MessageTimestamp>

diff --git a/apps/meteor/tests/end-to-end/api/methods.ts b/apps/meteor/tests/end-to-end/api/methods.ts
@@ -2082,6 +2082,32 @@ describe('Meteor.methods', () => {
 				})
 				.end(done);
 		});
+
+		it('should accept message sent by js.SDK', (done) => {
+			void request
+				.post(methodCall('sendMessage'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'sendMessage',
+						params: [{ rid, msg: 'test message', bot: { i: 'js.SDK' } }],
+						id: 1000,
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+
+					const data = JSON.parse(res.body.message);
+
+					expect(data).to.have.a.property('result').that.is.an('object');
+					expect(data.result).to.have.a.property('bot').that.is.an('object');
+					expect(data.result.bot).to.have.a.property('i', 'js.SDK');
+				})
+				.end(done);
+		});
 	});
 
 	describe('[@updateMessage]', () => {

diff --git a/packages/core-typings/src/IMessage/IMessage.ts b/packages/core-typings/src/IMessage/IMessage.ts
@@ -200,7 +200,7 @@ export interface IMessage extends IRocketChatRecord {
 
 	private?: boolean;
 	/* @deprecated */
-	bot?: boolean;
+	bot?: Record<string, any>;
 	sentByEmail?: boolean;
 	webRtcCallEndTs?: Date;
 	role?: string;