Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quarters system, generalized modal dialogs, bug fixes

Browse Source
This commit is contained in:
Tyler Renelle
2012-09-18 21:37:49 -04:00
parent 694691f109
commit be9d419313
11 changed files with 169 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/server/auth.js
+11 -3
View File
@@ -42,8 +42,8 @@ module.exports.newUserAndPurl = function() {
}
model.set("users." + sess.userId, newUser);
}
acceptableUid = require('guid').isGuid(uidParam) || (uidParam === '3' || uidParam === '9');
if (acceptableUid && sess.userId !== uidParam) {
acceptableUid = require('guid').isGuid(uidParam) || (uidParam === '3');
if (acceptableUid && sess.userId !== uidParam && !(sess.habitRpgAuth && sess.habitRpgAuth.facebook)) {
return sess.userId = uidParam;
}
};
@@ -53,7 +53,7 @@ module.exports.setupEveryauth = function(everyauth) {
everyauth.everymodule.findUserById(function(id, callback) {
return callback(null, null);
});
return everyauth.facebook.appId(process.env.FACEBOOK_KEY).appSecret(process.env.FACEBOOK_SECRET).findOrCreateUser(function(session, accessToken, accessTokenExtra, fbUserMetadata) {
everyauth.facebook.appId(process.env.FACEBOOK_KEY).appSecret(process.env.FACEBOOK_SECRET).findOrCreateUser(function(session, accessToken, accessTokenExtra, fbUserMetadata) {
var model, q;
session.habitRpgAuth || (session.habitRpgAuth = {});
session.habitRpgAuth.facebook = fbUserMetadata.id;
@@ -78,6 +78,14 @@ module.exports.setupEveryauth = function(everyauth) {
});
return fbUserMetadata;
}).redirectPath("/");
return everyauth.everymodule.handleLogout(function(req, res) {
if (req.session.habitRpgAuth && req.session.habitRpgAuth.facebook) {
req.session.habitRpgAuth.facebook = void 0;
}
req.session.userId = void 0;
req.logout();
return this.redirect(res, this.logoutRedirectPath());
});
};
module.exports.setupQueries = function(store) {