Merge branch 'master' into require-personal-info

atst/routes/__init__.py

@@ -101,6 +101,10 @@ def login_redirect():
     auth_context = _make_authentication_context()
     auth_context.authenticate()
     user = auth_context.get_user()
+
+    if user.provisional:
+        Users.finalize(user)
+
     session["user_id"] = user.id
 
     return redirect(redirect_after_login_url())

atst/routes/errors.py

@@ -3,6 +3,7 @@ from flask_wtf.csrf import CSRFError
 import werkzeug.exceptions as werkzeug_exceptions
 
 import atst.domain.exceptions as exceptions
+from atst.domain.invitations import InvitationError
 
 
 def make_error_pages(app):
@@ -41,4 +42,15 @@ def make_error_pages(app):
             500,
         )
 
+    @app.errorhandler(InvitationError)
+    # pylint: disable=unused-variable
+    def invalid_invitation(e):
+        log_error(e)
+        return (
+            render_template(
+                "error.html", message="The invitation link you clicked is invalid."
+            ),
+            404,
+        )
+
     return app

atst/routes/workspaces.py

@@ -24,6 +24,8 @@ from atst.forms.workspace import WorkspaceForm
 from atst.forms.data import ENVIRONMENT_ROLES, ENV_ROLE_MODAL_DESCRIPTION
 from atst.domain.authz import Authorization
 from atst.models.permissions import Permissions
+from atst.domain.invitations import Invitations
+from atst.queue import queue
 
 bp = Blueprint("workspaces", __name__)
 
@@ -218,6 +220,15 @@ def new_member(workspace_id):
     )
 
 
+def send_invite_email(owner_name, token, new_member_email):
+    body = render_template("emails/invitation.txt", owner=owner_name, token=token)
+    queue.send_mail(
+        [new_member_email],
+        "{} has invited you to a JEDI Cloud Workspace".format(owner_name),
+        body,
+    )
+
+
 @bp.route("/workspaces/<workspace_id>/members/new", methods=["POST"])
 def create_member(workspace_id):
     workspace = Workspaces.get(g.current_user, workspace_id)
@@ -226,6 +237,13 @@ def create_member(workspace_id):
     if form.validate():
         try:
             new_member = Workspaces.create_member(g.current_user, workspace, form.data)
+            invite = Invitations.create(
+                new_member.workspace_role, g.current_user, new_member.user
+            )
+            send_invite_email(
+                g.current_user.full_name, invite.token, new_member.user.email
+            )
+
             return redirect(
                 url_for(
                     "workspaces.workspace_members",
@@ -318,3 +336,14 @@ def update_member(workspace_id, member_id):
             workspace=workspace,
             member=member,
         )
+
+
+@bp.route("/workspaces/invitation/<token>", methods=["GET"])
+def accept_invitation(token):
+    # TODO: check that the current_user DOD ID matches the user associated with
+    # the invitation
+    invite = Invitations.accept(token)
+
+    return redirect(
+        url_for("workspaces.show_workspace", workspace_id=invite.workspace.id)
+    )