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

app.user

Browse Source
This commit is contained in:
barisusakli
2014-12-03 19:36:19 -05:00
parent 22e20b961e
commit 7ae7c50f56
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/app.js
View File

@@ -85,12 +85,15 @@ var socket,
reconnecting = false; reconnecting = false;
socket.on('event:connect', function (data) { socket.on('event:connect', function (data) {
// TODO : deprecate in 0.7.0, use app.user
app.username = data.username; app.username = data.username;
app.userslug = data.userslug; app.userslug = data.userslug;
app.picture = data.picture; app.picture = data.picture;
app.uid = data.uid; app.uid = data.uid;
app.isAdmin = data.isAdmin; app.isAdmin = data.isAdmin;
app.user = data;
templates.setGlobal('loggedIn', parseInt(data.uid, 10) !== 0); templates.setGlobal('loggedIn', parseInt(data.uid, 10) !== 0);
app.showLoginMessage(); app.showLoginMessage();

2
public/src/modules/composer.js
View File

@@ -463,7 +463,7 @@ define('composer', dependencies, function(taskbar, controls, uploads, formatting
function showEmailConfirmAlert(err) { function showEmailConfirmAlert(err) {
app.alert({ app.alert({
id: 'email_confirm', alert_id: 'email_confirm',
title: '[[global:alert.error]]', title: '[[global:alert.error]]',
message: err.message, message: err.message,
type: 'danger', type: 'danger',

13
src/socket.io/index.js
View File

@@ -65,7 +65,7 @@ function onConnect(socket) {
async.parallel({ async.parallel({
user: function(next) { user: function(next) {
user.getUserFields(socket.uid, ['username', 'userslug', 'picture', 'status'], next); user.getUserFields(socket.uid, ['username', 'userslug', 'picture', 'status', 'email:confirmed'], next);
}, },
isAdmin: function(next) { isAdmin: function(next) {
user.isAdministrator(socket.uid, next); user.isAdministrator(socket.uid, next);
@@ -74,13 +74,10 @@ function onConnect(socket) {
if (err || !userData.user) { if (err || !userData.user) {
return; return;
} }
socket.emit('event:connect', { userData.user.uid = socket.uid;
username: userData.user.username, userData.user.isAdmin = userData.isAdmin;
userslug: userData.user.userslug, userData.user['email:confirmed'] = parseInt(userData.user['email:confirmed'], 10) === 1;
picture: userData.user.picture, socket.emit('event:connect', userData.user);
isAdmin: userData.isAdmin,
uid: socket.uid
});
socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.user.status}); socket.broadcast.emit('event:user_status_change', {uid: socket.uid, status: userData.user.status});
}); });

2
src/user/email.js
View File

@@ -66,6 +66,8 @@ var async = require('async'),
plugins.fireHook('action:user.verify', {uid: uid, data: data}); plugins.fireHook('action:user.verify', {uid: uid, data: data});
} else if (plugins.hasListeners('action:email.send')) { } else if (plugins.hasListeners('action:email.send')) {
emailer.send('welcome', uid, data); emailer.send('welcome', uid, data);
} else {
winston.warn('No emailer to send verification email!');
} }
}); });
}); });