DGNum/www-bocal
6
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Update to Django 2.2

Browse source
This commit is contained in:
Théophile Bastian 2020-06-16 12:00:24 +02:00
parent 8d8d26a14e
commit 0037f5f231
3 changed files with 44 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

38
bocal_auth/views.py
View file

@ -7,36 +7,36 @@ from urllib.parse import quote as urlquote
def login(req):
if req.user.is_authenticated():
return redirect('homepage')
if req.user.is_authenticated:
return redirect("homepage")
if req.method == 'GET':
if req.method == "GET":
reqDict = req.GET
elif req.method == 'POST':
elif req.method == "POST":
reqDict = req.POST
if 'next' in reqDict:
nextUrl = reqDict['next']
if "next" in reqDict:
nextUrl = reqDict["next"]
context = {
'pass_url': '{}?next={}'.format(
reverse('password_login'),
urlquote(nextUrl, safe='')),
'cas_url': '{}?next={}'.format(
reverse('cas_ng_login'),
urlquote(nextUrl, safe='')),
"pass_url": "{}?next={}".format(
reverse("password_login"), urlquote(nextUrl, safe="")
),
"cas_url": "{}?next={}".format(
reverse("cas_ng_login"), urlquote(nextUrl, safe="")
),
}
else:
context = {
'pass_url': reverse('password_login'),
'cas_url': reverse('cas_ng_login'),
"pass_url": reverse("password_login"),
"cas_url": reverse("cas_ng_login"),
}
return render(req, 'mainsite/login.html', context=context)
return render(req, "mainsite/login.html", context=context)
@login_required
def logout(req):
CAS_BACKEND_NAME = 'django_cas_ng.backends.CASBackend'
if req.session['_auth_user_backend'] != CAS_BACKEND_NAME:
CAS_BACKEND_NAME = "django_cas_ng.backends.CASBackend"
if req.session["_auth_user_backend"] != CAS_BACKEND_NAME:
auth_logout(req)
return redirect('homepage')
return redirect('cas_ng_logout')
return redirect("homepage")
return redirect("cas_ng_logout")