fix(data-service, database-model, collection-model): Always merge db/colls from privileges into listDatabases/listCollections command result (#2579)

* fix(data-service, database-model, collection-model): Always merge db/colls from privileges into listDatabases/listCollections command result

* fix(data-service): Don't return databases with no name from listDatabases

Author: gribnoysup

packages/collection-model/lib/model.js

@@ -72,13 +72,6 @@ const CollectionCollection = AmpersandCollection.extend({
    * @returns {Promise<void>}
    */
   async fetch({ dataService, fetchInfo = true }) {
-    const listCollectionsAsync = promisify(
-      dataService.listCollections.bind(dataService)
-    );
-    const listCollectionsNameOnlyAsync = promisify(
-      dataService.listCollectionsNamesOnly.bind(dataService)
-    );
-
     const databaseName = this.parent && this.parent.getId();
 
     if (!databaseName) {
@@ -87,20 +80,11 @@ const CollectionCollection = AmpersandCollection.extend({
       );
     }
 
-    let collections = [];
-
-    // When trying to fetch additional information about collections during
-    // collection list fetch we want to fallback to the nameOnly method that
-    // requires less privileges in case user is missing some required ones
-    if (fetchInfo) {
-      try {
-        collections = await listCollectionsAsync(databaseName, {});
-      } catch (e) {
-        collections = await listCollectionsNameOnlyAsync(databaseName);
-      }
-    } else {
-      collections = await listCollectionsNameOnlyAsync(databaseName);
-    }
+    const collections = await dataService.listCollections(
+      databaseName,
+      {},
+      { nameOnly: !fetchInfo }
+    );
 
     this.set(
       collections.filter((coll) => {

packages/compass-app-stores/src/stores/instance-store.spec.js

@@ -24,13 +24,11 @@ describe('InstanceStore [Store]', () => {
       instance() {
         return Promise.resolve(instanceInfo);
       },
-      listDatabases(_opts, cb) {
-        cb(null, []);
-        return;
+      listDatabases() {
+        return Promise.resolve([]);
       },
-      listCollections(_dbName, cb) {
-        cb(null, []);
-        return;
+      listCollections() {
+        return Promise.resolve([]);
       }
     };
   }