From f02012b2aed5000de983ba3bdeca234ea80fb3c0 Mon Sep 17 00:00:00 2001
From: "dionisio-bot[bot]"
 <117394943+dionisio-bot[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 15:47:39 +0000
Subject: [PATCH] fix: fingerprint auto accepted still asks for admin
 confirmation (#32254)

Co-authored-by: Debdut Chakraborty <76006232+debdutdeb@users.noreply.github.com>
---
 .changeset/shaggy-yaks-train.md     | 5 +++++
 apps/meteor/server/settings/misc.ts | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 .changeset/shaggy-yaks-train.md

diff --git a/.changeset/shaggy-yaks-train.md b/.changeset/shaggy-yaks-train.md
new file mode 100644
index 00000000000..1dbc97b4822
--- /dev/null
+++ b/.changeset/shaggy-yaks-train.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue where Rocket.Chat would ask admins to confirm fingerprint change (new workspace vs configuration update), even when `AUTO_ACCEPT_FINGERPRINT` environment variable set to `"true"`.
diff --git a/apps/meteor/server/settings/misc.ts b/apps/meteor/server/settings/misc.ts
index e04c4d6d3b8..ae837127653 100644
--- a/apps/meteor/server/settings/misc.ts
+++ b/apps/meteor/server/settings/misc.ts
@@ -40,6 +40,7 @@ const verifyFingerPrint = async function () {
 	if (process.env.AUTO_ACCEPT_FINGERPRINT === 'true') {
 		logger.info('Updating fingerprint as AUTO_ACCEPT_FINGERPRINT is true', fingerprint);
 		await updateFingerprint(fingerprint, true);
+		return;
 	}
 
 	logger.warn('Updating fingerprint as pending for admin verification', fingerprint);