Changeset 468 for Dev/trunk/src/server/config

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'.

File:

• Dev/trunk/src/server/config/config-couchdb.js (modified) (3 diffs)

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){