From 193bf6446b384dce1699e8fb82be6f16cb8cb5f6 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 23 Sep 2013 19:55:22 +0200
Subject: use token auth when accessing the api from webapp

One failing integration test still needs to be fixed
---
 users/app/assets/javascripts/srp      |  2 +-
 users/app/assets/javascripts/users.js | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'users/app/assets')

diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp
index 9c61d52..d22bf3b 160000
--- a/users/app/assets/javascripts/srp
+++ b/users/app/assets/javascripts/srp
@@ -1 +1 @@
-Subproject commit 9c61d52f1f975ec0eefe5b4a0b71ac529300cbe7
+Subproject commit d22bf3b9fe2fd31192e1e1b358e97e5a0f3f90b3
diff --git a/users/app/assets/javascripts/users.js b/users/app/assets/javascripts/users.js
index 4c9b510..9d1a0f0 100644
--- a/users/app/assets/javascripts/users.js
+++ b/users/app/assets/javascripts/users.js
@@ -3,7 +3,12 @@
   // LOCAL FUNCTIONS
   //
 
-  var poll_users, prevent_default, form_failed, form_passed, clear_errors;
+  var poll_users, 
+      prevent_default, 
+      form_failed, 
+      form_passed, 
+      clear_errors,
+      update_user;
 
   prevent_default = function(event) {
     return event.preventDefault();
@@ -19,6 +24,17 @@
     return $('#messages').empty();
   };
 
+  update_user = function(submitEvent) {
+    var form = submitEvent.target;
+    var token = form.dataset.token;
+    var url = form.action;
+    return $.ajax({
+      url: url,
+      type: 'PUT',
+      headers: { Authorization: 'Token token="' + token + '"' },
+      data: $(form).serialize()
+    });
+  };
 
   //
   // PUBLIC FUNCTIONS
@@ -76,6 +92,8 @@
     $('#new_session').submit(srp.login);
     $('#update_login_and_password').submit(prevent_default);
     $('#update_login_and_password').submit(srp.update);
+    $('#update_pgp_key').submit(prevent_default);
+    $('#update_pgp_key').submit(update_user);
     return $('#user-typeahead').typeahead({
       source: poll_users
     });
-- 
cgit v1.2.3


From 4f8414298750193b6de3daff08364ec745a6a761 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 25 Sep 2013 10:12:08 +0200
Subject: visual feedback when submitting forms (#3164)

This also helps with the failing integration test. We needed a way to tell the ajax request was back. Observing the button state now works for that.
---
 users/app/assets/javascripts/users.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'users/app/assets')

diff --git a/users/app/assets/javascripts/users.js b/users/app/assets/javascripts/users.js
index 9d1a0f0..aaeba6e 100644
--- a/users/app/assets/javascripts/users.js
+++ b/users/app/assets/javascripts/users.js
@@ -28,12 +28,22 @@
     var form = submitEvent.target;
     var token = form.dataset.token;
     var url = form.action;
-    return $.ajax({
+    var req = $.ajax({
       url: url,
       type: 'PUT',
       headers: { Authorization: 'Token token="' + token + '"' },
       data: $(form).serialize()
     });
+    req.done( function() {
+      $(form).find('input[type="submit"]').button('reset');
+    });
+  };
+
+  markAsSubmitted = function(submitEvent) {
+    var form = submitEvent.target;
+    $(form).addClass('submitted')
+    // bootstrap loading state:
+    $(form).find('input[type="submit"]').button('loading');
   };
 
   //
@@ -86,6 +96,7 @@
   //
 
   $(document).ready(function() {
+    $('form').submit(markAsSubmitted);
     $('#new_user').submit(prevent_default);
     $('#new_user').submit(srp.signup);
     $('#new_session').submit(prevent_default);
-- 
cgit v1.2.3