Added user details to output

Author: jbasdf

app/controllers/index.js

@@ -67,15 +67,17 @@ module.exports = function(app){
       }
 
       var displayName = "";
-      
+      var email = "";
+      var loggedIn = false;
       if(req.user){
-        if(req.user.twitter){
-          displayName = req.user.twitter.displayName;
-        }
+        displayName = req.user.displayName();
+        loggedIn = true;
       }
 
       res.render('index.ejs', {
-        user: displayName,
+        displayName: displayName,
+        email: email,
+        loggedIn: loggedIn,
         content: content,
         scriptPath: scriptPath,
         cssPath: cssPath,

app/models/user.js

@@ -7,6 +7,7 @@ var userSchema = mongoose.Schema({
 
   email: String,
   password: String,
+  name: String,
 
   facebook: {
     id: String,
@@ -39,5 +40,14 @@ userSchema.methods.validPassword = function(password) {
   return bcrypt.compareSync(password, this.password);
 };
 
+userSchema.methods.displayName = function(){
+  return this.name || this.facebook.name || this.twitter.displayName;
+};
+  
+userSchema.methods.username = function(){
+  return this.twitter.username;
+};
+
+
 // create the model for users and expose it to our app
 module.exports = mongoose.model('User', userSchema);

app/views/index.ejs

@@ -11,7 +11,9 @@
   <script type="text/javascript">
     var GlobalSettings = {
       apiUrl: "<%= apiPath %>",
-      user: "<%= user %>"
+      displayName: "<%= displayName %>",
+      email: "<%= email %>",
+      loggedIn: <%= loggedIn %>
     }
   </script>
 </head>

client/js/stores/user.js

@@ -5,45 +5,45 @@ import Constants      from "../constants";
 import StoreCommon    from "./store_common";
 import assign         from "object-assign";
 
-let _user = {};
+var _user = {};
 
 // log the user in
-function login(email, password){
-  return true;
+function login(email, displayName, password){
+  _user.email = email;
+  _user.loggedIn = true;
+  _user.displayName = displayName;
 }
 
 // Register
 function register(user){
-  return true; 
+  _user.email = user.email;
+  _user.loggedIn = true;
+  _user.displayName = user.displayName;
 }
 
 // Extend User Store with EventEmitter to add eventing capabilities
-let UserStore = assign({}, StoreCommon, {
+var UserStore = assign({}, StoreCommon, {
 
   // Return current user
   current(){
     return _user;
   },
 
   loggedIn(){
-    return _user.email !== undefined;
-  },
-
-  token(){
-    return _user.token;
+    return _user.loggedIn;
   }
 
 });
 
 // Register callback with Dispatcher
 Dispatcher.register(function(payload) {
-  let action = payload.action;
+  var action = payload.action;
 
   switch(action){
 
     // Respond to LOGIN action
     case Constants.LOGIN:
-      login(payload.email, payload.password);
+      login(payload.email, payload.displayName, payload.password);
       break;
 
     // Respond to REGISTER action