Use django's auth code for login/logout instead of rolling our own
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
import forms
|
from django.contrib.auth.forms import AuthenticationForm
|
||||||
|
|
||||||
def login_form(request):
|
def login_form(request):
|
||||||
return {'login_form': forms.LoginForm()}
|
return {'login_form': AuthenticationForm()}
|
||||||
|
@@ -2,10 +2,6 @@ from django import forms
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
import models
|
import models
|
||||||
|
|
||||||
class LoginForm(forms.Form):
|
|
||||||
username = forms.CharField()
|
|
||||||
password = forms.CharField(widget=forms.PasswordInput)
|
|
||||||
|
|
||||||
class UserForm(forms.Form):
|
class UserForm(forms.Form):
|
||||||
username = forms.CharField()
|
username = forms.CharField()
|
||||||
password = forms.CharField(widget=forms.PasswordInput)
|
password = forms.CharField(widget=forms.PasswordInput)
|
||||||
|
@@ -12,7 +12,5 @@ urlpatterns = patterns('profiles',
|
|||||||
url(r'^invites/new$', 'views.createInvite'),
|
url(r'^invites/new$', 'views.createInvite'),
|
||||||
url(r'^invites$', 'views.invites'),
|
url(r'^invites$', 'views.invites'),
|
||||||
url(r'^edit$', 'views.edit'),
|
url(r'^edit$', 'views.edit'),
|
||||||
url(r'^login$', 'views.login'),
|
|
||||||
url(r'^logout$', 'views.logout'),
|
|
||||||
url(r'^disabled$', direct_to_template, {'template': 'profiles/disabled.html'}, name='disabled_account')
|
url(r'^disabled$', direct_to_template, {'template': 'profiles/disabled.html'}, name='disabled_account')
|
||||||
)
|
)
|
||||||
|
@@ -30,27 +30,6 @@ def edit(request):
|
|||||||
return HttpResponseRedirect(reverse('profiles.views.profile'))
|
return HttpResponseRedirect(reverse('profiles.views.profile'))
|
||||||
return render_to_response('profiles/edit.html', {"form":form}, context_instance = RequestContext(request))
|
return render_to_response('profiles/edit.html', {"form":form}, context_instance = RequestContext(request))
|
||||||
|
|
||||||
def logout(request):
|
|
||||||
django.contrib.auth.logout(request)
|
|
||||||
return HttpResponseRedirect("/")
|
|
||||||
|
|
||||||
def login(request):
|
|
||||||
if request.method == 'POST':
|
|
||||||
form = forms.LoginForm(request.POST)
|
|
||||||
else:
|
|
||||||
form = forms.LoginForm()
|
|
||||||
if form.is_valid():
|
|
||||||
username = form.cleaned_data['username']
|
|
||||||
password = form.cleaned_data['password']
|
|
||||||
user = authenticate(username=username, password=password)
|
|
||||||
if user is not None:
|
|
||||||
if user.is_active:
|
|
||||||
django.contrib.auth.login(request, user)
|
|
||||||
return HttpResponseRedirect("/")
|
|
||||||
else:
|
|
||||||
return HttpResponseRedirect(reverse('disabled_account'))
|
|
||||||
return render_to_response('profiles/login.html', {"login_form":form}, context_instance = RequestContext(request))
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def invites(request):
|
def invites(request):
|
||||||
invites = request.user.invites.all()
|
invites = request.user.invites.all()
|
||||||
|
@@ -43,7 +43,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="{% url user_profile %}">Your Profile</a></li>
|
<li><a href="{% url user_profile %}">Your Profile</a></li>
|
||||||
<li><a href="{% url profiles.views.logout %}">Logout</a></li>
|
<li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li>
|
||||||
{% if user.is_staff or user.is_superuser %}
|
{% if user.is_staff or user.is_superuser %}
|
||||||
<li><a href="{% url admin:index %}">Admin</a></li>
|
<li><a href="{% url admin:index %}">Admin</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
<form method="POST" action="{% url profiles.views.login %}">
|
<form method="POST" action="{% url django.contrib.auth.views.login %}">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{login_form.as_p}}
|
{{login_form.as_p}}
|
||||||
<input type="submit" value="Login"/>
|
<input type="submit" value="Login"/>
|
||||||
|
Reference in New Issue
Block a user