50 Commits

Author SHA1 Message Date
richard-dds
96c1fcbe85
Merge branch 'master' into revert-user-deletion 2019-10-15 17:06:06 -04:00
leigh-mil
91ce3dda9e Disable the App Role when revoking an invite. 2019-10-15 14:25:21 -04:00
richard-dds
1bce0a1f01 Revert user deletion job 2019-10-14 16:51:19 -04:00
richard-dds
0c480ccc41 Fix tests 2019-10-08 16:42:25 -04:00
leigh-mil
12aad96899 hard code initial invite email 2019-10-08 16:16:34 -04:00
leigh-mil
4d043363a7 Create route for resending an app invite
Replace ApplicationInvitations._update_status() with revoke() because multiple functions used _update_status() and it was causing app roles to be disabled when they shouldn't have. Now app roles are disabled within the revoke function.
Updated Invitations.resend() to accept user details so the invite info
can be changed in the new invite
2019-10-08 15:59:16 -04:00
leigh-mil
875b908908 Do not change app role status when invite status changes, add assertions to tests for this 2019-10-03 14:56:38 -04:00
graham-dds
de89bb03b0 use correct route for create member macro 2019-10-02 14:17:18 -04:00
graham-dds
337c98f8cd Add / update tests
- add tests for step3 of new application
2019-10-01 15:56:18 -04:00
graham-dds
4aa0afdb67 New env role logic in filter_env_roles_form_data 2019-09-30 15:41:00 -04:00
leigh-mil
5c54c043c0 Add route for applications.revoke_invite 2019-09-26 09:46:23 -04:00
leigh-mil
b35e8cfe8e Update NewMemberForm so that it has the same data structure as the UpdateMemberForm 2019-09-18 11:16:55 -04:00
leigh-mil
a7f9be5d48 Add comments to explain test 2019-09-18 11:16:55 -04:00
leigh-mil
cf172c486c Remove test for old applications.settings data structure and replace with test for refactored get_members_data() function 2019-09-18 11:16:55 -04:00
leigh-mil
80dcb9c580 Move perms so they are at the top level of the form so that the data is properly populated
Add form fields for all environments in update member form
2019-09-18 11:16:54 -04:00
leigh-mil
93530e903f Create route for updating app member 2019-09-18 11:16:54 -04:00
richard-dds
79c8e4fc63
Merge pull request #1062 from dod-ccpo/env-provisioning-task
Environment provisioning background jobs
2019-09-16 09:58:18 -04:00
leigh-mil
ddcd91964f Remove route 'applications.update_env_roles' and related functions and tests 2019-09-11 15:29:09 -04:00
richard-dds
f6cb6f2a31 Change Environment.creator relation from ApplicationRole to User 2019-09-11 11:42:59 -04:00
leigh-mil
e391c3269d Remove unused route to update team roles 2019-09-09 15:23:37 -04:00
leigh-mil
7c7624f25e Move team routes to the settings file and delete files related to applications/team 2019-09-05 16:54:16 -04:00
dandds
3c5df7b1aa Some environments might not have associated users.
There was a bug in the application settings route that threw an error if
an environment role and its associated application role did not have an
associated user. Updated to check for the user name on the application role.
2019-06-19 10:12:01 -04:00
dandds
df06d1b62f Use application_role_id on environment_roles.
In the future, an `application_invitation1 will not refer to a `user` until
someone accepts the invitation; they'll only reference an
`application_role`. When a user is invited to an application, the
inviter can specify the environments the invitee should have access to.
For this to be possible, an `environment_role` should reference an
`application_role`, because no `user` entity will be known at that time.

In addition to updating all the models and domain methods necessary for
this change, this commit deletes unused code and tests that were
dependent on `environment_roles` having a `user_id` foreign key.
2019-05-31 11:21:20 -04:00
dandds
43ea922218 Simplify environment role updates in app settings.
Use ApplicationRole.id instead of User.id in forms. This eliminates the
need for the function that checks whether a user is in a given
application, because looking up the application role will raise an error
if the user is not.
2019-05-24 13:35:00 -04:00
leigh-mil
927d1b7925 Add audit log to app settings page 2019-05-22 13:08:44 -04:00
dandds
815632ed00 Handle setting no access for user environment roles:
- use constant for no access string
- update no access constant
- update language and permissions for rendering remove app member button
2019-05-17 14:00:45 -04:00
Montana
f07ea38b9b Functionality for adding an env
- uses two route functions - one for update app, another for add
environment
- uses a second form for the app settings page
- uses the /environments/new url naming convention
2019-05-14 11:51:10 -04:00
leigh-mil
4206aa8a59 Use member.role_name in template and JS
change name of data from roles to rolesCategory to make less confusing
2019-05-14 11:00:14 -04:00
leigh-mil
546e04555d Update role div height
Move serialization into the route
change member.role to member.role_name in form and route
Return 400 for invalid form submission
2019-05-14 11:00:14 -04:00
leigh-mil
319cc17c1c Start vue component for edit-environment-role 2019-05-14 10:58:22 -04:00
leigh-mil
addf2e97a1 Update form to nest all envs in one form 2019-05-14 10:58:22 -04:00
leigh-mil
060c6834bf Add save button and temp member role toggle to env member form 2019-05-14 10:58:22 -04:00
George Drummond
d9ed8ed2f1
Merge pull request #806 from dod-ccpo/delete-environment
Delete environments from an application
2019-05-07 10:18:32 -04:00
George Drummond
037fe09163
Delete environments from an application 2019-05-06 13:51:57 -04:00
George Drummond
430a6493f0
Get error state in edit environment name form working 2019-05-03 14:23:47 -04:00
leigh-mil
41f01f8dec
Merge branch 'master' into edit-env-form-view 2019-04-30 14:34:31 -04:00
montana-mil
0c6f00bf4d
Merge pull request #785 from dod-ccpo/check-user-is-in-app-before-adding-env-role
Check user is in app before adding env role
2019-04-30 14:31:08 -04:00
Montana
94e3dc637a Remove has_member function from application model 2019-04-30 10:27:15 -04:00
leigh-mil
67516b3b55 Combine env_forms and environment_obj 2019-04-30 10:13:55 -04:00
Montana
60b4c50819 Check that all users with changed data are app users before updating env roles 2019-04-29 15:05:59 -04:00
leigh-mil
4c7a8c399c Sort env members by role 2019-04-29 12:32:41 -04:00
leigh-mil
bdb1cc9ce5 Add in users without access to env team info 2019-04-29 12:07:44 -04:00
Montana
6822680bc8 Ensure that a member is an application member before adding the user to an environment 2019-04-29 11:06:37 -04:00
George Drummond
079672c818
Update application environments 2019-04-29 10:46:21 -04:00
leigh-mil
7f4a18a49b Move test checking route access into test_access and rename test checking if route is working 2019-04-25 10:47:39 -04:00
leigh-mil
99a3534d03 Update route to include environment_id 2019-04-25 10:47:39 -04:00
leigh-mil
5e415edaef Update form to handle No access 2019-04-25 10:47:39 -04:00
leigh-mil
9b426bbde4 Add post route for env roles form 2019-04-25 10:47:39 -04:00
leigh-mil
fbd9c9db66 Create form in view route for application settings 2019-04-25 10:47:39 -04:00
dandds
849c5d4b58 Rearrange and rename application routes.
- move application routes to their own Flask blueprint
- squash application routes to be resource-specific
- reorganize application routes
2019-04-22 07:19:30 -04:00