Rearrange and rename application routes.
- move application routes to their own Flask blueprint - squash application routes to be resource-specific - reorganize application routes
This commit is contained in:
dandds
@@ -14,6 +14,7 @@ from atst.filters import register_filters
|
||||
from atst.routes import bp
|
||||
from atst.routes.portfolios import portfolios_bp as portfolio_routes
|
||||
from atst.routes.task_orders import task_orders_bp
|
||||
from atst.routes.applications import applications_bp
|
||||
from atst.routes.dev import bp as dev_routes
|
||||
from atst.routes.users import bp as user_routes
|
||||
from atst.routes.errors import make_error_pages
|
||||
@@ -71,6 +72,7 @@ def make_app(config):
|
||||
app.register_blueprint(bp)
|
||||
app.register_blueprint(portfolio_routes)
|
||||
app.register_blueprint(task_orders_bp)
|
||||
app.register_blueprint(applications_bp)
|
||||
app.register_blueprint(user_routes)
|
||||
|
||||
if ENV != "prod":
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
from flask import current_app as app
|
||||
from sqlalchemy.orm.exc import NoResultFound
|
||||
|
||||
from atst.database import db
|
||||
from atst.domain.exceptions import NotFoundError
|
||||
from atst.models import EnvironmentRole, Environment, Application
|
||||
from atst.models import EnvironmentRole
|
||||
|
||||
|
||||
class EnvironmentRoles(object):
|
||||
@@ -15,23 +13,6 @@ class EnvironmentRoles(object):
|
||||
app.csp.cloud.create_role(env_role)
|
||||
return env_role
|
||||
|
||||
@classmethod
|
||||
def get_for_portfolio(cls, user_id, environment_id, portfolio_id):
|
||||
try:
|
||||
return (
|
||||
db.session.query(EnvironmentRole)
|
||||
.join(Environment, EnvironmentRole.environment_id == Environment.id)
|
||||
.join(Application, Environment.application_id == Application.id)
|
||||
.filter(
|
||||
EnvironmentRole.user_id == user_id,
|
||||
EnvironmentRole.environment_id == environment_id,
|
||||
Application.portfolio_id == portfolio_id,
|
||||
)
|
||||
.one()
|
||||
)
|
||||
except NoResultFound:
|
||||
raise NotFoundError("environment_role")
|
||||
|
||||
@classmethod
|
||||
def get(cls, user_id, environment_id):
|
||||
existing_env_role = (
|
||||
|
||||
@@ -76,14 +76,16 @@ def home():
|
||||
)
|
||||
else:
|
||||
return redirect(
|
||||
url_for("portfolios.portfolio_applications", portfolio_id=portfolio_id)
|
||||
url_for(
|
||||
"applications.portfolio_applications", portfolio_id=portfolio_id
|
||||
)
|
||||
)
|
||||
else:
|
||||
portfolios = Portfolios.for_user(g.current_user)
|
||||
first_portfolio = sorted(portfolios, key=lambda portfolio: portfolio.name)[0]
|
||||
return redirect(
|
||||
url_for(
|
||||
"portfolios.portfolio_applications", portfolio_id=first_portfolio.id
|
||||
"applications.portfolio_applications", portfolio_id=first_portfolio.id
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
32
atst/routes/applications/__init__.py
Normal file
32
atst/routes/applications/__init__.py
Normal file
@@ -0,0 +1,32 @@
|
||||
from flask import Blueprint, current_app as app, g, redirect, url_for
|
||||
|
||||
applications_bp = Blueprint("applications", __name__)
|
||||
|
||||
from . import index
|
||||
from . import new
|
||||
from . import settings
|
||||
from . import team
|
||||
from atst.domain.environment_roles import EnvironmentRoles
|
||||
from atst.domain.exceptions import UnauthorizedError
|
||||
from atst.domain.authz.decorator import user_can_access_decorator as user_can
|
||||
from atst.models.permissions import Permissions
|
||||
from atst.utils.context_processors import portfolio as portfolio_context_processor
|
||||
|
||||
applications_bp.context_processor(portfolio_context_processor)
|
||||
|
||||
|
||||
def wrap_environment_role_lookup(user, environment_id=None, **kwargs):
|
||||
env_role = EnvironmentRoles.get(user.id, environment_id)
|
||||
if not env_role:
|
||||
raise UnauthorizedError(user, "access environment {}".format(environment_id))
|
||||
|
||||
return True
|
||||
|
||||
|
||||
@applications_bp.route("/environments/<environment_id>/access")
|
||||
@user_can(None, override=wrap_environment_role_lookup, message="access environment")
|
||||
def access_environment(environment_id):
|
||||
env_role = EnvironmentRoles.get(g.current_user.id, environment_id)
|
||||
token = app.csp.cloud.get_access_token(env_role)
|
||||
|
||||
return redirect(url_for("atst.csp_environment_access", token=token))
|
||||
11
atst/routes/applications/index.py
Normal file
11
atst/routes/applications/index.py
Normal file
@@ -0,0 +1,11 @@
|
||||
from flask import render_template
|
||||
|
||||
from . import applications_bp
|
||||
from atst.domain.authz.decorator import user_can_access_decorator as user_can
|
||||
from atst.models.permissions import Permissions
|
||||
|
||||
|
||||
@applications_bp.route("/portfolios/<portfolio_id>/applications")
|
||||
@user_can(Permissions.VIEW_APPLICATION, message="view portfolio applications")
|
||||
def portfolio_applications(portfolio_id):
|
||||
return render_template("portfolios/applications/index.html")
|
||||
36
atst/routes/applications/new.py
Normal file
36
atst/routes/applications/new.py
Normal file
@@ -0,0 +1,36 @@
|
||||
from flask import redirect, render_template, request as http_request, url_for
|
||||
|
||||
from . import applications_bp
|
||||
from atst.domain.applications import Applications
|
||||
from atst.domain.portfolios import Portfolios
|
||||
from atst.forms.application import NewApplicationForm
|
||||
from atst.domain.authz.decorator import user_can_access_decorator as user_can
|
||||
from atst.models.permissions import Permissions
|
||||
|
||||
|
||||
@applications_bp.route("/portfolios/<portfolio_id>/applications/new")
|
||||
@user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
|
||||
def new(portfolio_id):
|
||||
form = NewApplicationForm()
|
||||
return render_template("portfolios/applications/new.html", form=form)
|
||||
|
||||
|
||||
@applications_bp.route("/portfolios/<portfolio_id>/applications", methods=["POST"])
|
||||
@user_can(Permissions.CREATE_APPLICATION, message="create new application")
|
||||
def create(portfolio_id):
|
||||
portfolio = Portfolios.get_for_update(portfolio_id)
|
||||
form = NewApplicationForm(http_request.form)
|
||||
|
||||
if form.validate():
|
||||
application_data = form.data
|
||||
Applications.create(
|
||||
portfolio,
|
||||
application_data["name"],
|
||||
application_data["description"],
|
||||
application_data["environment_names"],
|
||||
)
|
||||
return redirect(
|
||||
url_for("applications.portfolio_applications", portfolio_id=portfolio_id)
|
||||
)
|
||||
else:
|
||||
return render_template("portfolios/applications/new.html", form=form)
|
||||
76
atst/routes/applications/settings.py
Normal file
76
atst/routes/applications/settings.py
Normal file
@@ -0,0 +1,76 @@
|
||||
from flask import redirect, render_template, request as http_request, url_for
|
||||
|
||||
from . import applications_bp
|
||||
from atst.domain.environment_roles import EnvironmentRoles
|
||||
from atst.domain.applications import Applications
|
||||
from atst.forms.application import ApplicationForm
|
||||
from atst.domain.authz.decorator import user_can_access_decorator as user_can
|
||||
from atst.models.permissions import Permissions
|
||||
from atst.utils.flash import formatted_flash as flash
|
||||
|
||||
|
||||
def get_environments_obj_for_app(application):
|
||||
environments_obj = {}
|
||||
|
||||
for env in application.environments:
|
||||
environments_obj[env.name] = []
|
||||
for user in env.users:
|
||||
env_role = EnvironmentRoles.get(user.id, env.id)
|
||||
environments_obj[env.name].append(
|
||||
{"name": user.full_name, "role": env_role.displayname}
|
||||
)
|
||||
|
||||
return environments_obj
|
||||
|
||||
|
||||
@applications_bp.route("/applications/<application_id>/settings")
|
||||
@user_can(Permissions.VIEW_APPLICATION, message="view application edit form")
|
||||
def settings(application_id):
|
||||
application = Applications.get(application_id)
|
||||
form = ApplicationForm(name=application.name, description=application.description)
|
||||
|
||||
return render_template(
|
||||
"portfolios/applications/edit.html",
|
||||
application=application,
|
||||
form=form,
|
||||
environments_obj=get_environments_obj_for_app(application=application),
|
||||
)
|
||||
|
||||
|
||||
@applications_bp.route("/applications/<application_id>/edit", methods=["POST"])
|
||||
@user_can(Permissions.EDIT_APPLICATION, message="update application")
|
||||
def update(application_id):
|
||||
application = Applications.get(application_id)
|
||||
form = ApplicationForm(http_request.form)
|
||||
if form.validate():
|
||||
application_data = form.data
|
||||
Applications.update(application, application_data)
|
||||
|
||||
return redirect(
|
||||
url_for(
|
||||
"applications.portfolio_applications",
|
||||
portfolio_id=application.portfolio_id,
|
||||
)
|
||||
)
|
||||
else:
|
||||
return render_template(
|
||||
"portfolios/applications/edit.html",
|
||||
application=application,
|
||||
form=form,
|
||||
environments_obj=get_environments_obj_for_app(application=application),
|
||||
)
|
||||
|
||||
|
||||
@applications_bp.route("/applications/<application_id>/delete", methods=["POST"])
|
||||
@user_can(Permissions.DELETE_APPLICATION, message="delete application")
|
||||
def delete(application_id):
|
||||
application = Applications.get(application_id)
|
||||
Applications.delete(application)
|
||||
|
||||
flash("application_deleted", application_name=application.name)
|
||||
|
||||
return redirect(
|
||||
url_for(
|
||||
"applications.portfolio_applications", portfolio_id=application.portfolio_id
|
||||
)
|
||||
)
|
||||
49
atst/routes/applications/team.py
Normal file
49
atst/routes/applications/team.py
Normal file
@@ -0,0 +1,49 @@
|
||||
from flask import render_template
|
||||
|
||||
|
||||
from . import applications_bp
|
||||
from atst.domain.environments import Environments
|
||||
from atst.domain.applications import Applications
|
||||
from atst.domain.authz.decorator import user_can_access_decorator as user_can
|
||||
from atst.models.permissions import Permissions
|
||||
from atst.domain.permission_sets import PermissionSets
|
||||
from atst.utils.localization import translate
|
||||
|
||||
|
||||
def permission_str(member, edit_perm_set):
|
||||
if member.has_permission_set(edit_perm_set):
|
||||
return translate("portfolios.members.permissions.edit_access")
|
||||
else:
|
||||
return translate("portfolios.members.permissions.view_only")
|
||||
|
||||
|
||||
@applications_bp.route("/applications/<application_id>/team")
|
||||
@user_can(Permissions.VIEW_APPLICATION, message="view portfolio applications")
|
||||
def team(application_id):
|
||||
application = Applications.get(resource_id=application_id)
|
||||
|
||||
environment_users = {}
|
||||
for member in application.members:
|
||||
user_id = member.user.id
|
||||
environment_users[user_id] = {
|
||||
"permissions": {
|
||||
"delete_access": permission_str(
|
||||
member, PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
|
||||
),
|
||||
"environment_management": permission_str(
|
||||
member, PermissionSets.EDIT_APPLICATION_ENVIRONMENTS
|
||||
),
|
||||
"team_management": permission_str(
|
||||
member, PermissionSets.EDIT_APPLICATION_TEAM
|
||||
),
|
||||
},
|
||||
"environments": Environments.for_user(
|
||||
user=member.user, application=application
|
||||
),
|
||||
}
|
||||
|
||||
return render_template(
|
||||
"portfolios/applications/team.html",
|
||||
application=application,
|
||||
environment_users=environment_users,
|
||||
)
|
||||
@@ -4,7 +4,6 @@ from operator import attrgetter
|
||||
portfolios_bp = Blueprint("portfolios", __name__)
|
||||
|
||||
from . import index
|
||||
from . import applications
|
||||
from . import members
|
||||
from . import invitations
|
||||
from . import task_orders
|
||||
|
||||
@@ -1,185 +0,0 @@
|
||||
from flask import (
|
||||
current_app as app,
|
||||
g,
|
||||
redirect,
|
||||
render_template,
|
||||
request as http_request,
|
||||
url_for,
|
||||
)
|
||||
|
||||
from . import portfolios_bp
|
||||
from atst.domain.environment_roles import EnvironmentRoles
|
||||
from atst.domain.environments import Environments
|
||||
from atst.domain.exceptions import UnauthorizedError
|
||||
from atst.domain.applications import Applications
|
||||
from atst.domain.portfolios import Portfolios
|
||||
from atst.forms.application import NewApplicationForm, ApplicationForm
|
||||
from atst.domain.authz.decorator import user_can_access_decorator as user_can
|
||||
from atst.models.permissions import Permissions
|
||||
from atst.utils.flash import formatted_flash as flash
|
||||
from atst.domain.permission_sets import PermissionSets
|
||||
from atst.utils.localization import translate
|
||||
|
||||
|
||||
@portfolios_bp.route("/portfolios/<portfolio_id>/applications")
|
||||
@user_can(Permissions.VIEW_APPLICATION, message="view portfolio applications")
|
||||
def portfolio_applications(portfolio_id):
|
||||
return render_template("portfolios/applications/index.html")
|
||||
|
||||
|
||||
@portfolios_bp.route("/portfolios/<portfolio_id>/applications/new")
|
||||
@user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
|
||||
def new_application(portfolio_id):
|
||||
form = NewApplicationForm()
|
||||
return render_template("portfolios/applications/new.html", form=form)
|
||||
|
||||
|
||||
@portfolios_bp.route("/portfolios/<portfolio_id>/applications/new", methods=["POST"])
|
||||
@user_can(Permissions.CREATE_APPLICATION, message="create new application")
|
||||
def create_application(portfolio_id):
|
||||
portfolio = Portfolios.get_for_update(portfolio_id)
|
||||
form = NewApplicationForm(http_request.form)
|
||||
|
||||
if form.validate():
|
||||
application_data = form.data
|
||||
Applications.create(
|
||||
portfolio,
|
||||
application_data["name"],
|
||||
application_data["description"],
|
||||
application_data["environment_names"],
|
||||
)
|
||||
return redirect(
|
||||
url_for("portfolios.portfolio_applications", portfolio_id=portfolio_id)
|
||||
)
|
||||
else:
|
||||
return render_template("portfolios/applications/new.html", form=form)
|
||||
|
||||
|
||||
def get_environments_obj_for_app(application):
|
||||
environments_obj = {}
|
||||
|
||||
for env in application.environments:
|
||||
environments_obj[env.name] = []
|
||||
for user in env.users:
|
||||
env_role = EnvironmentRoles.get(user.id, env.id)
|
||||
environments_obj[env.name].append(
|
||||
{"name": user.full_name, "role": env_role.displayname}
|
||||
)
|
||||
|
||||
return environments_obj
|
||||
|
||||
|
||||
@portfolios_bp.route("/portfolios/<portfolio_id>/applications/<application_id>/edit")
|
||||
@user_can(Permissions.VIEW_APPLICATION, message="view application edit form")
|
||||
def edit_application(portfolio_id, application_id):
|
||||
application = Applications.get(application_id, portfolio_id=portfolio_id)
|
||||
form = ApplicationForm(name=application.name, description=application.description)
|
||||
|
||||
return render_template(
|
||||
"portfolios/applications/edit.html",
|
||||
application=application,
|
||||
form=form,
|
||||
environments_obj=get_environments_obj_for_app(application=application),
|
||||
)
|
||||
|
||||
|
||||
@portfolios_bp.route(
|
||||
"/portfolios/<portfolio_id>/applications/<application_id>/edit", methods=["POST"]
|
||||
)
|
||||
@user_can(Permissions.EDIT_APPLICATION, message="update application")
|
||||
def update_application(portfolio_id, application_id):
|
||||
application = Applications.get(application_id, portfolio_id=portfolio_id)
|
||||
form = ApplicationForm(http_request.form)
|
||||
if form.validate():
|
||||
application_data = form.data
|
||||
Applications.update(application, application_data)
|
||||
|
||||
return redirect(
|
||||
url_for("portfolios.portfolio_applications", portfolio_id=portfolio_id)
|
||||
)
|
||||
else:
|
||||
return render_template(
|
||||
"portfolios/applications/edit.html",
|
||||
application=application,
|
||||
form=form,
|
||||
environments_obj=get_environments_obj_for_app(application=application),
|
||||
)
|
||||
|
||||
|
||||
def wrap_environment_role_lookup(
|
||||
user, portfolio_id=None, environment_id=None, **kwargs
|
||||
):
|
||||
env_role = EnvironmentRoles.get_for_portfolio(
|
||||
user.id, environment_id, portfolio_id=portfolio_id
|
||||
)
|
||||
if not env_role:
|
||||
raise UnauthorizedError(user, "access environment {}".format(environment_id))
|
||||
|
||||
return True
|
||||
|
||||
|
||||
@portfolios_bp.route("/portfolios/<portfolio_id>/environments/<environment_id>/access")
|
||||
@user_can(None, override=wrap_environment_role_lookup, message="access environment")
|
||||
def access_environment(portfolio_id, environment_id):
|
||||
env_role = EnvironmentRoles.get_for_portfolio(
|
||||
g.current_user.id, environment_id, portfolio_id=portfolio_id
|
||||
)
|
||||
token = app.csp.cloud.get_access_token(env_role)
|
||||
|
||||
return redirect(url_for("atst.csp_environment_access", token=token))
|
||||
|
||||
|
||||
@portfolios_bp.route(
|
||||
"/portfolios/<portfolio_id>/applications/<application_id>/delete", methods=["POST"]
|
||||
)
|
||||
@user_can(Permissions.DELETE_APPLICATION, message="delete application")
|
||||
def delete_application(portfolio_id, application_id):
|
||||
application = Applications.get(application_id, portfolio_id=portfolio_id)
|
||||
Applications.delete(application)
|
||||
|
||||
flash("application_deleted", application_name=application.name)
|
||||
|
||||
return redirect(
|
||||
url_for("portfolios.portfolio_applications", portfolio_id=portfolio_id)
|
||||
)
|
||||
|
||||
|
||||
def permission_str(member, edit_perm_set):
|
||||
if member.has_permission_set(edit_perm_set):
|
||||
return translate("portfolios.members.permissions.edit_access")
|
||||
else:
|
||||
return translate("portfolios.members.permissions.view_only")
|
||||
|
||||
|
||||
@portfolios_bp.route("/portfolios/<portfolio_id>/applications/<application_id>/team")
|
||||
@user_can(Permissions.VIEW_APPLICATION, message="view portfolio applications")
|
||||
def application_team(portfolio_id, application_id):
|
||||
application = Applications.get(
|
||||
resource_id=application_id, portfolio_id=portfolio_id
|
||||
)
|
||||
|
||||
environment_users = {}
|
||||
for member in application.members:
|
||||
user_id = member.user.id
|
||||
environment_users[user_id] = {
|
||||
"permissions": {
|
||||
"delete_access": permission_str(
|
||||
member, PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
|
||||
),
|
||||
"environment_management": permission_str(
|
||||
member, PermissionSets.EDIT_APPLICATION_ENVIRONMENTS
|
||||
),
|
||||
"team_management": permission_str(
|
||||
member, PermissionSets.EDIT_APPLICATION_TEAM
|
||||
),
|
||||
},
|
||||
"environments": Environments.for_user(
|
||||
user=member.user, application=application
|
||||
),
|
||||
}
|
||||
|
||||
return render_template(
|
||||
"portfolios/applications/team.html",
|
||||
application=application,
|
||||
environment_users=environment_users,
|
||||
)
|
||||
@@ -171,7 +171,7 @@ def edit_portfolio(portfolio_id):
|
||||
if form.validate():
|
||||
Portfolios.update(portfolio, form.data)
|
||||
return redirect(
|
||||
url_for("portfolios.portfolio_applications", portfolio_id=portfolio.id)
|
||||
url_for("applications.portfolio_applications", portfolio_id=portfolio.id)
|
||||
)
|
||||
else:
|
||||
# rerender portfolio admin page
|
||||
@@ -182,7 +182,7 @@ def edit_portfolio(portfolio_id):
|
||||
@user_can(Permissions.VIEW_PORTFOLIO, message="view portfolio")
|
||||
def show_portfolio(portfolio_id):
|
||||
return redirect(
|
||||
url_for("portfolios.portfolio_applications", portfolio_id=portfolio_id)
|
||||
url_for("applications.portfolio_applications", portfolio_id=portfolio_id)
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user