feat(hapi): enable account component

lib/hapi.js

@@ -1,37 +1,32 @@
-// var _ = require('lodash')
-// var PouchDB = require('pouchdb')
+module.exports = function (config, usersDbName, callback) {
+  var database = require('./database')(config)
+  var usersDb = database(usersDbName)
 
-module.exports = function (config, usersDb, callback) {
-  // var users = new PouchDB(usersDb)
-  // users.plugin(require('pouchdb-users'))
-  // users.installUsersBehavior()
-  // .then(function () {
-  //   var defaultOpts = {
-  //     config: config,
-  //     database: require('./database')(config),
-  //     prefix: '/hoodie/account',
-  //     users: users
-  //   }
-  //
-  //   // insert below code here
-  // }, callback)
+  usersDb.constructor.plugin(require('pouchdb-users'))
 
-  callback(null, [
-    require('inert'),
-    require('h2o2')
-  ].concat([
-    require('./static'),
-    require('./http-log')
-  ].map(function (plugin) {
-    return {
-      register: plugin,
-      options: {config: config}
-    }
-  })/*, [{
-    register: require('@hoodie/server-account-node-sessions'),
-    options: defaultOpts
-  }, {
-    register: require('hoodie-server-store'),
-    options: _.defaults({prefix: '/hoodie/store'}, defaultOpts)
-  }]*/))
+  usersDb.installUsersBehavior().then(function () {
+    var options = {config, database, usersDb}
+
+    var hapiPlugins = [
+      require('h2o2'),
+      require('inert')
+    ]
+
+    var localPlugins = [
+      require('./http-log'),
+      require('./static')
+    ].map(function (register) { return {options, register} })
+
+    var hoodieCorePlugins = [{
+      options,
+      register: require('hoodie-server-account'),
+      routes: {prefix: '/hoodie/account'}
+    // }, {
+    //   options,
+    //   register: require('hoodie-server-store'),
+    //   routes: {prefix: '/hoodie/store'}
+    }]
+
+    callback(null, hapiPlugins.concat(localPlugins, hoodieCorePlugins))
+  }, callback)
 }

lib/index.js

@@ -15,6 +15,7 @@ module.exports = function (options, callback) {
     if (err) return callback(err)
 
     config.db.secret = couchConfig.secret
+    config.db.admins = couchConfig.admins
 
     server.connection({
       host: config.app.hostname,

package.json

@@ -6,23 +6,22 @@
     "url": "https://github.com/hoodiehq/hoodie-server/issues"
   },
   "dependencies": {
-    "@hoodie/server-account-node-sessions": "^1.0.0",
     "async": "^1.5.0",
     "good": "^6.4.0",
     "good-squeeze": "^2.1.0",
     "h2o2": "^5.0.0",
     "hapi": "^11.0.3",
+    "hoodie-server-account": "^2.0.1",
     "hoodie-server-store": "^1.0.1",
     "inert": "^3.1.0",
     "jsonfile": "^2.2.3",
     "lodash": "^3.10.1",
     "memdown": "^1.1.0",
     "mkdirp": "^0.5.1",
     "my-first-hoodie": "^4.0.0",
-    "nock": "^3.4.0",
     "npmlog": "^2.0.0",
     "pouchdb": "^5.1.0",
-    "pouchdb-users": "^1.0.0",
+    "pouchdb-users": "^1.0.3",
     "randomstring": "^1.1.3",
     "request": "^2.65.0",
     "require-relative": "^0.8.7"