Skip to content

Commit

Permalink
[signin] - Separate signin from signin-api #86
Browse files Browse the repository at this point in the history
  • Loading branch information
sachalifs committed Jun 4, 2014
1 parent cedaac7 commit e1cc718
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 42 deletions.
3 changes: 2 additions & 1 deletion lib/boot/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ app.use('/facebook-card', require('lib/facebook-card'));
* Local signin routes
*/

app.use('/signin', require('lib/signin'));
app.use('/signin', require('lib/signin-api'));

/*
* Local signup routes
Expand Down Expand Up @@ -167,4 +167,5 @@ app.use(require('lib/admin'));
app.use(require('lib/settings'));
app.use(require('lib/forgot'));
app.use(require('lib/help'));
app.use(require('lib/signin'));
app.use(require('lib/404'));
38 changes: 38 additions & 0 deletions lib/signin-api/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**
* Module dependencies.
*/

var express = require('express');
var mongoose = require('mongoose');
var t = require('t-component');
var Citizen = mongoose.model('Citizen');
var auth = Citizen.authenticate();

/**
* Exports Application
*/

var app = module.exports = express();


/**
* Define routes for SignUp module
*/

app.post('/', function(req, res, next) {
auth(req.body.email, req.body.password, function (err, citizen, info) {
if (err) {
return res.json(200, { error: t(err.message) });
};
if (!citizen) {
return res.json(200, { error: t(info.message) });
};
if (!citizen.emailValidated) {
return res.json(200, { error: t("Email not validated") });
};
req.login(citizen, function(err) {
if (err) return res.json(200, { error: t(err.message) });
return res.json(200);
});
})
});
44 changes: 3 additions & 41 deletions lib/signin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,7 @@
* Module dependencies.
*/

var express = require('express')
, mongoose = require('mongoose')
, t = require('t-component')
, Citizen = mongoose.model('Citizen')
, auth = Citizen.authenticate()
var express = require('express');
var app = module.exports = express();

;

/**
* Lazy register SignUp Application
*/

var app;

/**
* Exports Application
*/

module.exports = app = express();


/**
* Define routes for SignUp module
*/

app.post('/', function(req, res, next) {
auth(req.body.email, req.body.password, function (err, citizen, info) {
if (err) {
return res.json(200, { error: t(err.message) });
};
if (!citizen) {
return res.json(200, { error: t(info.message) });
};
if (!citizen.emailValidated) {
return res.json(200, { error: t("Email not validated") });
};
req.login(citizen, function(err) {
if (err) return res.json(200, { error: t(err.message) });
return res.json(200);
});
})
});
app.get('/signin', require('lib/layout'));

0 comments on commit e1cc718

Please sign in to comment.