sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-22 21:57:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

auth bug fixes

Browse source
This commit is contained in:
Tyler Renelle 2013-09-04 00:20:49 -04:00
parent 8e75ecf7cc
commit 4333d055e5
5 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
package.json
View file

@ -29,7 +29,8 @@
"bower": "~1.2.4",
"nib": "~1.0.1",
"jade": "~0.35.0",
"passport": "~0.1.17"
"passport": "~0.1.17",
"validator": "~1.5.1"
},
"private": true,
"subdomain": "habitrpg",

6
src/controllers/auth.js
View file

@ -1,5 +1,9 @@
var passport = require('passport');
var _ = require('lodash');
var validator = require('validator');
var check = validator.check;
var sanitize = validator.sanitize;
var passport = require('passport');
var helpers = require('habitrpg-shared/script/helpers');
var async = require('async');
var derbyAuthUtil = require('derby-auth/utils');
var User = require('../models/user').model;

2
src/controllers/user.js
View file

@ -9,7 +9,7 @@ var async = require('async');
var algos = require('habitrpg-shared/script/algos');
var helpers = require('habitrpg-shared/script/helpers');
var items = require('habitrpg-shared/script/items');
var validator = require('derby-auth/node_modules/validator');
var validator = require('validator');
var check = validator.check;
var sanitize = validator.sanitize;
var User = require('./../models/user').model;

7
src/routes/api.js
View file

@ -23,13 +23,6 @@ router.get('/status', function(req, res) {
});
});
/* auth.auth*/
auth.setupPassport(router); //FIXME make this consistent with the others
router.post('/register', auth.registerUser);
router.post('/user/auth/local', auth.loginLocal);
router.post('/user/auth/facebook', auth.loginFacebook);
/* Scoring*/
router.post('/user/task/:id/:direction', auth.auth, cron, user.scoreTask);
router.post('/user/tasks/:id/:direction', auth.auth, cron, user.scoreTask);

6
src/routes/auth.js
View file

@ -4,8 +4,8 @@ var router = new express.Router();
/* auth.auth*/
auth.setupPassport(router); //FIXME make this consistent with the others
router.post('/register', auth.registerUser);
router.post('/user/auth/local', auth.loginLocal);
//router.post('/user/auth/facebook', auth.loginFacebook);
router.post('/api/v1/register', auth.registerUser);
router.post('/api/v1/user/auth/local', auth.loginLocal);
router.post('/api/v1/user/auth/facebook', auth.loginFacebook);
module.exports = router;