Changeset 468 for Dev/trunk/src/server

Timestamp:

06/26/13 21:17:41 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Improved authentication

• Authentication cannot be cancelled, removing a lot of weird race conditions.
• We offer a request provider that has automatic retry in case of authentication failures.
• Reduced dependency on LoginDialog? by having it act independent based on events. Other modules can just depend on 'session'.

Location:

Dev/trunk/src/server

Files:

• config/config-couchdb.js (modified) (3 diffs)
• heroku.js (modified) (1 diff)
• util/q-request.js (moved) (moved from Dev/trunk/src/server/util/request.js) (1 diff)

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

@@ -1 @@
-var q = require('q');
-var request = require('../util/request');
-var _ = require('underscore');
-var util = require('util');
+var q = require('q'),
+    request = require('../util/q-request'),
+    _ = require('underscore'),
+    util = require('util');
 
 var designDocs = require('./couchdb-design-docs');
@@ -34 +34 @@
                 'accept': 'application/json'
             },
-            body: content
+            body: JSON.stringify(content)
         };
-        return request(url,options);
+        //console.log('req',url,options);
+        return request(url,options).then(function(res){
+            return JSON.parse(res);
+        }, function(err){
+            return JSON.parse(err);
+        });
     }
 
@@ -90 +95 @@
             }
         }));
-    }).then(function(){
+    }).then(function(results){
         console.log("Done!");
     },function(err){

Dev/trunk/src/server/heroku.js

@@ -3 +3 @@
 
 var configCouch = require('./config/config-couchdb');
+
+console.log("Running on",couchDbURL);
 
 configCouch(couchDbURL)

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

@@ -1 @@
-var http = require('q-io/http'),
+var q = require('q'),
+    request = require('request'),
     url = require('url'),
     _ = require('underscore');
 
-module.exports = function(urlOrObject, options) {
+module.exports = function(url, options) {
 
+    var dfd = q.defer();
+    dfd.response = q.defer();
+    
     options = options
         ? _.clone(options)
         : {};
-    options.url = _.isString(urlOrObject)
-        ? url.parse(urlOrObject)
-        : _.clone(urlOrObject);
+    options.uri = url || options.uri;
+    
+    request(options,function(err,res,body){
+        if ( err ) {
+            dfd.response.reject(err);
+        } else {
+            if ( res.statusCode >= 200 && res.statusCode < 300 ) {
+                dfd.resolve(body);
+            } else {
+                dfd.reject(body);
+            }
+        }
+        dfd.response.resolve(res);
+    });
 
-    // wrap content into q-io thingy
-    if ( options.body ) {
-        options.body = {
-            forEach: function(callback) {
-                callback(JSON.stringify(options.body));
-            }
-        };
-    };
+    return dfd.promise;
     
-    // add auth header since q-io doesn't support this
-    if ( options.url.auth ) {
-        options.headers.authorization = 'Basic '+(new Buffer(options.url.auth).toString("base64"));
-    }
-    
-    // make request and collect results
-    return http.request(options)
-    .then(function(res){
-        return res.body.read().then(function(content){
-            return content.length > 0 ? JSON.parse(content) : null;
-        });
-    },function(res){
-        return res.body.read().then(function(error){
-            return error.length > 0 ? JSON.parse(error) : null;
-        });
-    });
 };