fixing user register socket calls

v1.18.x
Julian Lam 11 years ago
parent ee963e0c2a
commit eb974ec1d8

@ -44,6 +44,12 @@ define(function() {
} else { } else {
socket.emit('api:user.emailExists', { socket.emit('api:user.emailExists', {
email: emailEl.val() email: emailEl.val()
}, function(data) {
if (data.exists === true) {
showError(email_notify, 'Email address already taken!');
} else {
showSuccess(email_notify, successIcon);
}
}); });
} }
} }
@ -65,7 +71,7 @@ define(function() {
} else if (!utils.isUserNameValid(username.val()) || !utils.slugify(username.val())) { } else if (!utils.isUserNameValid(username.val()) || !utils.slugify(username.val())) {
showError(username_notify, 'Invalid username!'); showError(username_notify, 'Invalid username!');
} else { } else {
socket.emit('user.exists', { socket.emit('api:user.exists', {
username: username.val() username: username.val()
}); });
} }
@ -127,14 +133,6 @@ define(function() {
} }
}); });
socket.on('api:user.emailExists', function(data) {
if (data.exists === true) {
showError(email_notify, 'Email address already taken!');
} else {
showSuccess(email_notify, successIcon);
}
});
function validateForm() { function validateForm() {
validationError = false; validationError = false;

@ -3,10 +3,10 @@ var user = require('../user'),
SocketUser = {}; SocketUser = {};
SocketUser.exists = function(data) { SocketUser.exists = function(data, sessionData) {
if (data.username) { if (data.username) {
user.exists(utils.slugify(data.username), function(exists) { user.exists(utils.slugify(data.username), function(exists) {
socket.emit('user.exists', { sessionData.socket.emit('api:user.exists', {
exists: exists exists: exists
}); });
}); });
@ -17,23 +17,23 @@ SocketUser.count = function(callback) {
user.count(callback); user.count(callback);
}; };
SocketUser.emailExists = function(data) { SocketUser.emailExists = function(data, callback, sessionData) {
user.email.exists(socket, data.email); user.email.exists(undefined, data.email, callback);
}; };
// Password Reset // Password Reset
SocketUser.reset = {}; SocketUser.reset = {};
SocketUser.reset.send = function(data) { SocketUser.reset.send = function(data, sessionData) {
user.reset.send(socket, data.email); user.reset.send(sessionData.socket, data.email);
}; };
SocketUser.reset.valid = function(data) { SocketUser.reset.valid = function(data, sessionData) {
user.reset.validate(socket, data.code); user.reset.validate(sessionData.socket, data.code);
}; };
SocketUser.reset.commit = function(data) { SocketUser.reset.commit = function(data, sessionData) {
user.reset.commit(socket, data.code, data.password); user.reset.commit(sessionData.socket, data.code, data.password);
}; };
SocketUser.isOnline = function(uid, callback) { SocketUser.isOnline = function(uid, callback) {
@ -44,23 +44,23 @@ SocketUser.isOnline = function(uid, callback) {
}); });
}; };
SocketUser.changePassword = function(data, callback) { SocketUser.changePassword = function(data, callback, sessionData) {
user.changePassword(uid, data, callback); user.changePassword(sessionData.uid, data, callback);
}; };
SocketUser.updateProfile = function(data, callback) { SocketUser.updateProfile = function(data, callback, sessionData) {
user.updateProfile(uid, data, callback); user.updateProfile(sessionData.uid, data, callback);
}; };
SocketUser.changePicture = function(data, callback) { SocketUser.changePicture = function(data, callback, sessionData) {
var type = data.type; var type = data.type;
function updateHeader() { function updateHeader() {
user.getUserFields(uid, ['picture'], function(err, fields) { user.getUserFields(sessionData.uid, ['picture'], function(err, fields) {
if (!err && fields) { if (!err && fields) {
fields.uid = uid; fields.uid = sessionData.uid;
socket.emit('api:updateHeader', fields); sessionData.socket.emit('api:updateHeader', fields);
callback(true); callback(true);
} else { } else {
callback(false); callback(false);
@ -69,13 +69,13 @@ SocketUser.changePicture = function(data, callback) {
} }
if (type === 'gravatar') { if (type === 'gravatar') {
user.getUserField(uid, 'gravatarpicture', function(err, gravatar) { user.getUserField(sessionData.uid, 'gravatarpicture', function(err, gravatar) {
user.setUserField(uid, 'picture', gravatar); user.setUserField(sessionData.uid, 'picture', gravatar);
updateHeader(); updateHeader();
}); });
} else if (type === 'uploaded') { } else if (type === 'uploaded') {
user.getUserField(uid, 'uploadedpicture', function(err, uploadedpicture) { user.getUserField(sessionData.uid, 'uploadedpicture', function(err, uploadedpicture) {
user.setUserField(uid, 'picture', uploadedpicture); user.setUserField(sessionData.uid, 'picture', uploadedpicture);
updateHeader(); updateHeader();
}); });
} else { } else {
@ -83,21 +83,21 @@ SocketUser.changePicture = function(data, callback) {
} }
}; };
SocketUser.follow = function(data, callback) { SocketUser.follow = function(data, callback, sessionData) {
if (uid) { if (sessionData.uid) {
user.follow(uid, data.uid, callback); user.follow(sessionData.uid, data.uid, callback);
} }
}; };
SocketUser.unfollow = function(data, callback) { SocketUser.unfollow = function(data, callback, sessionData) {
if (uid) { if (sessionData.uid) {
user.unfollow(uid, data.uid, callback); user.unfollow(sessionData.uid, data.uid, callback);
} }
}; };
SocketUser.saveSettings = function(data, callback) { SocketUser.saveSettings = function(data, callback, sessionData) {
if (uid) { if (sessionData.uid) {
user.setUserFields(uid, { user.setUserFields(sessionData.uid, {
showemail: data.showemail showemail: data.showemail
}, function(err, result) { }, function(err, result) {
callback(err); callback(err);

Loading…
Cancel
Save