Fetch system roles from new `/auth/system/roles` endpoint.

5 files changed, 7 insertions, 7 deletions

diff --git a/wqflask/wqflask/oauth2/data.py b/wqflask/wqflask/oauth2/data.py
index 9edfe964..02219c10 100644
--- a/wqflask/wqflask/oauth2/data.py
+++ b/wqflask/wqflask/oauth2/data.py
@@ -186,7 +186,7 @@ def list_data():
     groups = oauth2_get("auth/group/list").either(
         lambda err: {"groups_error": process_error(err)},
         lambda grp: {"groups": grp})
-    roles = oauth2_get("auth/user/roles").either(
+    roles = oauth2_get("auth/system/roles").either(
         lambda err: {"roles_error": process_error(err)},
         lambda roles: {"roles": roles})
     species = oauth2_get("auth/data/species").either(
diff --git a/wqflask/wqflask/oauth2/roles.py b/wqflask/wqflask/oauth2/roles.py
index 1549e105..ee9d8377 100644
--- a/wqflask/wqflask/oauth2/roles.py
+++ b/wqflask/wqflask/oauth2/roles.py
@@ -32,7 +32,7 @@ def user_roles():
             lambda err: __grerror__(roles, uprivs, err),
             lambda groles: __grsuccess__(roles, uprivs, groles))
 
-    return oauth2_get("auth/user/roles").either(
+    return oauth2_get("auth/system/roles").either(
         request_error, __role_success__)
 
 @roles.route("/role/<uuid:role_id>", methods=["GET"])
diff --git a/wqflask/wqflask/oauth2/ui.py b/wqflask/wqflask/oauth2/ui.py
index 39b735fb..b706cdd9 100644
--- a/wqflask/wqflask/oauth2/ui.py
+++ b/wqflask/wqflask/oauth2/ui.py
@@ -9,7 +9,7 @@ def render_ui(templatepath: str, **kwargs):
     """Handle repetitive UI rendering stuff."""
     roles = kwargs.get("roles", tuple()) # Get roles if already provided
     if user_logged_in() and not bool(roles): # If not, try fetching them
-        roles_results = oauth2_get("auth/user/roles").either(
+        roles_results = oauth2_get("auth/system/roles").either(
             lambda err: {"roles_error": process_error(err)},
             lambda roles: {"roles": roles})
         kwargs = {**kwargs, **roles_results}
diff --git a/wqflask/wqflask/oauth2/users.py b/wqflask/wqflask/oauth2/users.py
index fc451b93..76ae56cb 100644
--- a/wqflask/wqflask/oauth2/users.py
+++ b/wqflask/wqflask/oauth2/users.py
@@ -38,7 +38,7 @@ def user_profile():
                 user_details, group_join_error=process_error(err)),
             lambda gjr: __render__(usr_dets, roles=roles, group_join_request=gjr))
 
-    return oauth2_get("auth/user/roles").either(
+    return oauth2_get("auth/system/roles").either(
         lambda err: __render__(usr_dets, role_error=process_error(err)),
         __roles_success__)
 
diff --git a/wqflask/wqflask/templates/oauth2/profile_nav.html b/wqflask/wqflask/templates/oauth2/profile_nav.html
index 24658ee8..aa752905 100644
--- a/wqflask/wqflask/templates/oauth2/profile_nav.html
+++ b/wqflask/wqflask/templates/oauth2/profile_nav.html
@@ -1,4 +1,4 @@
-{%macro profile_nav(calling_page, user_privileges)%}
+{%macro profile_nav(calling_page, user_sys_privileges)%}
 
 <ul class="nav nav-pills">
 
@@ -30,7 +30,7 @@
     <a href="{{url_for('oauth2.resource.user_resources')}}">Resources</a>
   </li>
 
-  {%if "system:data:link-to-group" in user_privileges %}
+  {%if "system:data:link-to-group" in user_sys_privileges %}
   <li role="presentation"
       {%if calling_page == "data"%}
       class="active"
@@ -39,7 +39,7 @@
   </li>
   {%endif%}
 
-  {%if "system:user:masquerade" in user_privileges %}
+  {%if "system:user:masquerade" in user_sys_privileges %}
   <li role="presentation"
       {%if calling_page == "masquerade"%}
       class="active"