darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-17 04:59:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2510 from alphagov/fix-user-with-no-permissions

Browse Source 
Fix the permission check for users without permissions.
This commit is contained in:
Rebecca Law
2018-11-19 17:06:33 +00:00
committed by GitHub
parent fe9cffc4d1 dd22fa06a4
commit 28b9adf4e0
6 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.py
View File

@@ -119,7 +119,6 @@ class User(UserMixin):
def has_permissions(self, *permissions, restrict_admin_usage=False):
unknown_permissions = set(permissions) - all_permissions
if unknown_permissions:
raise TypeError('{} are not valid permissions'.format(list(unknown_permissions)))
@@ -139,7 +138,7 @@ class User(UserMixin):
if org_id:
return org_id in self.organisations
if not permissions:
return service_id in self._permissions
return service_id in self.services
if service_id:
return any(x in self._permissions.get(service_id, []) for x in permissions)