From f924123bd96855fdfa90382187ba1a9b7943e477 Mon Sep 17 00:00:00 2001 From: Josh Harvey Date: Sat, 5 Jul 2014 01:02:36 -0400 Subject: [PATCH] successful round trip with idology --- lib/routes.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/routes.js b/lib/routes.js index f7f748bc..c940cc50 100644 --- a/lib/routes.js +++ b/lib/routes.js @@ -14,9 +14,10 @@ var STALE_BALANCE = 180000; var API_VERSION = 1; function prepareApi(req, res) { + var targetVersion = parseInt(req.body.version || req.query.version || 0); return ApiResponse.factory({ response: res, - targetVersion: req.body.version || 0, + targetVersion: targetVersion, version: API_VERSION }); } @@ -28,7 +29,7 @@ var poll = function(req, res) { var api = prepareApi(req, res); logger.debug('poll request from: %s', fingerprint); - + // `rateRec` and `balanceRec` are both objects, so there's no danger // of misinterpreting rate or balance === 0 as 'Server initializing'. if (!rateRec || !balanceRec) { @@ -53,7 +54,8 @@ var poll = function(req, res) { rate: rate * _trader.config.exchanges.settings.commission, fiat: fiatBalance, locale: _trader.config.brain.locale, - txLimit: parseInt(_trader.config.exchanges.settings.compliance.maximum.limit, 10) + txLimit: parseInt(_trader.config.exchanges.settings.compliance.maximum.limit, 10), + idVerificationLimit: 0 // DEBUG }); }; @@ -74,7 +76,7 @@ var deviceEvent = function deviceEvent(req, res) { var idVerify = function idVerify(req, res) { var fingerprint = req.connection.getPeerCertificate().fingerprint; var api = prepareApi(req, res); - _idVerifier.idVerify(req.body, fingerprint, function (err, idResult) { + _idVerifier.verify(req.body, function (err, idResult) { api.respond(err, idResult); }); }; @@ -109,13 +111,15 @@ exports.init = function(config) { var authMiddleware = config.authMiddleware; var app = config.app; - _idVerifier = require('lamassu-idology').factory({mock: config.mock}); + _lamassuConfig.readExchangesConfig(function (err, res) { + _idVerifier = require('lamassu-idology').factory(res.exchanges.plugins.settings.idology); + }); app.get('/poll', authMiddleware, poll); app.post('/send', authMiddleware, send); app.post('/trade', authMiddleware, trade); app.post('/event', authMiddleware, deviceEvent); - app.post('/id_verify', authMiddleware, idVerify); + app.post('/verify_id', authMiddleware, idVerify); app.post('/pair', pair); return app;