fix(mongoose): fix .then() is not a function error when calling `mo…

…ngoose.connect()` multiple times Fix #9358 Fix #9335 Fix #9331
Automattic · Aug 26, 2020 · fadc813 · fadc813
1 parent 0b8c6a1
commit fadc813
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -785,7 +785,7 @@ Connection.prototype.openUri = function(uri, options, callback) {
   const promise = new Promise((resolve, reject) => {
     const client = new mongodb.MongoClient(uri, options);
     _this.client = client;
-    client.connect(function(error) {
+    client.connect((error) => {
       if (error) {
         _this.readyState = STATES.disconnected;
         return reject(error);

diff --git a/lib/index.js b/lib/index.js
@@ -336,7 +336,15 @@ Mongoose.prototype.createConnection = function(uri, options, callback) {
 Mongoose.prototype.connect = function(uri, options, callback) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
   const conn = _mongoose.connection;
-  return conn.openUri(uri, options, callback).then(() => _mongoose);
+
+  return promiseOrCallback(callback, cb => {
+    conn.openUri(uri, options, err => {
+      if (err != null) {
+        return cb(err);
+      }
+      return cb(null, _mongoose);
+    });
+  });
 };
 
 /**