user handling, starting updating views

auth.coffee

@@ -8,16 +8,23 @@ everyauth.everymodule.moduleErrback (err) ->
 	console.log "Auth ERROR - "+err
 
 everyauth.everymodule.findUserById (userId, callback) ->  
-	users.findById userId, (err,res) ->
+	users.findByTwitterId userId, (err,res) ->
 		if res.id
-			callback null, res
+			callback null, res.value
 		else
-			users.saveById JSON.stringify(userId), {"name":"test"}, (saveErr, saveRes) ->
-				callback null, saveRes
+			callback null, null
 
 everyauth.twitter
     .consumerKey(config.twitterConsumerKey)
     .consumerSecret(config.twitterConsumerSecret)
     .findOrCreateUser((session, token, secret, user) ->
+      users.findByTwitterId user.id, (err,res) ->
+        if res.id
+          user=res.value
+        else
+          newUser = {id:user.id,name:user.name,twitter:user}
+          user = newUser
+          users.saveById JSON.stringify(user.id), user, (saveErr, saveRes) -> 
       promise = @.Promise().fulfill user
+
     ).redirectPath '/'

config.coffee

@@ -11,4 +11,24 @@ config.sessionDBName = process.env.SPARK_SESSIONDBNAME || 'database_sessions'
 config.twitterConsumerKey = process.env.SPARK_TWITTERCONSUMERKEY || 'twitterconsumerkey'
 config.twitterConsumerSecret = process.env.SPARK_TWITTERCONSUMERSECRET || 'twitterconsumersecret'
 
-module.exports = config
+module.exports = config
+
+# views for the user database 
+#       "all": {
+#           "map": "function(doc) {  emit(doc._id, doc);}"
+#       },
+#       "byid": {
+#           "map": "function(doc) {if(doc._id) emit(doc._id,doc); }"
+#       },
+#       "byTwitterId": {
+#           "map": "function(doc) {if(doc.twitter.id) emit(doc._id,doc); }"
+#       
+# view for scene database 
+#       "all": {
+#           "map": "function(doc) {\n  emit(null, doc);\n}"
+#       },
+#       "byid": {
+#           "map": "function(doc) {if(doc._id){emit(doc._id, doc);}}"
+#       },
+#       "allbyid": {
+#           "map": "function(doc) {if(doc.url){emit(doc._id, null);}}"

main.coffee

@@ -48,9 +48,6 @@ scene = new Articler config.mainDBHost, config.mainDBPort, config.mainDB
 
 app.get '/', (req, res) ->
 	console.log req.user
-	if req.user is []
-		console.log "Push new user to db!"
-	else "No need to push to db!"
 	scene.findAll (err, docs) ->
 		threeDocs = []
 		for tempDoc in [1..3]

user.coffee

@@ -15,6 +15,16 @@ class User
         }
         @.db = @.connect.database collection
 
+    findByTwitterId: (mykey, callback) ->
+      @.db.view 'spark-user/byTwitterId', {key: JSON.stringify(mykey)}, (err, res) ->
+        if (err)
+            callback err, null
+        else 
+           if res.length>0
+             callback null, res[0]
+           else 
+             callback null, res
+
     findById: (mykey, callback) ->
       @.db.view 'spark-user/byid', {key: JSON.stringify(mykey)}, (err, res) ->
         if (err)

views/layout.jade

@@ -41,8 +41,9 @@ html
             p.navbar-text.pull-right.highlightLogin
               - if (everyauth.loggedIn)
                 span= "Logged in as "
-                img.twitterImage(src=everyauth.twitter.user.profile_image_url)
-                span= " "+ everyauth.twitter.user.name +" - "
+                - if (user.twitter)
+                 img.twitterImage(src=user.twitter.profile_image_url) 
+                span= " "+ user.name +" - "
                 a(href="/logout")= "Logout"
               - else
                 a(href= "/auth/twitter")= "Login with Twitter"