Changeset 470 for Dev/trunk/src/server/app.js

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.

File:

• Dev/trunk/src/server/app.js (modified) (6 diffs)

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;