From e909e0b940f946dcbf8b4436de99e015c99061a7 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 15 Jul 2024 09:35:47 -0400
Subject: [PATCH] fix: support session: null option for save() to opt out of
 automatic session option with transactionAsyncLocalStorage; backport #14744

---
 lib/model.js                   |  5 +++--
 test/docs/transactions.test.js | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/model.js b/lib/model.js
index 0e38daa8942..f649ce33651 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -289,9 +289,10 @@ Model.prototype.$__handleSave = function(options, callback) {
 
   const session = this.$session();
   const asyncLocalStorage = this[modelDbSymbol].base.transactionAsyncLocalStorage?.getStore();
-  if (!saveOptions.hasOwnProperty('session') && session != null) {
+  if (session != null) {
     saveOptions.session = session;
-  } else if (asyncLocalStorage?.session != null) {
+  } else if (!options.hasOwnProperty('session') && asyncLocalStorage?.session != null) {
+    // Only set session from asyncLocalStorage if `session` option wasn't originally passed in options
     saveOptions.session = asyncLocalStorage.session;
   }
 
diff --git a/test/docs/transactions.test.js b/test/docs/transactions.test.js
index d93ea32e60d..a6f2a501250 100644
--- a/test/docs/transactions.test.js
+++ b/test/docs/transactions.test.js
@@ -441,7 +441,7 @@ describe('transactions', function() {
       await Test.createCollection();
       await Test.deleteMany({});
 
-      const doc = new Test({ name: 'test_transactionAsyncLocalStorage' });
+      let doc = new Test({ name: 'test_transactionAsyncLocalStorage' });
       await assert.rejects(
         () => m.connection.transaction(async() => {
           await doc.save();
@@ -473,6 +473,17 @@ describe('transactions', function() {
 
       exists = await Test.exists({ name: 'bar' });
       assert.ok(!exists);
+
+      doc = new Test({ name: 'test_transactionAsyncLocalStorage' });
+      await assert.rejects(
+        () => m.connection.transaction(async() => {
+          await doc.save({ session: null });
+          throw new Error('Oops!');
+        }),
+        /Oops!/
+      );
+      exists = await Test.exists({ _id: doc._id });
+      assert.ok(exists);
     });
   });
 });