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

Add a user method to check folder permission

Browse Source 
User model is the most natural place for a permission check method,
however this means that we need to pass the full user object to
service model methods and TemplateList instead of user_id.
This commit is contained in:
Alexey Bezhan
2019-03-11 14:13:56 +00:00
parent 0f9207a161
commit e6d7f7ebeb
7 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/models/service.py
View File

@@ -155,10 +155,10 @@ class Service():
def all_template_ids(self):
return {template['id'] for template in self.all_templates}
def get_templates(self, template_type='all', template_folder_id=None, user_id=None):
if user_id and template_folder_id and self.has_permission('edit_folder_permissions'):
def get_templates(self, template_type='all', template_folder_id=None, user=None):
if user and template_folder_id and self.has_permission('edit_folder_permissions'):
folder = self.get_template_folder(template_folder_id)
if user_id not in folder.get("users_with_permission", []):
if not user.has_template_folder_permission(folder):
return []
if isinstance(template_type, str):
@@ -403,7 +403,7 @@ class Service():
def all_template_folder_ids(self):
return {folder['id'] for folder in self.all_template_folders}
def get_user_template_folders(self, user_id):
def get_user_template_folders(self, user):
"""Returns a modified list of folders a user has permission to view
For each folder, we do the following:
@@ -422,10 +422,10 @@ class Service():
user_folders = []
for folder in self.all_template_folders:
if user_id not in folder.get("users_with_permission", []):
if not user.has_template_folder_permission(folder):
continue
parent = self.get_template_folder(folder["parent_id"])
if user_id in parent.get("users_with_permission", []):
if user.has_template_folder_permission(parent):
user_folders.append(folder)
else:
folder_attrs = {
@@ -439,14 +439,14 @@ class Service():
else:
parent = self.get_template_folder(parent["parent_id"])
folder_attrs["parent_id"] = parent.get("id", None)
if user_id in parent.get("users_with_permission", []):
if user.has_template_folder_permission(parent):
break
user_folders.append(folder_attrs)
return user_folders
def get_template_folders(self, template_type='all', parent_folder_id=None, user_id=None):
if user_id:
folders = self.get_user_template_folders(user_id)
def get_template_folders(self, template_type='all', parent_folder_id=None, user=None):
if user:
folders = self.get_user_template_folders(user)
else:
folders = self.all_template_folders
if parent_folder_id:
@@ -456,7 +456,7 @@ class Service():
folder for folder in folders
if (
folder['parent_id'] == parent_folder_id
and self.is_folder_visible(folder['id'], template_type, user_id)
and self.is_folder_visible(folder['id'], template_type, user)
)
]
@@ -469,7 +469,7 @@ class Service():
}
return self._get_by_id(self.all_template_folders, folder_id)
def is_folder_visible(self, template_folder_id, template_type='all', user_id=None):
def is_folder_visible(self, template_folder_id, template_type='all', user=None):
if template_type == 'all':
return True
@@ -478,8 +478,8 @@ class Service():
return True
if any(
self.is_folder_visible(child_folder['id'], template_type, user_id)
for child_folder in self.get_template_folders(template_type, template_folder_id, user_id)
self.is_folder_visible(child_folder['id'], template_type, user)
for child_folder in self.get_template_folders(template_type, template_folder_id, user)
):
return True