From c34b9325d6f55c2696b2cdf059102ab4d1949e93 Mon Sep 17 00:00:00 2001 From: John McLear Date: Wed, 30 Jan 2013 00:33:49 +0000 Subject: [PATCH] first working version of email being sent to database --- static/js/ep_email.js | 7 ++++--- update.js | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/static/js/ep_email.js b/static/js/ep_email.js index e279949..d300651 100644 --- a/static/js/ep_email.js +++ b/static/js/ep_email.js @@ -1,11 +1,12 @@ function sendEmailToServer(){ var email = "john@mclear.co.uk"; + var userId = pad.getUserId(); var message = {}; message.type = 'USERINFO_UPDATE'; message.userInfo = {}; - message.userInfo.colorId = "#0000"; - message.userInfo.email = "test"; - message.userInfo.userId = "FUCKING TEST"; +// message.userInfo.colorId = "#0000"; + message.userInfo.email = email; + message.userInfo.userId = userId; if(email){ pad.collabClient.sendMessage(message); diff --git a/update.js b/update.js index 6fc0cb0..0af6166 100644 --- a/update.js +++ b/update.js @@ -1,4 +1,4 @@ - var db = require('../../src/node/db/DB.js'); + var db = require('../../src/node/db/DB').db; API = require('../../src/node/db/API.js'), async = require('../../src/node_modules/async'), settings = require('../../src/node/utils/Settings'); @@ -14,8 +14,8 @@ exports.handleMessage = function(hook_name, context, callback){ if (context.message && context.message.data){ if (context.message.data.type == 'USERINFO_UPDATE' ) { // if it smells okay.. if (context.message.data.userInfo){ +console.warn("foo",context.message.data.userInfo); if(context.message.data.userInfo.email){ // it contains email - exports.setAuthorEmail( context.message.data.userInfo.userId, context.message.data.userInfo.email, callback);