From 821cb72bb71ef9825afd8a007558da7f3cb91523 Mon Sep 17 00:00:00 2001 From: "dionisio-bot[bot]" <117394943+dionisio-bot[bot]@users.noreply.github.com> Date: Tue, 18 Nov 2025 02:46:51 +0000 Subject: [PATCH] fix: improves how code access user-agent in the headers (#37540) Co-authored-by: Lucas Pelegrino <16467257+lucas-a-pelegrino@users.noreply.github.com> --- .changeset/healthy-rabbits-sip.md | 5 +++++ apps/meteor/ee/server/lib/deviceManagement/session.ts | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 .changeset/healthy-rabbits-sip.md diff --git a/.changeset/healthy-rabbits-sip.md b/.changeset/healthy-rabbits-sip.md new file mode 100644 index 00000000000..5207f424628 --- /dev/null +++ b/.changeset/healthy-rabbits-sip.md @@ -0,0 +1,5 @@ +--- +"@rocket.chat/meteor": patch +--- + +Fixes an issue where `user-agent` is not properly extracted from the DDP connection headers diff --git a/apps/meteor/ee/server/lib/deviceManagement/session.ts b/apps/meteor/ee/server/lib/deviceManagement/session.ts index 23632257eaa..e985d7d60c4 100644 --- a/apps/meteor/ee/server/lib/deviceManagement/session.ts +++ b/apps/meteor/ee/server/lib/deviceManagement/session.ts @@ -3,7 +3,6 @@ import { Users } from '@rocket.chat/models'; import { Accounts } from 'meteor/accounts-base'; import { Meteor } from 'meteor/meteor'; import moment from 'moment'; -import type { Headers } from 'node-fetch'; import { UAParser } from 'ua-parser-js'; import * as Mailer from '../../../../app/mailer/server/api'; @@ -67,9 +66,9 @@ export const listenSessionLogin = () => { username, emails: [{ address: email }], } = user; - // TODO: Find why the httpheaders is being casted to IncomingHttpHeaders instead of Headers - const userAgentString = connection?.httpHeaders && (connection.httpHeaders as unknown as Headers).get('user-agent'); - const { browser, os, device, cpu, app } = await uaParser(userAgentString || ''); + + const userAgentString = connection?.httpHeaders?.['user-agent'] ?? ''; + const { browser, os, device, cpu, app } = await uaParser(userAgentString); const mailData = { name,