From 069a549d573d0c80ebec564aeacdeb88f3eb3a4c Mon Sep 17 00:00:00 2001
From: Adam Shimali <adam.shimali@gmail.com>
Date: Fri, 11 Mar 2016 12:50:25 +0000
Subject: [PATCH] Bug fix for passing list of empty string if no permissions
 selected for invite.

Send empty list instead.
---
 app/notify_client/models.py                |  5 ++++-
 tests/app/main/views/test_accept_invite.py | 23 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/notify_client/models.py b/app/notify_client/models.py
index 9c8093ff4..fc5c48691 100644
--- a/app/notify_client/models.py
+++ b/app/notify_client/models.py
@@ -129,7 +129,10 @@ class InvitedUser(object):
         if isinstance(permissions, list):
             self.permissions = permissions
         else:
-            self.permissions = permissions.split(',')
+            if permissions:
+                self.permissions = permissions.split(',')
+            else:
+                self.permissions = []
         self.status = status
         self.created_at = created_at
 
diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py
index 9614030bc..9f9c1f32a 100644
--- a/tests/app/main/views/test_accept_invite.py
+++ b/tests/app/main/views/test_accept_invite.py
@@ -36,6 +36,29 @@ def test_existing_user_accept_invite_calls_api_and_redirects_to_dashboard(app_,
             assert response.location == expected_redirect_location
 
 
+def test_existing_user_with_no_permissions_accept_invite(app_,
+                                                         mocker,
+                                                         service_one,
+                                                         api_user_active,
+                                                         sample_invite,
+                                                         mock_check_invite_token,
+                                                         mock_get_user_by_email,
+                                                         mock_add_user_to_service):
+
+    expected_service = service_one['id']
+    sample_invite['permissions'] = ''
+    expected_permissions = []
+    mocker.patch('app.invite_api_client.accept_invite', return_value=sample_invite)
+
+    with app_.test_request_context():
+        with app_.test_client() as client:
+
+            response = client.get(url_for('main.accept_invite', token='thisisnotarealtoken'))
+            mock_add_user_to_service.assert_called_with(expected_service, api_user_active.id, expected_permissions)
+
+            assert response.status_code == 302
+
+
 def test_existing_user_cant_accept_twice(app_,
                                          mocker,
                                          sample_invite):