Merge lp:~canonical-isd-hackers/canonical-identity-provider/add-2f-notifications into lp:canonical-identity-provider/release

[Stuart Metcalfe]

Added notifications for 2-factor settings updates, addition, renaming and removal of devices (fixes bug #929516). Also, a small tweak to the devices list to hide the table when no devices are present (fixes bug #938796)

Added notifications for 2-factor settings updates, addition, renaming and removal of devices (fixes bug #929516). Also, a small tweak to the devices list to hide the table when no devices are present (fixes bug #938796)

[David Owen (dsowen)]

review: Approve

=== modified file 'identityprovider/templates/device/list.html'
--- identityprovider/templates/device/list.html	2012-02-22 14:08:08 +0000
+++ identityprovider/templates/device/list.html	2012-02-22 17:45:23 +0000
@@ -56,6 +56,7 @@
 </form>
 
 <div id="auth-devices">
+  {% if devices %}
     <h2>{% trans "Authentication devices you've added" %}</h2>
 
     <table id="device-list">
@@ -81,14 +82,17 @@
       {% endfor %}
       </tbody>
     </table>
-
-    <p><a href="{{ device_addition_path }}">
-      {% trans "Add a new authentication device" %}
-    </a></p>
-
-    <p><a href="{{ lost_device_path }}">
-      {% trans "Report a stolen or lost device" %}
-    </a></p>
+  {% else %}
+    <p>{% trans "You don't have any authentication devices associated with this account." %}</p>
+  {% endif %}
+
+  <p><a href="{{ device_addition_path }}">
+    {% trans "Add a new authentication device" %}
+  </a></p>
+
+  <p><a href="{{ lost_device_path }}">
+    {% trans "Report a stolen or lost device" %}
+  </a></p>
 </div>
 
 {% endblock %}

=== modified file 'identityprovider/tests/unit/test_devices.py'
--- identityprovider/tests/unit/test_devices.py	2012-02-17 13:05:48 +0000
+++ identityprovider/tests/unit/test_devices.py	2012-02-22 17:45:23 +0000
@@ -61,10 +61,7 @@
         tree = PyQuery(fromstring(response.content))
 
         devices = tree.find('table#device-list')
-        expected_headers = ['Name', None]
-        self.assertEqual([e.text for e in devices.find('th')],
-                         expected_headers)
-        self.assertEqual(len(devices.find('tbody tr')), 0)
+        self.assertEqual(devices, [])
 
         radios = tree.find('input[type=radio]')
         values = ['always', 'as-needed']
@@ -388,7 +385,7 @@
         with patch(MOD_PREFIX + '.get_object_or_404'):
             device_removal(mock_request, 100)
 
-        self.assertEqual(mock_request.session, {})
+        self.assertEqual(mock_request.session.keys(), ['message'])
 
 
 class TestPrefs(TwoFactorTestCase):

=== modified file 'identityprovider/views/devices.py'
--- identityprovider/views/devices.py	2012-02-17 14:41:32 +0000
+++ identityprovider/views/devices.py	2012-02-22 17:45:23 +0000
@@ -67,6 +67,8 @@
             request.user.twofactor_required = False
         if request.user.twofactor_required != initial:
             request.user.save()
+            request.session['message'] = _("Your account details have been "\
+                                           "successfully updated")
         return HttpResponseSeeOther(reverse(DEVICE_LIST))
 
     devices = request.user.devices.all()
@@ -86,6 +88,8 @@
         always_checked=always_checked,
         as_needed_checked=as_needed_checked,
         devices=devices,
+        message=request.session.pop('message', None),
+        message_style='informational',
     )
     return render_to_response('device/list.html', context)
 
@@ -164,6 +168,9 @@
                     counter=new_counter
                 )
                 twofactor.login(request)
+                request.session['message'] = _("Authentication device '%s' "\
+                                               "has been successfully added" %
+                                               device_name)
                 return HttpResponseSeeOther(reverse(DEVICE_LIST))
             # Otherwise, set the error flag and fall through...
             error = _("The one-time password didn't match the AES key.")
@@ -227,7 +234,9 @@
         request.user.twofactor_required = False
         request.user.save()
         twofactor.logout(request)
-
+    
+    request.session['message'] = _("Authentication device '%s' has been "\
+                                   "successfully deleted" % device.name)
     return HttpResponseSeeOther('/device-list')
 
 
@@ -244,8 +253,12 @@
         device = get_object_or_404(AuthenticationDevice, id=int(device_id))
         form = DeviceRenameForm(request.POST)
         if form.is_valid():
+            original_name = device.name
             device.name = form.cleaned_data['name']
             device.save()
+            request.session['message'] = _("Authentication device '%s' has "\
+                                           "been successfully renamed to '%s'" %
+                                           (original_name, device.name))
             return HttpResponseRedirect(reverse(DEVICE_LIST))
         else:
             return render_to_response('device/rename.html',