harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup in hc.accounts.views

Browse Source
This commit is contained in:
Pēteris Caune 2017-08-30 22:42:45 +03:00
parent 367f5a595d
commit 9a9ec547d3
2 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hc/accounts/tests/test_unsubscribe_reports.py Normal file
View File

@ -0,0 +1,14 @@
from django.core import signing
from hc.test import BaseTestCase
class UnsubscribeReportsTestCase(BaseTestCase):
def test_it_works(self):
token = signing.Signer().sign("foo")
url = "/accounts/unsubscribe_reports/alice/?token=%s" % token
r = self.client.get(url)
self.assertContains(r, "You have been unsubscribed")
self.profile.refresh_from_db()
self.assertFalse(self.profile.reports_allowed)

57
hc/accounts/views.py
View File

@ -62,6 +62,15 @@ def _associate_demo_check(request, user):
del request.session["welcome_code"] del request.session["welcome_code"]
def _ensure_own_team(request):
""" Make sure user is switched to their own team. """
if request.team != request.profile:
request.team = request.profile
request.profile.current_team = request.profile
request.profile.save()
def login(request, show_password=False): def login(request, show_password=False):
bad_credentials = False bad_credentials = False
if request.method == 'POST': if request.method == 'POST':
@ -149,12 +158,8 @@ def check_token(request, username, token):
@login_required @login_required
def profile(request): def profile(request):
profile = request.user.profile _ensure_own_team(request)
# Switch user back to its own team profile = request.profile
if request.team != profile:
request.team = profile
profile.current_team = profile
profile.save()
ctx = { ctx = {
"page": "profile", "page": "profile",
@ -230,12 +235,8 @@ def profile(request):
@login_required @login_required
def notifications(request): def notifications(request):
profile = request.user.profile _ensure_own_team(request)
# Switch user back to its default team profile = request.profile
if profile.current_team_id != profile.id:
request.team = profile
profile.current_team_id = profile.id
profile.save()
if request.method == "POST": if request.method == "POST":
form = ReportSettingsForm(request.POST) form = ReportSettingsForm(request.POST)
@ -254,18 +255,13 @@ def notifications(request):
@login_required @login_required
def badges(request): def badges(request):
profile = request.user.profile _ensure_own_team(request)
# Switch user back to its own team
if request.team != profile:
request.team = profile
profile.current_team = profile
profile.save()
tags = set() tags = set()
for check in Check.objects.filter(user=request.team.user): for check in Check.objects.filter(user=request.team.user):
tags.update(check.tags_list()) tags.update(check.tags_list())
username = request.team.user.username username = request.user.username
urls = [] urls = []
for tag in sorted(tags, key=lambda s: s.lower()): for tag in sorted(tags, key=lambda s: s.lower()):
if not re.match("^[\w-]+$", tag): if not re.match("^[\w-]+$", tag):
@ -286,8 +282,7 @@ def badges(request):
@login_required @login_required
def set_password(request, token): def set_password(request, token):
profile = request.user.profile if not request.profile.check_token(token, "set-password"):
if not profile.check_token(token, "set-password"):
return HttpResponseBadRequest() return HttpResponseBadRequest()
if request.method == "POST": if request.method == "POST":
@ -297,8 +292,8 @@ def set_password(request, token):
request.user.set_password(password) request.user.set_password(password)
request.user.save() request.user.save()
profile.token = "" request.profile.token = ""
profile.save() request.profile.save()
# Setting a password logs the user out, so here we # Setting a password logs the user out, so here we
# log them back in. # log them back in.
@ -313,8 +308,7 @@ def set_password(request, token):
@login_required @login_required
def change_email(request, token): def change_email(request, token):
profile = request.user.profile if not request.profile.check_token(token, "change-email"):
if not profile.check_token(token, "change-email"):
return HttpResponseBadRequest() return HttpResponseBadRequest()
if request.method == "POST": if request.method == "POST":
@ -324,8 +318,8 @@ def change_email(request, token):
request.user.set_unusable_password() request.user.set_unusable_password()
request.user.save() request.user.save()
profile.token = "" request.profile.token = ""
profile.save() request.profile.save()
return redirect("hc-change-email-done") return redirect("hc-change-email-done")
else: else:
@ -345,8 +339,9 @@ def unsubscribe_reports(request, username):
return HttpResponseBadRequest() return HttpResponseBadRequest()
user = User.objects.get(username=username) user = User.objects.get(username=username)
user.profile.reports_allowed = False profile = Profile.objects.for_user(user)
user.profile.save() profile.reports_allowed = False
profile.save()
return render(request, "accounts/unsubscribed.html") return render(request, "accounts/unsubscribed.html")
@ -376,8 +371,8 @@ def switch_team(request, target_username):
if not access_ok: if not access_ok:
return HttpResponseForbidden() return HttpResponseForbidden()
request.user.profile.current_team = other_user.profile request.profile.current_team = other_user.profile
request.user.profile.save() request.profile.save()
return redirect("hc-checks") return redirect("hc-checks")