From 60d2019908e21e6269e497c583b63661114cac69 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 23 Dec 2025 00:36:18 -0300 Subject: [PATCH] chore: update version check for user audit deprecation handling --- .../meteor/app/lib/server/functions/saveUser/saveUser.ts | 9 ++++----- apps/meteor/server/lib/shouldBreakInVersion.ts | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts b/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts index 6665177794e..b727867b1e8 100644 --- a/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts +++ b/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts @@ -235,16 +235,15 @@ const _saveUser = (session?: ClientSession) => return true; }; -const isBroken = shouldBreakInVersion('8.0.0'); +const isBroken = shouldBreakInVersion('9.0.0'); export const saveUser = (() => { - if (isBroken) { - throw new Error('DEBUG_DISABLE_USER_AUDIT flag is deprecated and should be removed'); - } - if (!process.env.DEBUG_DISABLE_USER_AUDIT) { return wrapInSessionTransaction(_saveUser); } + if (isBroken) { + throw new Error('DEBUG_DISABLE_USER_AUDIT flag is deprecated and should be removed'); + } const saveUserNoSession = _saveUser(); return function saveUser(userId: IUser['_id'], userData: SaveUserData, _options?: any) { return saveUserNoSession(userId, userData); diff --git a/apps/meteor/server/lib/shouldBreakInVersion.ts b/apps/meteor/server/lib/shouldBreakInVersion.ts index 2ba8c71c31e..ae41fd42c2b 100644 --- a/apps/meteor/server/lib/shouldBreakInVersion.ts +++ b/apps/meteor/server/lib/shouldBreakInVersion.ts @@ -1,5 +1,7 @@ import semver from 'semver'; +import type { DeprecationLoggerNextPlannedVersion } from '../../app/lib/server/lib/deprecationWarningLogger'; import { Info } from '../../app/utils/rocketchat.info'; -export const shouldBreakInVersion = (version: string) => semver.gte(Info.version, version); +export const shouldBreakInVersion = (version: DeprecationLoggerNextPlannedVersion) => + Boolean(semver.gte(Info.version, version) && !process.env.TEST_MODE);