Changeset 467

Timestamp:

06/26/13 15:24:09 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Fixed authentication.

Location:

Dev/trunk/src

Files:

• client/qed-client/index.js (modified) (1 diff)
• client/qed-client/pages/templates/surveyRun.html (modified) (1 diff)
• server/app.js (modified) (2 diffs)

Dev/trunk/src/client/qed-client/index.js

@@ -21 +21 @@
         Router.register(route);
     });
-    Router.startup();
 
-    session.restore();
+    session.restore().then(function(){
+        Router.startup();
+    });
     
 });

Dev/trunk/src/client/qed-client/pages/templates/surveyRun.html

@@ -45 +45 @@
             <div>
                 <div class="qedLabel">Export results</div>
-                <a target="_blank" href="/surveyRun/${surveyRunId}/csv" class="qedField">To CSV</a>
+                <a target="_blank" href="/api/surveyRuns/${surveyRunId}/responses.csv" class="qedField">To CSV</a>
             </div>
         </fieldset>

Dev/trunk/src/server/app.js

@@ -75 +75 @@
 
     // ensure we're authenticated on API calls
-    app.use('/api', function(req,res,next){
+    function ensureAuthenticated(req,res,next){
         if (!req.user) {
             return res.send(401,{error:"Login before accessing API."});
@@ -81 +81 @@
             return next();
         }
-    });
+    }
     
     app.get(
         '/api/login',
+        ensureAuthenticated,
         returnUser);
 
     app.post(
-        '/api/logout', function(req,res){
+        '/api/logout',
+        ensureAuthenticated,
+        function(req,res){
             req.logout();
             res.send(200,{});
         });
 
-    app.get('/api/surveyRun/:id/response/csv',
-            function(req, res) {
-                var id = req.params.id;
-                // query CouchDB and build the CSV file
-                res.set({
-                    'Content-Type': 'text/csv',
-                    'Content-Disposition': 'attachment; filename=responses-'+id+'.csv'
-                });
-                res.send(200, "Response for surveyRun "+id);
+    app.get(
+        '/api/surveyRuns/:id/responses.csv',
+        ensureAuthenticated,
+        function(req, res) {
+            var id = req.params.id;
+            // query CouchDB and build the CSV file
+            res.set({
+                'Content-Type': 'text/csv',
+                'Content-Disposition': 'attachment; filename=surveyRun-'+id+'-responses.csv'
             });
+            res.send(200, "Response for surveyRun "+id);
+        });
     
     // forward to couch
+    app.use('/api/data', ensureAuthenticated);
     app.use('/api/data', proxy(settings.couchDbURL));