From 0db7fbcde045dd961d2085d629d0db37aa976394 Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Fri, 4 Jul 2014 19:39:52 -0400 Subject: [PATCH] WIP --- lib/api_response.js | 5 +++-- lib/app.js | 8 +++++++- lib/routes.js | 11 ++++++++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/api_response.js b/lib/api_response.js index 1ebcf4a5..09f88776 100644 --- a/lib/api_response.js +++ b/lib/api_response.js @@ -2,7 +2,7 @@ var ApiResponse = function(config) { this.config = config; - this.reponse = config.response; + this.response = config.response; this.targetVersion = config.targetVersion; this.version = config.version; }; @@ -16,7 +16,8 @@ module.exports = ApiResponse; ApiResponse.prototype.respond = function respond(err, res, statusCodeOpt) { var statusCode = statusCodeOpt || 200; if (err) return this.response.json(statusCode, this._buildErr(err)); - this.response.json(statusCode, this._buildResponse(res)); + var jsonResponse = this._buildResponse(res); + this.response.json(statusCode, jsonResponse); }; ApiResponse.prototype._buildErr = function _buildErr(err) { diff --git a/lib/app.js b/lib/app.js index 2dedc726..bc643bd8 100644 --- a/lib/app.js +++ b/lib/app.js @@ -87,7 +87,13 @@ module.exports = function (options) { }; } - routes.init(app, config, trader, authMiddleware); + routes.init({ + app: app, + lamassuConfig: config, + trader: trader, + authMiddleware: authMiddleware, + mock: options.mock + }); return server; }; diff --git a/lib/routes.js b/lib/routes.js index 76343b1f..f7f748bc 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -2,6 +2,7 @@ var _trader; var _lamassuConfig; +var _idVerifier = null; var logger = require('./logger'); var ApiResponse = require('./api_response'); @@ -102,9 +103,13 @@ var pair = function(req, res) { ); }; -exports.init = function(app, config, trader, authMiddleware) { - _lamassuConfig = config; - _trader = trader; +exports.init = function(config) { + _lamassuConfig = config.lamassuConfig; + _trader = config.trader; + + var authMiddleware = config.authMiddleware; + var app = config.app; + _idVerifier = require('lamassu-idology').factory({mock: config.mock}); app.get('/poll', authMiddleware, poll); app.post('/send', authMiddleware, send);