summaryrefslogtreecommitdiffstats
path: root/core/views/auth.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@gmail.com>2023-01-30 19:04:36 +0000
committerPhilip Sargent <philip.sargent@gmail.com>2023-01-30 19:04:36 +0000
commit7808005498b06d11775e83a614657fd6cbb476b8 (patch)
tree3c7b0bcb4518ba39548804082c2505949121354f /core/views/auth.py
parentd06dd3d16678c3e222a261a12bcf2f147b3fe5f9 (diff)
downloadtroggle-7808005498b06d11775e83a614657fd6cbb476b8.tar.gz
troggle-7808005498b06d11775e83a614657fd6cbb476b8.tar.bz2
troggle-7808005498b06d11775e83a614657fd6cbb476b8.zip
ran 'black' to reformat all the core files
Diffstat (limited to 'core/views/auth.py')
-rw-r--r--core/views/auth.py52
1 files changed, 24 insertions, 28 deletions
diff --git a/core/views/auth.py b/core/views/auth.py
index 86583e7..9b303c9 100644
--- a/core/views/auth.py
+++ b/core/views/auth.py
@@ -13,8 +13,8 @@ the decorator mechanism.
https://www.fullstackpython.com/django-contrib-auth-decorators-login-required-examples.html
"""
-class login_required_if_public(object):
+class login_required_if_public(object):
def __init__(self, f):
if settings.PUBLIC_SITE:
self.f = login_required(f)
@@ -26,66 +26,62 @@ class login_required_if_public(object):
# This is copied from CUYC.cuy.website.view.auth
-# If we want to do the whole online-email thing, we would also need to copy across the code in these
-# imported files and delete what is superfluous.
+# If we want to do the whole online-email thing, we would also need to copy across the code in these
+# imported files and delete what is superfluous.
# Or we could just load the latest version of django-registration app.
-#from cuy.club.models import Member, Message
-#from ..forms import WebsiteLoginForm, WebsiteRegisterForm
-#from ...common import mail_site_error
-#from .generic import user_is_active
+# from cuy.club.models import Member, Message
+# from ..forms import WebsiteLoginForm, WebsiteRegisterForm
+# from ...common import mail_site_error
+# from .generic import user_is_active
-'''The login and logout functions.
+"""The login and logout functions.
This is also where we would manage registration: for people wanting to create and validate their individual
-logon accounts/forgottenpassword'''
+logon accounts/forgottenpassword"""
############################
# Authentication Functions #
############################
+
def expologout(request):
login_form = auth_forms.AuthenticationForm()
logout(request)
-
- return render(request, 'login/logout.html', {'form':login_form})
+
+ return render(request, "login/logout.html", {"form": login_form})
+
def expologin(request):
# GET
- if not request.method == 'POST':
+ if not request.method == "POST":
if (not request.user.is_authenticated) or (not request.user.is_active):
- return render(request, 'login/index.html', {})
+ return render(request, "login/index.html", {})
else:
# going to login page when you are already logged in
- return render(request, 'tasks.html', {})
+ return render(request, "tasks.html", {})
# POST
- username = request.POST['username']
- password = request.POST['password']
+ username = request.POST["username"]
+ password = request.POST["password"]
user = authenticate(username=username, password=password)
if user is None:
- return render(request, 'login/index.html',
- {'invalid': True, 'username':username})
+ return render(request, "login/index.html", {"invalid": True, "username": username})
if not user.is_active:
- return render(request, 'login/enable.html',
- {'login_state':'notenabled'})
+ return render(request, "login/enable.html", {"login_state": "notenabled"})
try:
login(request, user)
# Should do the ?next= stuff here..
return redirect_after_login(request)
except:
- return render(request, 'errors/generic.html', {})
-
+ return render(request, "errors/generic.html", {})
+
+
def redirect_after_login(request):
nxt = request.GET.get("next", None)
if nxt is None:
return redirect(settings.LOGIN_REDIRECT_URL)
- elif not is_safe_url(
- url=nxt,
- allowed_hosts={request.get_host()},
- require_https=request.is_secure()):
+ elif not is_safe_url(url=nxt, allowed_hosts={request.get_host()}, require_https=request.is_secure()):
return redirect(settings.LOGIN_REDIRECT_URL)
else:
return redirect(nxt)
-
-