From c6529b68326486de8b40335cac8a2b2a21387ea7 Mon Sep 17 00:00:00 2001
From: Dan Cryer <dan@block8.co.uk>
Date: Wed, 30 Jul 2014 14:32:38 +0100
Subject: [PATCH] Adding handling of HTTP 401 status codes in Ajax requests.
 Fixes #504

---
 PHPCI/View/Home/index.phtml   | 22 +++++++++++---
 PHPCI/View/Project/view.phtml | 11 ++++++-
 public/assets/js/phpci.js     | 54 ++++++++++++++++++++++++-----------
 3 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml
index a103b413..bcac0775 100644
--- a/PHPCI/View/Home/index.phtml
+++ b/PHPCI/View/Home/index.phtml
@@ -66,12 +66,26 @@
 <script>
     var refreshProjectData = function()
     {
-        $('#latest-builds').load('<?php echo PHPCI_URL ?>home/latest', function () {
-            $('#latest-builds').trigger('latest-builds:reload');
+        $.ajax({
+            url: '<?php echo PHPCI_URL ?>home/latest',
+
+            success: function (data) {
+                $('#latest-builds').html(data);
+                $('#latest-builds').trigger('latest-builds:reload');
+            },
+
+            error: handleFailedAjax
         });
 
-        $('#project-overview').load('<?php echo PHPCI_URL ?>home/summary', function () {
-            $('#project-overview').trigger('project-overview:reload');
+        $.ajax({
+            url: '<?php echo PHPCI_URL ?>home/summary',
+
+            success: function (data) {
+                $('#project-overview').html(data);
+                $('#project-overview').trigger('project-overview:reload');
+            },
+
+            error: handleFailedAjax
         });
     };
 
diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml
index 30fd24aa..3aeb75a7 100644
--- a/PHPCI/View/Project/view.phtml
+++ b/PHPCI/View/Project/view.phtml
@@ -114,7 +114,16 @@
 <script>
     setInterval(function()
     {
-        $('#latest-builds').load('<?php echo PHPCI_URL ?>project/builds/<?php print $project->getId(); ?>');
+        $.ajax({
+            url: '<?php echo PHPCI_URL ?>project/builds/<?php print $project->getId(); ?>',
+
+            success: function (data) {
+                $('#latest-builds').html(data);
+                $('#latest-builds').trigger('latest-builds:reload');
+            },
+
+            error: handleFailedAjax
+        });
     }, 10000);
 
     $(function() {
diff --git a/public/assets/js/phpci.js b/public/assets/js/phpci.js
index ba5a37bc..ef909388 100644
--- a/public/assets/js/phpci.js
+++ b/public/assets/js/phpci.js
@@ -47,7 +47,7 @@ function confirmDelete(url, subject, reloadAfter) {
              */
             $.ajax({
                 url: url,
-                'success': function (data) {
+                success: function (data) {
                     if (reloadAfter) {
                         dialog.onClose = function () {
                             window.location.reload();
@@ -56,8 +56,12 @@ function confirmDelete(url, subject, reloadAfter) {
 
                     dialog.showStatusMessage('Successfully deleted!', 1000);
                 },
-                'error': function (data) {
+                error: function (data) {
                     dialog.showStatusMessage('Deletion failed! Server says "' + data.statusText + '"');
+
+                    if (data.status == 401) {
+                        handleFailedAjax(data);
+                    }
                 }
             });
         }
@@ -258,24 +262,28 @@ function setupProjectForm()
 		}
 	});
 
-	$('#element-type').change(function()
-	{
+	$('#element-type').change(function() {
         if ($(this).val() == 'github') {
             $('#loading').show();
 
-            $.getJSON(window.PHPCI_URL + 'project/github-repositories', function (data) {
-                $('#loading').hide();
+            $.ajax({
+                dataType: "json",
+                url: window.PHPCI_URL + 'project/github-repositories',
+                success: function (data) {
+                    $('#loading').hide();
 
-                if (data.repos) {
-                    $('#element-github').empty();
+                    if (data.repos) {
+                        $('#element-github').empty();
 
-                    for (var i in data.repos) {
-                        var name = data.repos[i];
-                        $('#element-github').append($('<option></option>').text(name).val(name));
+                        for (var i in data.repos) {
+                            var name = data.repos[i];
+                            $('#element-github').append($('<option></option>').text(name).val(name));
+                        }
+
+                        $('.github-container').slideDown();
                     }
-
-                    $('.github-container').slideDown();
-                }
+                },
+                error: handleFailedAjax
             });
         } else {
             $('.github-container').slideUp();
@@ -342,8 +350,14 @@ var PHPCIObject = Class.extend({
         }
 
         var cb = function() {
-            $.getJSON(window.PHPCI_URL + uri, query, function(data) {
-                $(window).trigger({type: name, queryData: data});
+            $.ajax({
+                dataType: "json",
+                url: window.PHPCI_URL + uri,
+                data: query,
+                success: function(data) {
+                    $(window).trigger({type: name, queryData: data});
+                },
+                error: handleFailedAjax
             });
         };
 
@@ -454,3 +468,11 @@ var PHPCIObject = Class.extend({
         }
     })
 });
+
+
+function handleFailedAjax(xhr)
+{
+    if (xhr.status == 401) {
+        window.location.href = window.PHPCI_URL + 'session/login';
+    }
+}
\ No newline at end of file