pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate WorkspaceUser into WorkspaceRole

Browse Source
This commit is contained in:
richard-dds
2018-11-02 15:24:25 -04:00
parent d78c6de386
commit 3765a73dc1
16 changed files with 127 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atst/domain/authz.py
View File

@@ -1,4 +1,4 @@
from atst.domain.workspace_users import WorkspaceUsers
from atst.domain.workspace_roles import WorkspaceRoles
from atst.models.permissions import Permissions
from atst.domain.exceptions import UnauthorizedError
@@ -6,7 +6,7 @@ from atst.domain.exceptions import UnauthorizedError
class Authorization(object):
@classmethod
def has_workspace_permission(cls, user, workspace, permission):
return permission in WorkspaceUsers.workspace_user_permissions(workspace, user)
return permission in WorkspaceRoles.workspace_role_permissions(workspace, user)
@classmethod
def has_atat_permission(cls, user, permission):

8
atst/domain/environments.py
View File

@@ -58,7 +58,7 @@ class Environments(object):
return env
@classmethod
def update_environment_roles(cls, user, workspace, workspace_user, ids_and_roles):
def update_environment_roles(cls, user, workspace, workspace_role, ids_and_roles):
Authorization.check_workspace_permission(
user,
workspace,
@@ -71,16 +71,16 @@ class Environments(object):
environment = Environments.get(id_and_role["id"])
if new_role is None:
EnvironmentRoles.delete(workspace_user.user.id, environment.id)
EnvironmentRoles.delete(workspace_role.user.id, environment.id)
else:
env_role = EnvironmentRoles.get(
workspace_user.user.id, id_and_role["id"]
workspace_role.user.id, id_and_role["id"]
)
if env_role:
env_role.role = new_role
else:
env_role = EnvironmentRole(
user=workspace_user.user, environment=environment, role=new_role
user=workspace_role.user, environment=environment, role=new_role
)
db.session.add(env_role)

4
atst/domain/invitations.py
View File

@@ -3,7 +3,7 @@ from sqlalchemy.orm.exc import NoResultFound
from atst.database import db
from atst.models.invitation import Invitation, Status as InvitationStatus
from atst.domain.workspace_users import WorkspaceUsers
from atst.domain.workspace_roles import WorkspaceRoles
from .exceptions import NotFoundError
@@ -83,7 +83,7 @@ class Invitations(object):
elif invite.is_pending:
Invitations._update_status(invite, InvitationStatus.ACCEPTED)
WorkspaceUsers.enable(invite.workspace_role)
WorkspaceRoles.enable(invite.workspace_role)
return invite
@classmethod

2
atst/domain/projects.py
View File

@@ -48,7 +48,7 @@ class Projects(object):
)
@classmethod
def get_all(cls, user, workspace_user, workspace):
def get_all(cls, user, workspace_role, workspace):
Authorization.check_workspace_permission(
user,
workspace,

31
atst/domain/workspace_users.py → atst/domain/workspace_roles.py
View File

@@ -2,7 +2,6 @@ from sqlalchemy.orm.exc import NoResultFound
from atst.database import db
from atst.models.workspace_role import WorkspaceRole, Status as WorkspaceRoleStatus
from atst.models.workspace_user import WorkspaceUser
from atst.models.user import User
from .roles import Roles
@@ -10,14 +9,9 @@ from .users import Users
from .exceptions import NotFoundError
class WorkspaceUsers(object):
class WorkspaceRoles(object):
@classmethod
def get(cls, workspace_id, user_id):
try:
user = Users.get(user_id)
except NoResultFound:
raise NotFoundError("user")
try:
workspace_role = (
db.session.query(WorkspaceRole)
@@ -28,7 +22,7 @@ class WorkspaceUsers(object):
except NoResultFound:
workspace_role = None
return WorkspaceUser(user, workspace_role)
return workspace_role
@classmethod
def _get_active_workspace_role(cls, workspace_id, user_id):
@@ -44,8 +38,8 @@ class WorkspaceUsers(object):
return None
@classmethod
def workspace_user_permissions(cls, workspace, user):
workspace_role = WorkspaceUsers._get_active_workspace_role(
def workspace_role_permissions(cls, workspace, user):
workspace_role = WorkspaceRoles._get_active_workspace_role(
workspace.id, user.id
)
atat_permissions = set(user.atat_role.permissions)
@@ -94,23 +88,23 @@ class WorkspaceUsers(object):
db.session.add(user)
db.session.commit()
return WorkspaceUser(user, new_workspace_role)
return new_workspace_role
@classmethod
def update_role(cls, member, workspace_id, role_name):
new_role = Roles.get(role_name)
workspace_role = WorkspaceUsers._get_workspace_role(member.user, workspace_id)
workspace_role = WorkspaceRoles._get_workspace_role(member.user, workspace_id)
workspace_role.role = new_role
db.session.add(workspace_role)
db.session.commit()
return WorkspaceUser(member.user, workspace_role)
return workspace_role
@classmethod
def add_many(cls, workspace_id, workspace_user_dicts):
workspace_users = []
def add_many(cls, workspace_id, workspace_role_dicts):
workspace_roles = []
for user_dict in workspace_user_dicts:
for user_dict in workspace_role_dicts:
try:
user = Users.get(user_dict["id"])
except NoResultFound:
@@ -139,14 +133,13 @@ class WorkspaceUsers(object):
)
user.workspace_roles.append(new_workspace_role)
workspace_user = WorkspaceUser(user, new_workspace_role)
workspace_users.append(workspace_user)
workspace_roles.append(new_workspace_role)
db.session.add(user)
db.session.commit()
return workspace_users
return workspace_roles
@classmethod
def enable(cls, workspace_role):

8
atst/domain/workspaces/workspaces.py
View File

@@ -2,7 +2,7 @@ from atst.domain.roles import Roles
from atst.domain.authz import Authorization
from atst.models.permissions import Permissions
from atst.domain.users import Users
from atst.domain.workspace_users import WorkspaceUsers
from atst.domain.workspace_roles import WorkspaceRoles
from atst.models.workspace_role import Status as WorkspaceRoleStatus
from .query import WorkspacesQuery
@@ -95,8 +95,8 @@ class Workspaces(object):
@classmethod
def add_member(cls, workspace, member, role_name):
workspace_user = WorkspaceUsers.add(member, workspace.id, role_name)
return workspace_user
workspace_role = WorkspaceRoles.add(member, workspace.id, role_name)
return workspace_role
@classmethod
def update_member(cls, user, workspace, member, role_name):
@@ -107,7 +107,7 @@ class Workspaces(object):
"edit workspace member",
)
return WorkspaceUsers.update_role(member, workspace.id, role_name)
return WorkspaceRoles.update_role(member, workspace.id, role_name)
@classmethod
def _create_workspace_role(