Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
Baris Usakli
2013-05-24 12:32:34 -04:00
parent db6bbcc699 6060f4fbb4
commit adb52023b8
1 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/user.js
View File

@@ -196,8 +196,8 @@ var config = require('../config.js'),
callback(err); callback(err);
} else { } else {
// Save twitter-specific information to the user // Save twitter-specific information to the user
RDB.set('uid:' + uid + ':twid', twid); User.setUserField(uid, 'twid', twid);
RDB.set('twid:' + twid + ':uid', uid); RDB.hset('twid:uid', twid, uid);
callback(null, { callback(null, {
uid: uid uid: uid
}); });
@@ -216,17 +216,23 @@ var config = require('../config.js'),
}); });
} else { } else {
// New User // New User
User.create(handle, null, email, function(err, uid) { var success = function(uid) {
if (err !== null) { // Save google-specific information to the user
callback(err); User.setUserField(uid, 'gplusid', gplusid);
} else { RDB.hset('gplusid:uid', gplusid, uid);
// Save twitter-specific information to the user
RDB.set('uid:' + uid + ':gplusid', gplusid);
RDB.set('gplusid:' + gplusid + ':uid', uid);
callback(null, { callback(null, {
uid: uid uid: uid
}); });
} }
User.get_uid_by_email(email, function(uid) {
if (!uid) {
User.create(handle, null, email, function(err, uid) {
if (err !== null) {
callback(err);
} else success(uid);
});
} else success(uid); // Existing account -- merge
}); });
} }
}); });
@@ -241,17 +247,23 @@ var config = require('../config.js'),
}); });
} else { } else {
// New User // New User
User.create(name, null, email, function(err, uid) { var success = function(uid) {
if (err !== null) { // Save facebook-specific information to the user
callback(err); User.setUserField(uid, 'fbid', fbid);
} else { RDB.hset('fbid:uid', fbid, uid);
// Save twitter-specific information to the user
RDB.set('uid:' + uid + ':fbid', fbid);
RDB.set('fbid:' + fbid + ':uid', uid);
callback(null, { callback(null, {
uid: uid uid: uid
}); });
} }
User.get_uid_by_email(email, function(uid) {
if (!uid) {
User.create(name, null, email, function(err, uid) {
if (err !== null) {
callback(err);
} else success(uid);
});
} else success(uid); // Existing account -- merge
}); });
} }
}); });
@@ -494,21 +506,21 @@ var config = require('../config.js'),
}; };
User.get_uid_by_twitter_id = function(twid, callback) { User.get_uid_by_twitter_id = function(twid, callback) {
RDB.get('twid:' + twid + ':uid', function(err, uid) { RDB.hget('twid:uid', twid, function(err, uid) {
RDB.handle(err); RDB.handle(err);
callback(uid); callback(uid);
}); });
} }
User.get_uid_by_google_id = function(gplusid, callback) { User.get_uid_by_google_id = function(gplusid, callback) {
RDB.get('gplusid:' + gplusid + ':uid', function(err, uid) { RDB.hget('gplusid:uid', gplusid, function(err, uid) {
RDB.handle(err); RDB.handle(err);
callback(uid); callback(uid);
}); });
} }
User.get_uid_by_fbid = function(fbid, callback) { User.get_uid_by_fbid = function(fbid, callback) {
RDB.get('fbid:' + fbid + ':uid', function(err, uid) { RDB.hget('fbid:uid', fbid, function(err, uid) {
RDB.handle(err); RDB.handle(err);
callback(uid); callback(uid);
}); });