Changeset 468 for Dev/trunk/src/client/qed-client/request.js

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/client/qed-client/request.js (moved) (moved from Dev/trunk/src/client/qed-client/store/request.js) (1 diff)

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

@@ -1 +1 @@
 define([
+    "./session",
     "dojo/Deferred",
+    "dojo/on",
     "dojo/request"
-], function(Deferred, request) {
+], function(session, Deferred, on, request) {
 
-    var authenticated = true;
+    var user = session.get();
     var queue = [];
     
+    on(session, 'change', function(newUser) {
+        user = newUser;
+        if ( user ) {
+            retry();
+        }
+    });
+    
+    function retry() {
+        if (queue.length > 0) {
+            var item = queue.shift();
+            console.log("Retry",item.url);
+            real_request(item);
+        }
+    }
+    
+    function real_request(item) {
+        var req = request(item.url,item.options);
+
+        // forward successfull response
+        req.then(function(body){
+            item.dfd.resolve(body);
+        });
+
+        // handle unauthenticated and queued requests
+        req.response.then(function(response){
+            retry();
+        }, function(error) {
+            if ( error.response.status === 401 ) {
+                queue.unshift(item);
+                session.restore();
+            } else {
+                item.dfd.reject(error); // this should be error body
+                                        // not, the request?
+                retry();
+            }
+        });
+    }
+    
     var _request = function(url, options) {
-        var dfd = new Deferred();
-        if ( authenticated ) {
-            var req = request(url,options);
+        var item = {
+            url: url,
+            options: options,
+            dfd: new Deferred()
+        };
+        // only do the request directly if we are authenticated and
+        // there are no earlier requests queued.
+        if ( user && queue.length === 0 ) {
+            console.log("Request",url);
+            real_request(item);
+        } else {
+            console.log("Push",url);
+            queue.push(item);
+        }
+        return item.dfd.promise;
+    };
 
-            // forward successfull response
-            req.then(function(data){
-                dfd.resolve(data);
-            });
-            
-            req.response.then(function(response){
-                // if we are recovering, launch other requests
-            }, function(error) {
-                if ( error.response.status === 401 ) {
-                    queue.push({
-                        url: url,
-                        options: options,
-                        dfd: dfd
-                    });
-                    console.log("Retry goes here :)");
-                } else {
-                    dfd.reject(error);
-                }
-            });
-        } else {
-            queue.push({
-                url: url,
-                options: options,
-                dfd: dfd
-            });
-        }
-        return dfd.promise;
-    };
     return _request;
 });