feat(couchdb): extract admins

hoodiehq · Dec 21, 2015 · e8bfa73 · e8bfa73
1 parent d2f1204
commit e8bfa73
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/lib/couchdb.js b/lib/couchdb.js
@@ -16,11 +16,18 @@ var exports = module.exports = function (config, callback) {
     json: true
   })
 
-  async.waterfall([
+  async.series([
     async.apply(exports.checkVendor, config, couch),
     async.apply(exports.setConfig, couch),
-    async.apply(exports.getConfig, couch)
-  ], callback)
+    async.apply(exports.getConfig, couch),
+    async.apply(exports.getAdmins, couch)
+  ], function (err, results) {
+    if (err) return callback(err)
+
+    callback(null, _.assign({
+      admins: results[3]
+    }, results[2]))
+  })
 }
 
 exports.generatedConfig = function generatedConfig (config) {
@@ -42,7 +49,8 @@ exports.generatedConfig = function generatedConfig (config) {
 
   return {
     secret: secret,
-    authentication_db: '_users'
+    authentication_db: '_users',
+    admins: {}
   }
 }
 
@@ -102,3 +110,15 @@ exports.getConfig = function getConfig (couch, callback) {
     callback(null, _.pick(data, ['secret', 'authentication_db']))
   })
 }
+
+exports.getAdmins = function getAdmins (couch, callback) {
+  couch({
+    url: '/_config/admins'
+  }, function (err, res, data) {
+    if (err || (res && res.statusCode !== 200)) {
+      return callback(new Error('Could not retrieve CouchDB admins'))
+    }
+
+    callback(null, data)
+  })
+}
diff --git a/test/unit/couchdb.js b/test/unit/couchdb.js
@@ -27,7 +27,7 @@ test('init couchdb', function (t) {
 
     t.is(result.secret, 'foo')
     t.is(result.authentication_db, '_users')
-    t.equals(result.admins, {
+    t.same(result.admins, {
       user: 'secret'
     })
 

diff --git a/test/unit/couchdb/get-admins.js b/test/unit/couchdb/get-admins.js
@@ -22,15 +22,6 @@ test('get couch admins', function (t) {
   t.test('request succeds', function (tt) {
     var getAdmins = require('../../../lib/couchdb.js').getAdmins
 
-    tt.plan(5)
-
-    getAdmins(function (input, callback) {
-      tt.is(input.url, '/_config/admins')
-      callback(null, null, {})
-    }, function (err) {
-      tt.ok(err instanceof Error)
-    })
-
     getAdmins(function (input, callback) {
       tt.is(input.url, '/_config/admins')
       callback(null, null, {
@@ -40,6 +31,7 @@ test('get couch admins', function (t) {
       tt.error(err)
 
       tt.is(admins.user, 'secret')
+      tt.end()
     })
   })