Merge pull request #753 from rjvandoesburg/master

Pass credentials as parameters

Author: jenssegers

src/Jenssegers/Mongodb/Connection.php

@@ -136,6 +136,14 @@ protected function createConnection($dsn, array $config, array $options)
             $driverOptions = $config['driver_options'];
         }
 
+        // Check if the credentials are not already set in the options
+        if (!isset($options['username']) && isset($config['username'])) {
+            $options['username'] = $config['username'];
+        }
+        if (!isset($options['password']) && isset($config['password'])) {
+            $options['password'] = $config['password'];
+        }
+
         return new Client($dsn, $options, $driverOptions);
     }
 
@@ -175,20 +183,7 @@ protected function getDsn(array $config)
             }
         }
 
-        // The database name needs to be in the connection string, otherwise it will
-        // authenticate to the admin database, which may result in permission errors.
-        $auth = '';
-        if (! empty($username)) {
-            $auth .= $username;
-        }
-        if (! empty($password)) {
-            $auth .= ':' . urlencode($password);
-        }
-        if ($auth) {
-            $auth .= '@';
-        }
-
-        return "mongodb://" . $auth . implode(',', $hosts) . "/{$database}";
+        return "mongodb://" . implode(',', $hosts) . "/{$database}";
     }
 
     /**