krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

v2 port: enable integration tests, port register route

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-04-03 16:40:01 +02:00
parent fc73fc7f8c
commit 58c20c2a64
36 changed files with 114 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
website/src/controllers/api-v2/auth.js
View File

@@ -138,15 +138,13 @@ api.registerUser = function(req, res, next) {
}]
}, function(err, data) {
if (err) return err.code ? res.status(err.code).json(err) : next(err);
res.status(200).json(data.register[0]);
data.register[0].getTransformedData(function(err, userTransformed){
if(err) return next(err);
res.status(200).json(userTransformed);
});
});
};
/*
Register new user with uname / password
*/
api.loginLocal = function(req, res, next) {
var username = req.body.username;
var password = req.body.password;
@@ -348,7 +346,8 @@ api.changePassword = function(req, res, next) {
})
};
var firebaseTokenGeneratorInstance = new FirebaseTokenGenerator(nconf.get('FIREBASE:SECRET'));
// DISABLED FOR API v2
/*var firebaseTokenGeneratorInstance = new FirebaseTokenGenerator(nconf.get('FIREBASE:SECRET'));
api.getFirebaseToken = function(req, res, next) {
var user = res.locals.user;
// Expires 24 hours after now (60*60*24*1000) (in milliseconds)
@@ -367,13 +366,10 @@ api.getFirebaseToken = function(req, res, next) {
token: token,
expires: expires
});
};
};*/
/*
Registers a new user. Only accepting username/password registrations, no Facebook
*/
api.setupPassport = function(router) {
// DISABLED FOR API v2
/*api.setupPassport = function(router) {
router.get('/logout', i18n.getUserLanguage, function(req, res) {
req.logout();
@@ -381,4 +377,4 @@ api.setupPassport = function(router) {
res.redirect('/');
})
};
};*/