Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 b226232b0 -> ed87f8e86
# ignite-843 WIP Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ed87f8e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed87f8e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed87f8e8 Branch: refs/heads/ignite-843 Commit: ed87f8e864bc3b9a871462b72813dc3ade5624b3 Parents: b226232 Author: Andrey <anovi...@gridgain.com> Authored: Mon May 25 08:48:45 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon May 25 08:48:45 2015 +0700 ---------------------------------------------------------------------- modules/webconfig/nodejs/app.js | 1 - .../public/javascripts/controllers/common.js | 5 ---- modules/webconfig/nodejs/routes/auth.js | 30 ++++---------------- modules/webconfig/nodejs/views/error.jade | 2 +- 4 files changed, 7 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed87f8e8/modules/webconfig/nodejs/app.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/app.js b/modules/webconfig/nodejs/app.js index 6e2117b..186b352 100644 --- a/modules/webconfig/nodejs/app.js +++ b/modules/webconfig/nodejs/app.js @@ -11,7 +11,6 @@ var clustersRouter = require('./routes/clusters'); var authRouter = require('./routes/auth'); var passport = require('passport'); -var LocalStrategy = require('passport-local').Strategy; var db = require('./db'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed87f8e8/modules/webconfig/nodejs/public/javascripts/controllers/common.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/common.js b/modules/webconfig/nodejs/public/javascripts/controllers/common.js index b1a0eaa..0e1e388 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/common.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/common.js @@ -28,10 +28,5 @@ configuratorModule.controller('auth', ['$scope', '$modal', '$http', function($sc $scope.message = data; }); } - - $http.post('/rest/auth/login', user_info) - .error(function (data) { - $scope.message = data; - }); }; }]); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed87f8e8/modules/webconfig/nodejs/routes/auth.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/routes/auth.js b/modules/webconfig/nodejs/routes/auth.js index 1ac7a86..49b6e11 100644 --- a/modules/webconfig/nodejs/routes/auth.js +++ b/modules/webconfig/nodejs/routes/auth.js @@ -8,19 +8,15 @@ router.post('/register', function(req, res, next) { var account = new db.Account(req.body); - db.Account.register(account, req.body.password, function(err) { - if (err) { - console.log('error while user register!', err); - + db.Account.register(account, req.body.password, function(err, user) { + if (err) return next(err); - } - - console.log('user registered!'); - - passport.authenticate('local')(req, res, function () { + req.logIn(user, {}, function(err) { + if (err) + return next(err); - res.redirect('/clusters'); + res.send(user); }); }); }); @@ -28,20 +24,6 @@ router.post('/register', function(req, res, next) { router.post('/login', passport.authenticate('local', function(req, res) { req.redirect('/clusters'); })); -// -//router.post('/register', function(req, res, next) { -// var user = new db.Account(req.body); -// -// user.save(function(err) { -// return err -// ? next(err) -// : req.logIn(user, function(err) { -// return err -// ? next(err) -// : res.redirect('/clusters'); -// }); -// }); -//}); router.get('/logout', function(req, res) { req.logout(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed87f8e8/modules/webconfig/nodejs/views/error.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/error.jade b/modules/webconfig/nodejs/views/error.jade index 51ec12c..c524855 100644 --- a/modules/webconfig/nodejs/views/error.jade +++ b/modules/webconfig/nodejs/views/error.jade @@ -1,6 +1,6 @@ extends layout -block content +block container h1= message h2= error.status pre #{error.stack}
