Merge pull request #196 from alphagov/get-users-for-service

Get users for service

app/main/views/manage_users.py

@@ -29,10 +29,11 @@ fake_users = [
 @main.route("/services/<service_id>/users")
 @login_required
 def manage_users(service_id):
+    users = user_api_client.get_users_for_service(service_id=service_id)
     return render_template(
         'views/manage-users.html',
         service_id=service_id,
-        users=fake_users,
+        users=users,
         current_user=current_user,
         invited_users=[]
     )

app/notify_client/user_api_client.py

@@ -81,6 +81,11 @@ class UserApiClient(BaseAPIClient):
                     return False, 'Code not found'
             raise e
 
+    def get_users_for_service(self, service_id):
+        endpoint = '/service/{}/users'.format(service_id)
+        resp = self.get(endpoint)
+        return resp['data']
+
 
 class User(UserMixin):
     def __init__(self, fields, max_failed_login_count=3):

app/templates/views/manage-users.html

@@ -26,13 +26,13 @@ Manage users – GOV.UK Notify
     users, caption='Active', **table_options
   ) %}
     {% call field() %}
-      {{ current_user.name }}
+      {{ item.name }}
     {% endcall %}
     {{ boolean_field(item.permission_send_messages) }}
     {{ boolean_field(item.permission_manage_service) }}
     {{ boolean_field(item.permission_manage_api_keys) }}
     {% call field(align='right') %}
-      <a href="{{ url_for('.edit_user', service_id=service_id, user_id=0)}}">Change</a>
+      <a href="{{ url_for('.edit_user', service_id=service_id, user_id=item.id)}}">Change</a>
     {% endcall %}
   {% endcall %}