diff --git a/atst/domain/permission_sets.py b/atst/domain/permission_sets.py index 1308ec5f..99862742 100644 --- a/atst/domain/permission_sets.py +++ b/atst/domain/permission_sets.py @@ -16,6 +16,7 @@ class PermissionSets(object): EDIT_PORTFOLIO_REPORTS = "edit_portfolio_reports" EDIT_PORTFOLIO_ADMIN = "edit_portfolio_admin" PORTFOLIO_POC = "portfolio_poc" + VIEW_AUDIT_LOG = "view_audit_log" @classmethod def get(cls, perms_set_name): @@ -44,19 +45,13 @@ class PermissionSets(object): return permission_sets -ATAT_ROLES = [ +ATAT_PERMISSION_SETS = [ { - "name": "ccpo", - "display_name": "CCPO", + "name": PermissionSets.VIEW_AUDIT_LOG, + "display_name": "View Audit Log", "description": "", "permissions": [Permissions.VIEW_AUDIT_LOG], - }, - { - "name": "default", - "display_name": "Default", - "description": "", - "permissions": [], - }, + } ] _PORTFOLIO_BASIC_PERMISSION_SETS = [ diff --git a/atst/routes/dev.py b/atst/routes/dev.py index ac444cb1..6a9631d5 100644 --- a/atst/routes/dev.py +++ b/atst/routes/dev.py @@ -19,7 +19,6 @@ from atst.utils import pick bp = Blueprint("dev", __name__) _ALL_PERMS = [ - "ccpo", PermissionSets.VIEW_PORTFOLIO, PermissionSets.VIEW_PORTFOLIO_APPLICATION_MANAGEMENT, PermissionSets.VIEW_PORTFOLIO_FUNDING, @@ -30,6 +29,7 @@ _ALL_PERMS = [ PermissionSets.EDIT_PORTFOLIO_REPORTS, PermissionSets.EDIT_PORTFOLIO_ADMIN, PermissionSets.PORTFOLIO_POC, + PermissionSets.VIEW_AUDIT_LOG, ] _DEV_USERS = { diff --git a/script/seed_roles.py b/script/seed_roles.py index 55e69bb0..4340e7a7 100755 --- a/script/seed_roles.py +++ b/script/seed_roles.py @@ -10,11 +10,11 @@ from sqlalchemy.orm.exc import NoResultFound from atst.app import make_config, make_app from atst.database import db from atst.models import PermissionSet, Permissions -from atst.domain.permission_sets import ATAT_ROLES, PORTFOLIO_PERMISSION_SETS +from atst.domain.permission_sets import ATAT_PERMISSION_SETS, PORTFOLIO_PERMISSION_SETS def seed_roles(): - for permission_set_info in ATAT_ROLES + PORTFOLIO_PERMISSION_SETS: + for permission_set_info in ATAT_PERMISSION_SETS + PORTFOLIO_PERMISSION_SETS: permission_set = PermissionSet(**permission_set_info) try: existing_permission_set = ( diff --git a/tests/test_auth.py b/tests/test_auth.py index b956137f..5b95a9d7 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -49,7 +49,7 @@ def test_successful_login_redirect_ccpo(client, monkeypatch): monkeypatch.setattr( "atst.domain.authnid.AuthenticationContext.authenticate", lambda *args: True ) - role = PermissionSets.get("ccpo") + role = PermissionSets.get(PermissionSets.VIEW_AUDIT_LOG) monkeypatch.setattr( "atst.domain.authnid.AuthenticationContext.get_user", lambda *args: UserFactory.create(),