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

code review feedback

Browse Source
This commit is contained in:
Kenneth Kehl
2024-10-09 11:42:20 -07:00
parent 10a8d1b938
commit d86b1afb9a
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/models/user.py
View File

@@ -1,7 +1,7 @@
import os import os
from datetime import datetime from datetime import datetime
from flask import abort, request, session from flask import abort, current_app, request, session
from flask_login import AnonymousUserMixin, UserMixin, login_user, logout_user from flask_login import AnonymousUserMixin, UserMixin, login_user, logout_user
from notifications_python_client.errors import HTTPError from notifications_python_client.errors import HTTPError
from werkzeug.utils import cached_property from werkzeug.utils import cached_property
@@ -177,7 +177,7 @@ class User(JSONModel, UserMixin):
# Update the db so the server also knows the user is logged out. # Update the db so the server also knows the user is logged out.
self.update(current_session_id=None) self.update(current_session_id=None)
logout_user() logout_user()
# current_app.logger.info(f"Logged out {self.id}") current_app.logger.info(f"Logged out {self.id}")
@property @property
def sms_auth(self): def sms_auth(self):
@@ -247,20 +247,26 @@ class User(JSONModel, UserMixin):
# platform admins should be able to do most things (except eg send messages, or create api keys) # platform admins should be able to do most things (except eg send messages, or create api keys)
if self.platform_admin and not restrict_admin_usage: if self.platform_admin and not restrict_admin_usage:
# current_app.logger.warning(f"{log_msg} true because user is platform_admin") current_app.logger.debug(
"has_permissions is true because user is platform_admin"
)
return True return True
if org_id: if org_id:
value = self.belongs_to_organization(org_id) value = self.belongs_to_organization(org_id)
# current_app.logger.warning(f"{log_msg} org: {org_id} returning {value}") current_app.logger.debug(
f"has_permissions returns org: {org_id} returning {value}"
)
return value return value
if not permissions and self.belongs_to_service(service_id): if not permissions and self.belongs_to_service(service_id):
# current_app.logger.warning(f"{log_msg} True because belongs_to_service") current_app.logger.debug("has_permissions True because belongs_to_service")
return True return True
if any(self.permissions_for_service(service_id) & set(permissions)): if any(self.permissions_for_service(service_id) & set(permissions)):
# current_app.logger.warning(f"{log_msg} permissions valid") current_app.logger.debug(
"has_permissions returns True because permissions valid"
)
return True return True
from app.models.service import Service from app.models.service import Service
@@ -268,7 +274,7 @@ class User(JSONModel, UserMixin):
org_value = allow_org_user and self.belongs_to_organization( org_value = allow_org_user and self.belongs_to_organization(
Service.from_id(service_id).organization_id Service.from_id(service_id).organization_id
) )
# current_app.logger.warning(f"{log_msg} returning {org_value}") current_app.logger.debug(f"has_permissions returning {org_value}")
return org_value return org_value
def permissions_for_service(self, service_id): def permissions_for_service(self, service_id):
@@ -276,10 +282,10 @@ class User(JSONModel, UserMixin):
def has_permission_for_service(self, service_id, permission): def has_permission_for_service(self, service_id, permission):
has_permission = permission in self.permissions_for_service(service_id) has_permission = permission in self.permissions_for_service(service_id)
# current_app.logger.warning( current_app.logger.debug(
# f"has_permission_for_service user: {self.id} service: {service_id} " f"has_permission_for_service user: {self.id} service: {service_id} "
# f"permission: {permission} retuning {has_permission}" f"permission: {permission} retuning {has_permission}"
# ) )
return has_permission return has_permission
def has_template_folder_permission(self, template_folder, service=None): def has_template_folder_permission(self, template_folder, service=None):