From 57da17b8e2d4725fc040cd51bfb5eed0c14def00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C4=93teris=20Caune?= Date: Mon, 13 Apr 2020 15:04:59 +0300 Subject: [PATCH] Send an "Ownership Transfer Request" email notification. --- CHANGELOG.md | 3 ++- hc/accounts/models.py | 13 +++++++++++++ hc/accounts/tests/test_transfer_project.py | 6 ++++++ hc/accounts/views.py | 4 +++- hc/lib/emails.py | 4 ++++ templates/accounts/project.html | 8 ++++++++ templates/base.html | 2 ++ .../emails/transfer-request-body-html.html | 19 +++++++++++++++++++ .../emails/transfer-request-body-text.html | 14 ++++++++++++++ .../emails/transfer-request-subject.html | 1 + 10 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 templates/emails/transfer-request-body-html.html create mode 100644 templates/emails/transfer-request-body-text.html create mode 100644 templates/emails/transfer-request-subject.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 13505378..2841b32e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file. ### Improvements - Rate limiting for Telegram notifications (10 notifications per chat per minute) - Use Slack V2 OAuth flow -- "Edit" function for webhook integrations (#176) +- Users can edit their existing webhook integrations (#176) +- Add a "Transfer Ownership" feature in Project Settings ### Bug Fixes - "Get a single check" API call now supports read-only API keys (#346) diff --git a/hc/accounts/models.py b/hc/accounts/models.py index afdc13df..c70fd648 100644 --- a/hc/accounts/models.py +++ b/hc/accounts/models.py @@ -96,6 +96,19 @@ class Profile(models.Model): } emails.login(self.user.email, ctx) + def send_transfer_request(self, project): + token = self.prepare_token("login") + settings_path = reverse("hc-project-settings", args=[project.code]) + path = reverse("hc-check-token", args=[self.user.username, token]) + path += "?next=%s" % settings_path + + ctx = { + "button_text": "Project Settings", + "button_url": settings.SITE_ROOT + path, + "project": project, + } + emails.transfer_request(self.user.email, ctx) + def send_set_password_link(self): token = self.prepare_token("set-password") path = reverse("hc-set-password", args=[token]) diff --git a/hc/accounts/tests/test_transfer_project.py b/hc/accounts/tests/test_transfer_project.py index 48643eed..ad94f77b 100644 --- a/hc/accounts/tests/test_transfer_project.py +++ b/hc/accounts/tests/test_transfer_project.py @@ -1,3 +1,4 @@ +from django.core import mail from django.utils.timezone import now from hc.api.models import Check from hc.test import BaseTestCase @@ -21,6 +22,11 @@ class ProjectTestCase(BaseTestCase): self.bobs_membership.refresh_from_db() self.assertIsNotNone(self.bobs_membership.transfer_request_date) + # Bob should receive an email notification + self.assertEqual(len(mail.outbox), 1) + body = mail.outbox[0].body + self.assertTrue("/?next=" + self.url in body) + def test_transfer_project_checks_ownership(self): self.client.login(username="bob@example.org", password="password") diff --git a/hc/accounts/views.py b/hc/accounts/views.py index dd4e083a..43a1a652 100644 --- a/hc/accounts/views.py +++ b/hc/accounts/views.py @@ -34,6 +34,7 @@ NEXT_WHITELIST = ( "hc-add-slack", "hc-add-pushover", "hc-add-telegram", + "hc-project-settings", ) @@ -350,7 +351,8 @@ def project(request, code): ctx["transfer_initiated"] = True ctx["transfer_status"] = "success" - # FIXME send email + profile = Profile.objects.get(user__email=email) + profile.send_transfer_request(project) elif "cancel_transfer" in request.POST: if not is_owner: diff --git a/hc/lib/emails.py b/hc/lib/emails.py index f0e3a940..cb2c78fa 100644 --- a/hc/lib/emails.py +++ b/hc/lib/emails.py @@ -41,6 +41,10 @@ def login(to, ctx): send("login", to, ctx) +def transfer_request(to, ctx): + send("transfer-request", to, ctx) + + def set_password(to, ctx): send("set-password", to, ctx) diff --git a/templates/accounts/project.html b/templates/accounts/project.html index 835da63a..ed307765 100644 --- a/templates/accounts/project.html +++ b/templates/accounts/project.html @@ -460,6 +460,7 @@
+ {% if project.team %}
+ {% else %} +

+ This project currently has no team members. + To transfer the ownership of this project, please start by + inviting the new owner as a team member. +

+ {% endif %}
diff --git a/templates/base.html b/templates/base.html index 46bb97ac..495e0abd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -159,6 +159,8 @@ {% endfor %} +
  • {{ request.user.email }}
    • +
  • Account Settings
  • Log Out
    • diff --git a/templates/emails/transfer-request-body-html.html b/templates/emails/transfer-request-body-html.html new file mode 100644 index 00000000..b117b516 --- /dev/null +++ b/templates/emails/transfer-request-body-html.html @@ -0,0 +1,19 @@ +{% extends "emails/base.html" %} +{% load hc_extras %} + +{% block content %} +Hello, +
    + +{{ project.owner.email }} would like to transfer the ownership of +their project +{% if project.name %}{{ project.name }}{% endif %} to you. +

    +To accept or reject this request, please visit the project's Settings +page: +{% endblock %} + +{% block content_more %} +Thanks,
    +The {% site_name %} Team +{% endblock %} diff --git a/templates/emails/transfer-request-body-text.html b/templates/emails/transfer-request-body-text.html new file mode 100644 index 00000000..b680771f --- /dev/null +++ b/templates/emails/transfer-request-body-text.html @@ -0,0 +1,14 @@ +{% load hc_extras %} +{% block content %}Hello, + +{{ project.owner.email }} would like to transfer the ownership of their +project {% if project.name %}"{{ project.name }}"{% endif %} to you. + +To accept or reject this request, please visit the project's Settings +page: + +{{ button_url }} + +Thanks, +The {% site_name %} Team +{% endblock %} diff --git a/templates/emails/transfer-request-subject.html b/templates/emails/transfer-request-subject.html new file mode 100644 index 00000000..1652175f --- /dev/null +++ b/templates/emails/transfer-request-subject.html @@ -0,0 +1 @@ +Ownership Transfer Request \ No newline at end of file