diff --git a/.secrets.baseline b/.secrets.baseline index 22f467a5..bc5bea51 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2019-10-02T14:53:58Z", + "generated_at": "2019-10-02T23:24:50Z", "plugins_used": [ { "base64_limit": 4.5, @@ -194,7 +194,7 @@ "hashed_secret": "e4f14805dfd1e6af030359090c535e149e6b4207", "is_secret": false, "is_verified": false, - "line_number": 638, + "line_number": 651, "type": "Hex High Entropy String" } ] diff --git a/atst/domain/invitations.py b/atst/domain/invitations.py index 6b68db92..fb889aec 100644 --- a/atst/domain/invitations.py +++ b/atst/domain/invitations.py @@ -117,22 +117,21 @@ class BaseInvitations(object): return cls._update_status(invite, InvitationStatus.REVOKED) @classmethod - def resend(cls, inviter, token): + def resend(cls, inviter, token, user_info=None): previous_invitation = cls._get(token) cls._update_status(previous_invitation, InvitationStatus.REVOKED) - return cls.create( - inviter, - previous_invitation.role, - { + if not user_info: + user_info = { "email": previous_invitation.email, "dod_id": previous_invitation.dod_id, "first_name": previous_invitation.first_name, "last_name": previous_invitation.last_name, - "phone_number": previous_invitation.last_name, - }, - commit=True, - ) + "phone_number": previous_invitation.phone_number, + "phone_ext": previous_invitation.phone_ext, + } + + return cls.create(inviter, previous_invitation.role, user_info, commit=True) class PortfolioInvitations(BaseInvitations): diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index 29efb1de..18b92603 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -12,6 +12,7 @@ from atst.domain.invitations import ApplicationInvitations from atst.forms.application_member import NewForm as NewMemberForm, UpdateMemberForm from atst.forms.application import NameAndDescriptionForm, EditEnvironmentForm from atst.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS +from atst.forms.member import NewForm as MemberForm 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 @@ -95,6 +96,13 @@ def get_members_data(application): form = UpdateMemberForm( environment_roles=env_roles_form_data, **permission_sets ) + update_invite_form = None + + if member.latest_invitation and member.latest_invitation.can_resend: + update_invite_form = MemberForm(obj=member.latest_invitation) + else: + update_invite_form = MemberForm() + members_data.append( { "role_id": member.id, @@ -103,6 +111,7 @@ def get_members_data(application): "environment_roles": environment_roles, "role_status": member.status.value, "form": form, + "update_invite_form": update_invite_form, } ) @@ -419,3 +428,46 @@ def revoke_invite(application_id, application_role_id): _anchor="application-members", ) ) + + +@applications_bp.route( + "/applications//members//resend_invite", + methods=["POST"], +) +@user_can(Permissions.EDIT_APPLICATION_MEMBER, message="resend application invitation") +def resend_invite(application_id, application_role_id): + app_role = ApplicationRoles.get_by_id(application_role_id) + invite = app_role.latest_invitation + form = MemberForm(http_request.form) + + if form.validate(): + new_invite = ApplicationInvitations.resend( + g.current_user, invite.token, form.data + ) + + send_application_invitation( + invitee_email=new_invite.email, + inviter_name=g.current_user.full_name, + token=new_invite.token, + ) + + flash( + "application_invite_resent", + user_name=new_invite.user_name, + application_name=app_role.application.name, + ) + else: + flash( + "application_invite_error", + user_name=app_role.user_name, + application_name=g.application.name, + ) + + return redirect( + url_for( + "applications.settings", + application_id=application_id, + fragment="application-members", + _anchor="application-members", + ) + ) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 613b55bf..623306d5 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -39,6 +39,11 @@ MESSAGES = { "message_template": "There was an error processing the invitation for {{ user_name }} from {{ application_name }}", "category": "error", }, + "application_invite_resent": { + "title_template": "Application invitation revoked", + "message_template": "You have successfully resent the invite for {{ user_name }} from {{ application_name }}", + "category": "success", + }, "application_invite_revoked": { "title_template": "Application invitation revoked", "message_template": "You have successfully revoked the invite for {{ user_name }} from {{ application_name }}", diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html new file mode 100644 index 00000000..96c6966b --- /dev/null +++ b/templates/applications/fragments/member_form_fields.html @@ -0,0 +1,71 @@ +{% from "components/checkbox_input.html" import CheckboxInput %} +{% from "components/text_input.html" import TextInput %} +{% from "components/phone_input.html" import PhoneInput %} + +{% macro PermsFields(form, new=False, member_role_id=None) %} +

{{ "portfolios.applications.members.form.project_perms" | translate }}

+
+ {% if new %} + {% set team_mgmt = form.perms_team_mgmt.name %} + {% set env_mgmt = form.perms_env_mgmt.name %} + {% set del_env = form.perms_del_env.name %} + {% else %} + {% set team_mgmt = "perms_team_mgmt-{}".format(member_role_id) %} + {% set env_mgmt = "perms_env_mgmt-{}".format(member_role_id) %} + {% set del_env = "perms_del_env-{}".format(member_role_id) %} + {% endif %} + + {{ CheckboxInput(form.perms_team_mgmt, classes="input__inline-fields", key=team_mgmt, id=team_mgmt, optional=True) }} + {{ CheckboxInput(form.perms_env_mgmt, classes="input__inline-fields", key=env_mgmt, id=env_mgmt, optional=True) }} + {{ CheckboxInput(form.perms_del_env, classes="input__inline-fields", key=del_env, id=del_env, optional=True) }} +
+
+

{{ "portfolios.applications.members.form.env_access" | translate }}

+
+ {% for environment_data in form.environment_roles %} + +
+
+
+
+ +
+ {{ environment_data.environment_name.data }} +
+ +
+
+ {{ environment_data.role(**{"v-model": "value"}) }} +
+
+
+
+ + {{ environment_data.environment_id() }} +
+ {% endfor %} +
+{% endmacro %} + +{% macro InfoFields(member_form) %} +
+ {{ TextInput(member_form.first_name, validation='requiredField', optional=False) }} +
+
+ {{ TextInput(member_form.last_name, validation='requiredField', optional=False) }} +
+
+ {{ TextInput(member_form.email, validation='email', optional=False) }} +
+
+ {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}} +
+
+ {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }} +
+ How do I find the DoD ID? +{% endmacro %} diff --git a/templates/applications/fragments/member_perms_form_fields.html b/templates/applications/fragments/member_perms_form_fields.html deleted file mode 100644 index c0261ed3..00000000 --- a/templates/applications/fragments/member_perms_form_fields.html +++ /dev/null @@ -1,52 +0,0 @@ -{% from "components/checkbox_input.html" import CheckboxInput %} - -{% macro MemberPermsFields(form, new=False, member_role_id=None) %} -
-

{{ "portfolios.applications.members.form.project_perms" | translate }}

-
- {% if new %} - {% set team_mgmt = form.perms_team_mgmt.name %} - {% set env_mgmt = form.perms_env_mgmt.name %} - {% set del_env = form.perms_del_env.name %} - {% else %} - {% set team_mgmt = "perms_team_mgmt-{}".format(member_role_id) %} - {% set env_mgmt = "perms_env_mgmt-{}".format(member_role_id) %} - {% set del_env = "perms_del_env-{}".format(member_role_id) %} - {% endif %} - - {{ CheckboxInput(form.perms_team_mgmt, classes="input__inline-fields", key=team_mgmt, id=team_mgmt, optional=True) }} - {{ CheckboxInput(form.perms_env_mgmt, classes="input__inline-fields", key=env_mgmt, id=env_mgmt, optional=True) }} - {{ CheckboxInput(form.perms_del_env, classes="input__inline-fields", key=del_env, id=del_env, optional=True) }} -
-
-

{{ "portfolios.applications.members.form.env_access" | translate }}

-
- {% for environment_data in form.environment_roles %} - -
-
-
-
- -
- {{ environment_data.environment_name.data }} -
- -
-
- {{ environment_data.role(**{"v-model": "value"}) }} -
-
-
-
- - {{ environment_data.environment_id() }} -
- {% endfor %} -
-
-{% endmacro %} diff --git a/templates/applications/fragments/new_member_modal_content.html b/templates/applications/fragments/new_member_modal_content.html index bc3bd4d2..94bbc64e 100644 --- a/templates/applications/fragments/new_member_modal_content.html +++ b/templates/applications/fragments/new_member_modal_content.html @@ -1,8 +1,5 @@ {% from "components/icon.html" import Icon %} -{% from "components/text_input.html" import TextInput %} -{% from "components/checkbox_input.html" import CheckboxInput %} -{% from "components/phone_input.html" import PhoneInput %} -{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %} +{% import "applications/fragments/member_form_fields.html" as member_fields %} {% macro MemberFormTemplate(title, next_button, previous=True) %}
@@ -36,22 +33,7 @@ {% endset %} {% call MemberFormTemplate(title="portfolios.applications.members.form.add_member"|translate, next_button=next_button, previous=False) %} -
- {{ TextInput(member_form.user_data.first_name, validation='requiredField', optional=False) }} -
-
- {{ TextInput(member_form.user_data.last_name, validation='requiredField', optional=False) }} -
-
- {{ TextInput(member_form.user_data.email, validation='email', optional=False) }} -
-
- {{ PhoneInput(member_form.user_data.phone_number, member_form.user_data.phone_ext)}} -
-
- {{ TextInput(member_form.user_data.dod_id, validation='dodId', optional=False) }} -
- How do I find the DoD ID? + {{ member_fields.InfoFields(member_form.user_data) }} {% endcall %} {% endmacro %} {% macro MemberStepTwo(member_form, application) %} @@ -64,6 +46,6 @@ {% endset %} {% call MemberFormTemplate(title="portfolios.applications.members.form.step_2_title"|translate, next_button=next_button) %} - {{ MemberPermsFields(form=member_form) }} + {{ member_fields.PermsFields(form=member_form) }} {% endcall %} {% endmacro %} diff --git a/templates/applications/settings.html b/templates/applications/settings.html index c33db395..0114c4b1 100644 --- a/templates/applications/settings.html +++ b/templates/applications/settings.html @@ -4,7 +4,6 @@ {% from "components/delete_confirmation.html" import DeleteConfirmation %} {% from "components/icon.html" import Icon %} {% import "applications/fragments/new_member_modal_content.html" as member_steps %} -{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %} {% from "fragments/members.html" import MemberManagementTemplate %} {% from "components/modal.html" import Modal %} {% from "components/multi_step_modal_form.html" import MultiStepModalForm %} @@ -75,11 +74,14 @@ {% endif %} {{ MemberManagementTemplate( - application, - members, + application, + members, new_member_form, "applications.create_member", - user_can(permissions.CREATE_APPLICATION_MEMBER)) }} + user_can_create_app_member=user_can(permissions.CREATE_APPLICATION_MEMBER), + user_can_edit_app_member=user_can(permissions.EDIT_APPLICATION_MEMBER), + user_can_delete_app_member=user_can(permissions.DELETE_APPLICATION_MEMBER), + ) }}
{{ 'common.resource_names.environments' | translate }} diff --git a/templates/fragments/members.html b/templates/fragments/members.html index 9f43c93e..4e43fc59 100644 --- a/templates/fragments/members.html +++ b/templates/fragments/members.html @@ -1,20 +1,22 @@ {% from "components/alert.html" import Alert %} {% from "components/icon.html" import Icon %} {% import "applications/fragments/new_member_modal_content.html" as member_steps %} -{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %} +{% import "applications/fragments/member_form_fields.html" as member_fields %} {% from "components/modal.html" import Modal %} {% from "components/multi_step_modal_form.html" import MultiStepModalForm %} {% from "components/save_button.html" import SaveButton %} {% macro MemberManagementTemplate( - application, + application, members, new_member_form, action, - user_can_create_app_member=False + user_can_create_app_member=False, + user_can_edit_app_member=False, + user_can_delete_app_member=False ) %} - + {% if g.matchesPath("application-members") %} {% include "fragments/flash.html" %} {% endif %} @@ -52,28 +54,65 @@ {% else %} {% set new_member_modal_name = "add-app-mem" %} - + {% for member in members %} - {% set modal_name = "edit_member-{}".format(loop.index) %} - {% call Modal(modal_name) %} + {%- if user_can_edit_app_member %} + {% set modal_name = "edit_member-{}".format(loop.index) %} + {% call Modal(modal_name) %} +
+

{{ Icon('avatar') }} {{ member.user_name }}

+
+
+ + + + {% endcall %} + + {%- if member.role_status == 'pending' %} + {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %} + {% call Modal(resend_invite_modal, classes="form-content--app-mem") %}
-

{{ Icon('avatar') }} {{ member.user_name }}

+

Verify Member Information

- {% endcall %} - {% endfor %} + {% endif -%} + {% endif -%} + + {% if user_can_delete_app_member and member.role_status == 'pending' -%} + {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %} + {% call Modal(name=revoke_invite_modal, dismissable=True) %} +
+
+ {{ member.form.csrf_token }} +

{{ "invites.revoke.modal_heading" | translate({'user_name': member.user_name}) }}

+
+ + +
+
+
+ {% endcall %} + {%- endif %} + {% endfor %} -
@@ -112,10 +151,14 @@ {% endfor %} {% endfor %} @@ -129,7 +172,6 @@ {% if user_can_create_app_member %} - {% import "applications/fragments/new_member_modal_content.html" as member_steps %} {{ MultiStepModalForm( name=new_member_modal_name, form=new_member_form, diff --git a/tests/routes/applications/test_settings.py b/tests/routes/applications/test_settings.py index 57077b15..e477da14 100644 --- a/tests/routes/applications/test_settings.py +++ b/tests/routes/applications/test_settings.py @@ -2,6 +2,7 @@ import pytest import uuid from flask import url_for, get_flashed_messages from unittest.mock import Mock +import datetime from tests.factories import * @@ -591,3 +592,35 @@ def test_filter_environment_roles(): environment_data = filter_env_roles_form_data(application_role3, [environment]) assert environment_data[0]["role"] == "No Access" + + def test_resend_invite(client, user_session, session): + user = UserFactory.create() + # need to set the time created to yesterday, otherwise the original invite and resent + # invite have the same time_created and then we can't rely on time to order the invites + yesterday = datetime.date.today() - datetime.timedelta(days=1) + invite = ApplicationInvitationFactory.create( + user=user, time_created=yesterday, email="original@example.com" + ) + app_role = invite.role + application = app_role.application + + user_session(application.portfolio.owner) + response = client.post( + url_for( + "applications.resend_invite", + application_id=application.id, + application_role_id=app_role.id, + ), + data={ + "first_name": user.first_name, + "last_name": user.last_name, + "dod_id": user.dod_id, + "email": "an_email@example.com", + }, + ) + + session.refresh(app_role) + assert response.status_code == 302 + assert invite.is_revoked + assert app_role.status == ApplicationRoleStatus.PENDING + assert app_role.latest_invitation.email == "an_email@example.com" diff --git a/tests/test_access.py b/tests/test_access.py index 283823d2..c72ac36d 100644 --- a/tests/test_access.py +++ b/tests/test_access.py @@ -595,6 +595,24 @@ def test_applications_revoke_invite(post_url_assert_status): post_url_assert_status(user, url, status) +# applications.resend_invite +def test_applications_resend_invite(post_url_assert_status): + ccpo = UserFactory.create_ccpo() + rando = UserFactory.create() + application = ApplicationFactory.create() + + for user, status in [(ccpo, 302), (application.portfolio.owner, 302), (rando, 404)]: + app_role = ApplicationRoleFactory.create() + invite = ApplicationInvitationFactory.create(role=app_role) + + url = url_for( + "applications.resend_invite", + application_id=application.id, + application_role_id=app_role.id, + ) + post_url_assert_status(user, url, status) + + # task_orders.download_task_order_pdf def test_task_orders_download_task_order_pdf_access(get_url_assert_status, monkeypatch): monkeypatch.setattr(
- {% if member.role_status == 'pending' %} - Resend Invite
- Revoke Invite - {% endif %} + {% if member.role_status == 'pending' -%} + {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %} + {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %} + Resend Invite
+ {% if user_can_delete_app_member -%} + {{ 'invites.revoke.button' | translate }} + {%- endif %} + {%- endif %}