Merge pull request #2645 from getsentry/invitation

Update our invitation emails

Author: mattrobenolt

src/sentry/models/organizationmember.py

@@ -147,8 +147,9 @@ def send_invite_email(self):
         }
 
         msg = MessageBuilder(
-            subject='Invite to join organization: %s' % (self.organization.name,),
-            template='sentry/emails/member_invite.txt',
+            subject='Join %s in using Sentry' % self.organization.name,
+            template='sentry/emails/member-invite.txt',
+            html_template='sentry/emails/member-invite.html',
             context=context,
         )
 

src/sentry/templates/sentry/emails/member-invite.html

@@ -0,0 +1,17 @@
+{% extends "sentry/emails/base.html" %}
+
+{% load i18n %}
+{% load sentry_helpers %}
+
+{% block main %}
+    <h3>Welcome to Sentry</h3>
+    <p>Your teammates over at <strong>{{ organization.name }}</strong> have already been using Sentry without you, but the good news is that you've been invited to join them.</p>
+
+    <p><a href="{{ url }}" class="btn">Join your team</a></p>
+
+    <p>If you'd like to learn more about Sentry before diving in head-first, check out our website, <a href="https://getsentry.com/">getsentry.com</a></p>
+{% endblock %}
+
+{% block footer %}
+<a href="{% absolute_uri %}">Home</a>
+{% endblock %}

src/sentry/templates/sentry/emails/member-invite.txt

@@ -0,0 +1,9 @@
+Welcome to Sentry
+
+Your teammates over at {{ organization.name }} have already been using Sentry without you, but the good news is that you've been invited to join them.
+
+Join your team by visiting the following url:
+
+    {{ url }}
+
+If you'd like to learn more about Sentry before diving head-first, check out our website, https://getsentry.com/

src/sentry/templates/sentry/emails/member_invite.txt

@@ -32,6 +32,7 @@
     Event,
     Group,
     Organization,
+    OrganizationMember,
     Project,
     Rule,
     Team,
@@ -372,6 +373,33 @@ def request_access(request):
     ).render()
 
 
+@login_required
+def invitation(request):
+    org = Organization(
+        id=1,
+        slug='example',
+        name='Example',
+    )
+    om = OrganizationMember(
+        id=1,
+        email='[email protected]',
+        organization=org,
+    )
+
+    return MailPreview(
+        html_template='sentry/emails/member-invite.html',
+        text_template='sentry/emails/member-invite.txt',
+        context={
+            'email': '[email protected]',
+            'organization': org,
+            'url': absolute_uri(reverse('sentry-accept-invite', kwargs={
+                'member_id': om.id,
+                'token': om.token,
+            })),
+        },
+    ).render()
+
+
 @login_required
 def access_approved(request):
     org = Organization(

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

@@ -110,6 +110,8 @@ def init_all_applications():
             sentry.web.frontend.debug.mail.request_access),
         url(r'^debug/mail/access-approved/$',
             sentry.web.frontend.debug.mail.access_approved),
+        url(r'^debug/mail/invitation/$',
+            sentry.web.frontend.debug.mail.invitation),
         url(r'^debug/embed/error-page/$',
             DebugErrorPageEmbedView.as_view()),
         url(r'^debug/trigger-error/$',

src/sentry/web/urls.py

@@ -56,7 +56,7 @@ def test_valid_for_invites(self):
 
         assert len(mail.outbox) == 1
         assert mail.outbox[0].to == ['[email protected]']
-        assert mail.outbox[0].subject == 'Invite to join organization: Default'
+        assert mail.outbox[0].subject == 'Join Default in using Sentry'
 
     def test_existing_user_for_invite(self):
         organization = self.create_organization()

tests/sentry/web/frontend/test_create_organization_member.py

@@ -153,7 +153,7 @@ def test_reinvite(self):
 
         assert len(mail.outbox) == 1
         assert mail.outbox[0].to == ['[email protected]']
-        assert mail.outbox[0].subject == 'Invite to join organization: foo'
+        assert mail.outbox[0].subject == 'Join foo in using Sentry'
 
     def test_cannot_edit_yourself(self):
         organization = self.create_organization(name='foo', owner=self.user)