From 8ba196a152fe092c4edb9580be605c4a04feb8ed Mon Sep 17 00:00:00 2001 From: ChangHyun Lee Date: Wed, 15 Mar 2017 18:27:46 +0900 Subject: [PATCH] [TIC-Web] fix the query of session - fix the callback Change-Id: Ib1e043ae0c1800831b1d09b7aaf53df7cf0c10b2 Signed-off-by: ChangHyun Lee --- controller/dbquery.js | 11 +---------- controller/session.js | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/controller/dbquery.js b/controller/dbquery.js index 4c8b5fb..60f9683 100644 --- a/controller/dbquery.js +++ b/controller/dbquery.js @@ -418,15 +418,6 @@ mariadb.getUser = function getUser(query, success, error) { * @desc user check */ mariadb.hasUser = function hasUser(query, success, error) { - function onSuccess(err, rows) { - if (err) { - logger.error(err); - error(error); - } else { - success(rows); - } - } - var queryString = _.template(_.join(this.queries['hasUser'], ''))({ userEmail: query.email }); @@ -434,7 +425,7 @@ mariadb.hasUser = function hasUser(query, success, error) { logger.info('hasUser: query = ' + queryString); // call - this.doQuery(queryString).then(onSuccess); + this.doQuery(queryString).then(success); }; /** diff --git a/controller/session.js b/controller/session.js index 21a5ad1..deb96ac 100644 --- a/controller/session.js +++ b/controller/session.js @@ -28,7 +28,7 @@ Session.prototype.postSession = function(req, res) { email: req.body.email }, function success(result) { // email validation - if (result[0].count !== '0') { + if (result.result[0].count !== '0') { logger.info('invalid password: ' + req.body.password); res.json({ result: STATUS.FAIL, -- 2.7.4