Merge pull request #1527 from cblanco-libelium/master

[Fix] Parse authSource variable into mongo url string
telefonicaid · Nov 14, 2023 · 63d9bbd · 63d9bbd
2 parents 95435fd + 1557dde
commit 63d9bbd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -14,3 +14,4 @@
 - Fix: null values arithmetics in JEXL expressions (#1440)
 - Fix: remove mongo `DeprecationWarning: current Server Discovery and Monitoring engine is deprecated` by setting `useUnifiedTopology = true`
 - Upgrade mongodb dev dep from 4.17.0 to 4.17.1
+- Fix: mongodb.authSource / IOTA_MONGO_AUTH_SOURCE was not correctly supported (#1526)
diff --git a/lib/model/dbConn.js b/lib/model/dbConn.js
@@ -210,16 +210,6 @@ function configureDb(callback) {
                 options.replicaSet = currentConfig.mongodb.replicaSet;
             }
 
-            if (currentConfig.mongodb.user && currentConfig.mongodb.password) {
-                options.auth = {};
-                options.auth.user = currentConfig.mongodb.user;
-                options.auth.password = currentConfig.mongodb.password;
-            }
-
-            if (currentConfig.mongodb.authSource) {
-                options.authSource = currentConfig.mongodb.authSource;
-            }
-
             if (currentConfig.mongodb.ssl) {
                 options.ssl = currentConfig.mongodb.ssl;
             }
@@ -228,6 +218,20 @@ function configureDb(callback) {
                 options.extraArgs = currentConfig.mongodb.extraArgs;
             }
 
+            if (currentConfig.mongodb.user && currentConfig.mongodb.password) {
+                options.auth = {};
+                options.auth.user = currentConfig.mongodb.user;
+                options.auth.password = currentConfig.mongodb.password;
+                // authSource only applies if auth is set
+                if (currentConfig.mongodb.authSource) {
+                    // Overload extraArgs if it was set
+                    options.extraArgs = {
+                        ...options.extraArgs,
+                        authSource: currentConfig.mongodb.authSource
+                    };
+                }
+            }
+
             init(config.getConfig().mongodb.host, dbName, port, options, callback);
         }
     } else {

diff --git a/test/unit/mongodb/mongodb-connectionoptions-test.js b/test/unit/mongodb/mongodb-connectionoptions-test.js
@@ -173,7 +173,6 @@ describe('dbConn.configureDb', function () {
                 expected: {
                     url: 'mongodb://example.com:27017/' + dbConn.DEFAULT_DB_NAME,
                     options: {
-                        authSource: 'admin',
                         useNewUrlParser: true,
                         useUnifiedTopology: true
                     }
@@ -190,14 +189,13 @@ describe('dbConn.configureDb', function () {
                     authSource: 'admin'
                 },
                 expected: {
-                    url: 'mongodb://user01:[email protected]:98765/examples',
+                    url: 'mongodb://user01:[email protected]:98765/examples?authSource=admin',
                     options: {
                         replicaSet: 'rs0',
                         auth: {
                             user: 'user01',
                             password: 'pass01'
                         },
-                        authSource: 'admin',
                         useNewUrlParser: true,
                         useUnifiedTopology: true
                     }
@@ -308,14 +306,13 @@ describe('dbConn.configureDb', function () {
                     unknownparam: 'unknown'
                 },
                 expected: {
-                    url: 'mongodb://user01:[email protected]:98765/examples?retryWrites=true&readPreference=nearest&w=majority',
+                    url: 'mongodb://user01:[email protected]:98765/examples?retryWrites=true&readPreference=nearest&w=majority&authSource=admin',
                     options: {
                         replicaSet: 'rs0',
                         auth: {
                             user: 'user01',
                             password: 'pass01'
                         },
-                        authSource: 'admin',
                         ssl: true,
                         useNewUrlParser: true,
                         useUnifiedTopology: true