diff options
| -rw-r--r-- | gn_auth/auth/authorisation/resources/checks.py | 2 | ||||
| -rw-r--r-- | gn_auth/auth/authorisation/resources/groups/models.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gn_auth/auth/authorisation/resources/checks.py b/gn_auth/auth/authorisation/resources/checks.py index ca45a20..5484dbf 100644 --- a/gn_auth/auth/authorisation/resources/checks.py +++ b/gn_auth/auth/authorisation/resources/checks.py @@ -71,7 +71,7 @@ def authorised_for2( "INNER JOIN role_privileges ON roles.role_id=role_privileges.role_id " "INNER JOIN privileges " "ON role_privileges.privilege_id=privileges.privilege_id " - f"WHERE resources.resource_id=? " + "WHERE resources.resource_id=? " "AND user_roles.user_id=?") cursor.execute( _query, diff --git a/gn_auth/auth/authorisation/resources/groups/models.py b/gn_auth/auth/authorisation/resources/groups/models.py index 29dcc89..819cae8 100644 --- a/gn_auth/auth/authorisation/resources/groups/models.py +++ b/gn_auth/auth/authorisation/resources/groups/models.py @@ -122,7 +122,7 @@ def create_group( cursor, group_name, ( {"group_description": group_description} if group_description else {})) - group_resource = { + _group_resource = { "group_id": str(new_group.group_id), "resource_id": str(uuid4()), "resource_name": group_name, @@ -135,17 +135,17 @@ def create_group( cursor.execute( "INSERT INTO resources VALUES " "(:resource_id, :resource_name, :resource_category_id, :public)", - group_resource) + _group_resource) cursor.execute( "INSERT INTO group_resources(resource_id, group_id) " "VALUES(:resource_id, :group_id)", - group_resource) + _group_resource) add_user_to_group(cursor, new_group, group_leader) revoke_user_role_by_name(cursor, group_leader, "group-creator") assign_user_role_by_name( cursor, group_leader, - UUID(str(group_resource["resource_id"])), + UUID(str(_group_resource["resource_id"])), "group-leader") return new_group |