do auth server again, good practice (#39)

auth-server.js

@@ -1,36 +1,13 @@
-var path = require('path')
-var Server = require('dat.land/server')
-var initDb = require('dat.land/server/database/init')
-var rimraf = require('rimraf')
+var createServer = require('./tests/helpers/auth-server')
 
-var config = {
-  township: {
-    secret: 'very secret code',
-    db: path.join(__dirname, 'test-township.db')
-  },
-  db: {
-    dialect: 'sqlite3',
-    connection: { filename: path.join(__dirname, 'test-sqlite.db') },
-    useNullAsDefault: true
-  },
-  whitelist: false,
-  port: process.env.PORT || 8888
-}
-
-initDb(config.db, function (err, db) {
+createServer(process.env.PORT || 8888, function (err, server, closeServer) {
   if (err) throw err
-  const server = Server(config, db)
-  server.listen(config.port, function () {
-    console.log('listening', config.port)
-  })
 
   process.on('exit', close)
   process.on('SIGINT', close)
 
   function close (cb) {
-    server.close(function () {
-      rimraf.sync(config.township.db)
-      rimraf.sync(config.db.connection.filename)
+    closeServer(function () {
       process.exit()
     })
   }

lib/commands/auth/login.js

@@ -36,7 +36,7 @@ function login (opts) {
     client.login({
       email: user.email,
       password: user.password
-    }, function (err) {
+    }, function (err, resp, body) {
       if (err) ui.exitErr(err)
       console.log('Logged in successfully.')
       process.exit(0)

lib/township.js

@@ -12,13 +12,6 @@ module.exports = function (opts) {
     // xtend doesn't overwrite when key is present but undefined
     // If we want a default, make sure it's not going to passed as undefined
   }
-  if (!opts.server || opts['use-routes']) {
-    defaults.routes = {
-      register: '/auth/v1/register',
-      login: '/auth/v1/login',
-      updatePassword: '/auth/v1/updatepassword'
-    }
-  }
   var options = xtend(defaults, townshipOpts)
   return TownshipClient(options)
 }

package.json

@@ -30,11 +30,12 @@
     "rimraf": "^2.5.4",
     "status-logger": "^3.0.0",
     "subcommand": "^2.0.4",
-    "township-client": "^1.2.1",
+    "township-client": "^1.3.1",
     "xtend": "^4.0.1"
   },
   "devDependencies": {
     "appa": "^5.0.0",
+    "dat-land": "datproject/datfolder",
     "hypercore": "^4.15.1",
     "hyperdiscovery": "^1.0.1",
     "memdb": "^1.3.1",

tests/auth.js

@@ -9,13 +9,14 @@ var dat = path.resolve(path.join(__dirname, '..', 'bin', 'cli.js'))
 var baseTestDir = help.testFolder()
 
 var port = process.env.PORT || 3000
-var SERVER = 'http://localhost:' + port
+var SERVER = 'http://localhost:' + port + '/api/v1'
 var config = path.join(__dirname, '.datrc-test')
 var opts = ' --server=' + SERVER + ' --config=' + config
 
 dat += opts
 
-authServer(port, function (server) {
+authServer(port, function (err, server, closeServer) {
+  if (err) throw err
   test('auth - whoami works when not logged in', function (t) {
     var cmd = dat + ' whoami '
     var st = spawn(t, cmd, {cwd: baseTestDir})
@@ -94,7 +95,7 @@ authServer(port, function (server) {
   })
 
   test.onFinish(function () {
-    server.close(function () {
+    closeServer(function () {
       fs.unlink(config, function () {
         // done!
       })

tests/helpers/auth-server.js

@@ -1,33 +1,41 @@
-var memdb = require('memdb')
-var http = require('http')
-var createAppa = require('appa')
-var township = require('township')
+var path = require('path')
+var Server = require('dat.land/server')
+var initDb = require('dat.land/server/database/init')
+var rimraf = require('rimraf')
 
 module.exports = createServer
 
 function createServer (port, cb) {
-  var app = createAppa({log: {level: 'silent'}})
-  var db = memdb()
-  var ship = township({secret: 'test'}, db)
+  var config = {
+    township: {
+      secret: 'very secret code',
+      db: path.join(__dirname, '..', 'test-township.db')
+    },
+    db: {
+      dialect: 'sqlite3',
+      connection: { filename: path.join(__dirname, '..', 'test-sqlite.db') },
+      useNullAsDefault: true
+    },
+    whitelist: false,
+    port: port || 8888
+  }
 
-  app.on('/register', function (req, res, ctx) {
-    // appa provides `ctx` for us in the way we want out of the box
-    ship.register(req, res, ctx, function (err, code, data) {
-      if (err) return app.error(res, code, err.message)
-      app.send(res, code, data)
-    })
-  })
+  initDb(config.db, function (err, db) {
+    if (err) return cb(err)
 
-  app.on('/login', function (req, res, ctx) {
-    // appa provides `ctx` for us in the way we want out of the box
-    ship.login(req, res, ctx, function (err, code, data) {
-      if (err) return app.error(res, code, err.message)
-      app.send(res, code, data)
+    const server = Server(config, db)
+    server.listen(config.port, function () {
+      console.log('listening', config.port)
     })
-  })
 
-  var server = http.createServer(app)
-  server.listen(port, function () {
-    cb(server)
+    cb(null, server, close)
+
+    function close (cb) {
+      server.close(function () {
+        rimraf.sync(config.township.db)
+        rimraf.sync(config.db.connection.filename)
+        process.exit()
+      })
+    }
   })
 }