fix(invite-requests): Add invite request notification task (#15443)

Author: maheskett

src/sentry/api/endpoints/organization_invite_request_index.py

@@ -10,6 +10,7 @@
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers import serialize, OrganizationMemberWithTeamsSerializer
 from sentry.models import AuditLogEntryEvent, OrganizationMember, InviteStatus
+from sentry.tasks.members import send_invite_request_notification_email
 from sentry.utils.retries import TimedRetryPolicy
 
 from .organization_member_index import OrganizationMemberSerializer, save_team_assignments
@@ -95,6 +96,6 @@ def post(self, request, organization):
                 event=AuditLogEntryEvent.INVITE_REQUEST_ADD,
             )
 
-        om.send_request_notification_email()
+        send_invite_request_notification_email.delay(om.id)
 
         return Response(serialize(om), status=201)

src/sentry/api/endpoints/organization_join_request.py

@@ -14,6 +14,7 @@
 from sentry.models import AuthProvider, InviteStatus, OrganizationMember
 from sentry.signals import join_request_created
 
+from sentry.tasks.members import send_invite_request_notification_email
 
 logger = logging.getLogger(__name__)
 
@@ -30,24 +31,13 @@ def create_organization_join_request(organization, email, ip_address=None):
         return
 
     try:
-        om = OrganizationMember.objects.create(
+        return OrganizationMember.objects.create(
             organization=organization,
             email=email,
             invite_status=InviteStatus.REQUESTED_TO_JOIN.value,
         )
     except IntegrityError:
         pass
-    else:
-        logger.info(
-            "org-join-request.created",
-            extra={
-                "organization_id": organization.id,
-                "member_id": om.id,
-                "email": email,
-                "ip_address": ip_address,
-            },
-        )
-        return om
 
 
 class OrganizationJoinRequestEndpoint(OrganizationEndpoint):
@@ -65,7 +55,7 @@ def post(self, request, organization):
             )
 
         # users can already join organizations with SSO enabled without an invite
-        # so no need to allow requests to join as well
+        # so they should join that way and not through a request to the admins
         if AuthProvider.objects.filter(organization=organization).exists():
             return Response(status=403)
 
@@ -89,7 +79,7 @@ def post(self, request, organization):
         member = create_organization_join_request(organization, email, ip_address)
 
         if member:
-            member.send_request_notification_email()
+            send_invite_request_notification_email.delay(member.id)
             join_request_created.send_robust(sender=self, member=member)
 
         return Response(status=204)

src/sentry/conf/server.py

@@ -530,6 +530,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME():
     "sentry.tasks.deletion",
     "sentry.tasks.digests",
     "sentry.tasks.email",
+    "sentry.tasks.members",
     "sentry.tasks.merge",
     "sentry.tasks.options",
     "sentry.tasks.ping",

src/sentry/models/organizationmember.py

@@ -233,60 +233,6 @@ def send_invite_email(self):
             logger = get_logger(name="sentry.mail")
             logger.exception(e)
 
-    def send_request_notification_email(self):
-        from sentry.utils.email import MessageBuilder
-
-        link_args = {"organization_slug": self.organization.slug}
-
-        context = {
-            "email": self.email,
-            "inviter": self.inviter,
-            "organization": self.organization,
-            "organization_link": absolute_uri(
-                reverse("sentry-organization-index", args=[self.organization.slug])
-            ),
-            "pending_requests_link": absolute_uri(
-                reverse("sentry-organization-members-requests", kwargs=link_args)
-            ),
-            "settings_link": absolute_uri(
-                reverse("sentry-organization-settings", args=[self.organization.slug])
-            ),
-        }
-
-        if self.requested_to_join:
-            email_args = {
-                "template": "sentry/emails/organization-join-request.txt",
-                "html_template": "sentry/emails/organization-join-request.html",
-            }
-        elif self.requested_to_be_invited:
-            email_args = {
-                "template": "sentry/emails/organization-invite-request.txt",
-                "html_template": "sentry/emails/organization-invite-request.html",
-            }
-        else:
-            raise RuntimeError("This member is not pending invitation")
-
-        recipients = OrganizationMember.objects.select_related("user").filter(
-            organization_id=self.organization_id,
-            user__isnull=False,
-            invite_status=InviteStatus.APPROVED.value,
-            role__in=(r.id for r in roles.get_all() if r.has_scope("member:write")),
-        )
-
-        msg = MessageBuilder(
-            subject="Access request to %s" % (self.organization.name,),
-            type="organization.invite-request",
-            context=context,
-            **email_args
-        )
-
-        for recipient in recipients:
-            try:
-                msg.send_async([recipient.get_email()])
-            except Exception as e:
-                logger = get_logger(name="sentry.mail")
-                logger.exception(e)
-
     def send_sso_link_email(self, actor, provider):
         from sentry.utils.email import MessageBuilder
 

src/sentry/tasks/members.py

@@ -0,0 +1,67 @@
+from __future__ import absolute_import, print_function
+
+from django.core.urlresolvers import reverse
+from structlog import get_logger
+
+from sentry import roles
+from sentry.models import InviteStatus, OrganizationMember
+from sentry.tasks.base import instrumented_task
+from sentry.utils.email import MessageBuilder
+from sentry.utils.http import absolute_uri
+
+
+@instrumented_task(name="sentry.tasks.send_invite_request_notification_email", queue="email")
+def send_invite_request_notification_email(member_id):
+    try:
+        om = OrganizationMember.objects.select_related("inviter", "organization").get(id=member_id)
+    except OrganizationMember.DoesNotExist:
+        return
+
+    link_args = {"organization_slug": om.organization.slug}
+
+    context = {
+        "email": om.email,
+        "organization_name": om.organization.name,
+        "pending_requests_link": absolute_uri(
+            reverse("sentry-organization-members-requests", kwargs=link_args)
+        ),
+    }
+
+    if om.requested_to_join:
+        email_args = {
+            "template": "sentry/emails/organization-join-request.txt",
+            "html_template": "sentry/emails/organization-join-request.html",
+        }
+        context["settings_link"] = absolute_uri(
+            reverse("sentry-organization-settings", args=[om.organization.slug])
+        )
+
+    elif om.requested_to_be_invited:
+        email_args = {
+            "template": "sentry/emails/organization-invite-request.txt",
+            "html_template": "sentry/emails/organization-invite-request.html",
+        }
+        context["inviter_name"] = om.inviter.get_salutation_name
+    else:
+        raise RuntimeError("This member is not pending invitation")
+
+    recipients = OrganizationMember.objects.select_related("user").filter(
+        organization_id=om.organization_id,
+        user__isnull=False,
+        invite_status=InviteStatus.APPROVED.value,
+        role__in=(r.id for r in roles.get_all() if r.has_scope("member:write")),
+    )
+
+    msg = MessageBuilder(
+        subject="Access request to %s" % (om.organization.name,),
+        type="organization.invite-request",
+        context=context,
+        **email_args
+    )
+
+    for recipient in recipients:
+        try:
+            msg.send_async([recipient.get_email()])
+        except Exception as e:
+            logger = get_logger(name="sentry.mail")
+            logger.exception(e)

src/sentry/templates/sentry/emails/organization-invite-request.html

@@ -5,7 +5,7 @@
 {% block main %}
   <h3>Request for Access</h3>
 
-  <p><strong>{{ inviter.get_salutation_name }}</strong> has requested to invite <strong>{{ email }}</strong> to the <a href="{{ organization_link }}">{{ organization.name }}</a> organization.</p>
+  <p><strong>{{ inviter_name }}</strong> has requested to invite <strong>{{ email }}</strong> to the {{ organization_name }} organization.</p>
 
   <a href="{{ pending_requests_link }}" class="btn">View access requests</a>
 

src/sentry/templates/sentry/emails/organization-invite-request.txt

@@ -1,6 +1,6 @@
 Request for Access
 
-{{ inviter.get_salutation_name }} has requested to invite {{ email }} to the {{ organization.name }} organization.
+{{ inviter_name }} has requested to invite {{ email }} to the {{ organization_name }} organization.
 
 View access requests by clicking the link below:
 

src/sentry/templates/sentry/emails/organization-join-request.html

@@ -5,7 +5,7 @@
 {% block main %}
   <h3>Request for Access</h3>
 
-  <p><strong>{{ email }}</strong> is requesting to join the <a href="{{ organization_link }}">{{ organization.name }}</a> organization.</p>
+  <p><strong>{{ email }}</strong> is requesting to join the {{ organization_name }} organization.</p>
 
   <a href="{{ pending_requests_link }}" class="btn">View access requests</a>
 

src/sentry/templates/sentry/emails/organization-join-request.txt

@@ -1,6 +1,6 @@
 Request for Access
 
-{{ email }} is requesting to join the {{ organization.name }} organization.
+{{ email }} is requesting to join the {{ organization_name }} organization.
 
 View access requests by clicking the link below:
 

src/sentry/web/frontend/debug/debug_organization_invite_request.py

@@ -15,12 +15,9 @@ def get(self, request):
         user = User(name="Rick Swan")
 
         context = {
-            "organization": org,
-            "inviter": user,
+            "organization_name": org.name,
+            "inviter_name": user.get_salutation_name,
             "email": "[email protected]",
-            "organization_link": absolute_uri(
-                reverse("sentry-organization-index", args=[org.slug])
-            ),
             "pending_requests_link": absolute_uri(
                 reverse("sentry-organization-members-requests", args=[org.slug])
             ),