Changeset 470

Timestamp:

07/01/13 03:11:23 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Reorganized app and fixed some style issues.

Was looking for a bug where the proxy would not forward requests to the
database. This is somehow magically resolved now.

Location:

Dev/trunk/src/server

Files:

• app.js (modified) (6 diffs)
• config/config-couchdb.js (modified) (1 diff)
• standalone.js (deleted)
• util/q-request.js (modified) (1 diff)
• util/simple-http-proxy.js (modified) (1 diff)

Dev/trunk/src/server/app.js

@@ -43 +43 @@
     app.use(express.favicon());
 
+    // cookies and session
+    app.use('/api/login',express.bodyParser());
     app.use(express.cookieParser());
-    app.use(express.bodyParser());
     app.use(express.session({ secret: "quasi experimental design" }));
 
-    // initialize passport
+    // passport
     app.use(passport.initialize());
     app.use(passport.session());
+    function ensureAuthenticated(req,res,next){
+        if (!req.user) {
+            return res.send(401,{error:"Login before accessing API."});
+        } else {
+            return next();
+        }
+    }
+    function returnUser(req,res) {
+        res.send(200, req.user);
+    }
 
     // static resources
@@ -62 +73 @@
     });
 
-    
-    // url to login (might work on others as well?)
-    // you should then have a session to work with
-    // should return a user info object
-    function returnUser(req,res) {
-        res.send(200, req.user);
-    }
+
+    // post to this url to login
     app.post(
         '/api/login',
@@ -74 +80 @@
         returnUser);
 
-    // ensure we're authenticated on API calls
-    function ensureAuthenticated(req,res,next){
-        if (!req.user) {
-            return res.send(401,{error:"Login before accessing API."});
-        } else {
-            return next();
-        }
-    }
-    
+    // return the info for the current logged in user
     app.get(
         '/api/login',
@@ -88 +86 @@
         returnUser);
 
+    // explicitly logout this user
     app.post(
         '/api/logout',
@@ -96 +95 @@
         });
 
+    // data is proxied to couch
+    app.use('/api/data', ensureAuthenticated);
+    app.use('/api/data', proxy(settings.couchDbURL));
+
+    // generate CSV download of responses
     app.get(
         '/api/surveyRuns/:id/responses.csv',
@@ -109 +113 @@
         });
     
-    // forward to couch
-    app.use('/api/data', ensureAuthenticated);
-    app.use('/api/data', proxy(settings.couchDbURL));
-
     return app;
 

Dev/trunk/src/server/config/config-couchdb.js

@@ -66 +66 @@
         designDocs = stringifyFunctions(designDocs);
         return q.all(_.map(designDocs, function(doc,docUrl){
-            var configAction = doc.__configAction;
+            var configAction = doc.__configAction || "replace";
             delete doc.__configAction;
             switch (configAction) {
-                case "ignore":
-                    console.log(docUrl+" ignored.");
+            case "ignore":
+                console.log(docUrl+" ignored.");
                 break;
-                case "update":
-                    console.log(docUrl+" updating.");
-                    return dbRequest('GET',docUrl)
-                    .then(function(oldDoc){
-                        _.extend(oldDoc,doc);
-                        return dbRequest('PUT',docUrl,oldDoc);
-                    },function(){
-                        return dbRequest('PUT',docUrl,doc);
-                    });
-                break;
-                case "replace":
-                default:
-                    console.log(docUrl+" replacing.");
-                    return dbRequest('GET',docUrl)
-                    .then(function(oldDoc){
-                        _.extend(doc,_.pick(oldDoc,'_id','_rev'));
-                        return dbRequest('PUT',docUrl,doc);
-                    },function(){
-                        return dbRequest('PUT',docUrl,doc);
-                    });
+            case "update":
+                console.log(docUrl+" updating.");
+                return dbRequest('GET',docUrl)
+                .then(function(oldDoc){
+                    _.extend(oldDoc,doc);
+                    return dbRequest('PUT',docUrl,oldDoc);
+                },function(){
+                    return dbRequest('PUT',docUrl,doc);
+                });
+            case "replace":
+                console.log(docUrl+" replacing.");
+                return dbRequest('GET',docUrl)
+                .then(function(oldDoc){
+                    _.extend(doc,_.pick(oldDoc,'_id','_rev'));
+                    return dbRequest('PUT',docUrl,doc);
+                },function(){
+                    return dbRequest('PUT',docUrl,doc);
+                });
+            default:
+                console.warn("Unknown action",configAction);
                 break;
             }

Dev/trunk/src/server/util/q-request.js

@@ -9 +9 @@
     dfd.response = q.defer();
     
-    options = options
-        ? _.clone(options)
-        : {};
+    options = options ? _.clone(options) : {};
     options.uri = url || options.uri;
     

Dev/trunk/src/server/util/simple-http-proxy.js

@@ -3 +3 @@
  * Module dependencies
  */
-var url = require('url')
-    , join = require('path').join
-    , protocols = {
+var url = require('url'),
+    join = require('path').join,
+    protocols = {
         http: require('http'),
         https: require('https')