From 1e1668f98afd04e2da7c779a825e6d28e777fec7 Mon Sep 17 00:00:00 2001
From: NavaL <mnandri@thoughtworks.com>
Date: Thu, 25 Feb 2016 09:16:28 +0100
Subject: changed logout to post Issue #612

---
 web-ui/app/js/page/logout.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'web-ui/app/js/page')

diff --git a/web-ui/app/js/page/logout.js b/web-ui/app/js/page/logout.js
index d881f6c2..81b57db2 100644
--- a/web-ui/app/js/page/logout.js
+++ b/web-ui/app/js/page/logout.js
@@ -14,19 +14,28 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
  */
-define(['flight/lib/component', 'features', 'views/templates'], function (defineComponent, features, templates) {
+define(['flight/lib/component', 'features', 'views/templates', 'helpers/browser'],
+ function (defineComponent, features, templates, browser) {
   'use strict';
 
   return defineComponent(function () {
 
+    this.defaultAttrs({form: '#logout-form'});
+
     this.render = function () {
-      var logoutHTML = templates.page.logout({ logout_url: features.getLogoutUrl() });
+      var logoutHTML = templates.page.logout({ logout_url: features.getLogoutUrl(),
+       csrf_token: browser.getCookie('XSRF-TOKEN')});
       this.$node.html(logoutHTML);
     };
 
+    this.logout = function(){
+      this.select('form').submit();
+    };
+
     this.after('initialize', function () {
       if (features.isLogoutEnabled()) {
 	      this.render();
+	      this.on(this.$node, 'click', this.logout);
       }
     });
 
-- 
cgit v1.2.3


From dbb434b56e6b161a3b851ae6a81f96dff14a29da Mon Sep 17 00:00:00 2001
From: NavaL <ayoyo@thoughtworks.com>
Date: Thu, 25 Feb 2016 17:38:07 +0100
Subject: serving the client directly, as the current dependency on proxy
 strips out xsrf cookies -fixing functional test

Issue #612
---
 web-ui/app/js/page/default.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'web-ui/app/js/page')

diff --git a/web-ui/app/js/page/default.js b/web-ui/app/js/page/default.js
index e33ec723..19b28354 100644
--- a/web-ui/app/js/page/default.js
+++ b/web-ui/app/js/page/default.js
@@ -51,6 +51,7 @@ define(
     'mail_view/data/feedback_sender',
     'page/version',
     'page/unread_count_title',
+    'helpers/browser'
   ],
 
   function (
@@ -88,7 +89,8 @@ define(
     feedbackBox,
     feedbackSender,
     version,
-    unreadCountTitle) {
+    unreadCountTitle,
+    browser) {
 
     'use strict';
     function initialize(path) {
@@ -129,6 +131,8 @@ define(
       feedbackSender.attachTo(document);
 
       unreadCountTitle.attachTo(document);
+
+      $.ajaxSetup({headers: {'X-XSRF-TOKEN': browser.getCookie('XSRF-TOKEN')}});
     }
 
     return initialize;
-- 
cgit v1.2.3