nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 14:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use shortcuts and tidy up the response code

Browse Source
This commit is contained in:
Andrew Williams
2010-11-08 09:58:07 +00:00
parent bd90fe04cc
commit 5e41d4e9cb
1 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
sso/views.py
View File

@@ -3,8 +3,8 @@ import random
import re import re
import unicodedata import unicodedata
from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.http import HttpResponse
from django.shortcuts import render_to_response from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.contrib import messages from django.contrib import messages
from django.contrib.auth.models import User from django.contrib.auth.models import User
@@ -24,7 +24,7 @@ import settings
def index(request): def index(request):
if request.user: if request.user:
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
else: else:
return render_to_response('sso/index.html', context_instance=RequestContext(request)) return render_to_response('sso/index.html', context_instance=RequestContext(request))
@@ -43,10 +43,7 @@ def profile(request):
@login_required @login_required
def characters(request, charid=0): def characters(request, charid=0):
if charid: if charid:
try: character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid)
character = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance').get(id=charid)
except EVEPlayerCharacter.DoesNotExist:
raise Http404('Character does not exist')
return render_to_response('sso/character.html', locals(), context_instance=RequestContext(request)) return render_to_response('sso/character.html', locals(), context_instance=RequestContext(request))
characters = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__alliance').filter(eveaccount__user=request.user).only('id', 'name', 'corporation__name', 'corporation__alliance__name') characters = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__alliance').filter(eveaccount__user=request.user).only('id', 'name', 'corporation__name', 'corporation__alliance__name')
@@ -60,11 +57,11 @@ def eveapi_add(request):
try: try:
acc = import_eve_account(form.cleaned_data['api_key'], form.cleaned_data['user_id']) acc = import_eve_account(form.cleaned_data['api_key'], form.cleaned_data['user_id'])
except APIAuthException: except APIAuthException:
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
if not acc: if not acc:
messages.add_message(request, messages.ERROR, "A error was encountered while adding your API key, try again later. If the issue persists, contact a Admin.") messages.add_message(request, messages.ERROR, "A error was encountered while adding your API key, try again later. If the issue persists, contact a Admin.")
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
acc.user = request.user acc.user = request.user
acc.description = form.cleaned_data['description'] acc.description = form.cleaned_data['description']
@@ -75,7 +72,7 @@ def eveapi_add(request):
request.user.get_profile().update_access() request.user.get_profile().update_access()
return HttpResponseRedirect(reverse('sso.views.profile')) # Redirect after POST return redirect('sso.views.profile')
else: else:
form = EveAPIForm() # An unbound form form = EveAPIForm() # An unbound form
@@ -88,7 +85,7 @@ def eveapi_del(request, userid=0):
try: try:
acc = EVEAccount.objects.get(id=userid) acc = EVEAccount.objects.get(id=userid)
except EVEAccount.DoesNotExist: except EVEAccount.DoesNotExist:
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
if acc.user == request.user: if acc.user == request.user:
user = acc.user user = acc.user
@@ -96,7 +93,7 @@ def eveapi_del(request, userid=0):
user.get_profile().update_access() user.get_profile().update_access()
messages.add_message(request, messages.INFO, "EVE API key successfully deleted.") messages.add_message(request, messages.INFO, "EVE API key successfully deleted.")
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
@login_required @login_required
def eveapi_refresh(request, userid=0): def eveapi_refresh(request, userid=0):
@@ -117,7 +114,7 @@ def eveapi_refresh(request, userid=0):
else: else:
messages.add_message(request, messages.INFO,"Key %s has been refreshed from the EVE API." % acc.api_user_id) messages.add_message(request, messages.INFO,"Key %s has been refreshed from the EVE API." % acc.api_user_id)
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
@login_required @login_required
def eveapi_log(request, userid=0): def eveapi_log(request, userid=0):
@@ -131,7 +128,7 @@ def eveapi_log(request, userid=0):
logs = ApiAccessLog.objects.filter(userid=userid).order_by('-time_access')[:50] logs = ApiAccessLog.objects.filter(userid=userid).order_by('-time_access')[:50]
return render_to_response('sso/eveapi_log.html', locals(), context_instance=RequestContext(request)) return render_to_response('sso/eveapi_log.html', locals(), context_instance=RequestContext(request))
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
@login_required @login_required
def service_add(request): def service_add(request):
@@ -183,10 +180,10 @@ def service_del(request, serviceid=0):
try: try:
acc = ServiceAccount.objects.get(id=serviceid) acc = ServiceAccount.objects.get(id=serviceid)
except ServiceAccount.DoesNotExist: except ServiceAccount.DoesNotExist:
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
if not acc.user == request.user: if not acc.user == request.user:
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
if request.method == 'POST': if request.method == 'POST':
if 'confirm-delete' in request.POST: if 'confirm-delete' in request.POST:
@@ -199,7 +196,7 @@ def service_del(request, serviceid=0):
else: else:
return render_to_response('sso/serviceaccount/deleteconfirm.html', locals(), context_instance=RequestContext(request)) return render_to_response('sso/serviceaccount/deleteconfirm.html', locals(), context_instance=RequestContext(request))
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
@login_required @login_required
def service_reset(request, serviceid=0): def service_reset(request, serviceid=0):
@@ -207,10 +204,10 @@ def service_reset(request, serviceid=0):
try: try:
acc = ServiceAccount.objects.get(id=serviceid) acc = ServiceAccount.objects.get(id=serviceid)
except ServiceAccount.DoesNotExist: except ServiceAccount.DoesNotExist:
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
if not acc.active: if not acc.active:
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
if acc.user == request.user: if acc.user == request.user:
if not request.method == 'POST': if not request.method == 'POST':
@@ -231,7 +228,7 @@ def service_reset(request, serviceid=0):
else: else:
return render_to_response('sso/serviceaccount/reset.html', locals(), context_instance=RequestContext(request)) return render_to_response('sso/serviceaccount/reset.html', locals(), context_instance=RequestContext(request))
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
@login_required @login_required
def reddit_add(request): def reddit_add(request):
@@ -249,7 +246,7 @@ def reddit_add(request):
acc.save() acc.save()
messages.add_message(request, messages.INFO, "Reddit account %s successfully added." % acc.username) messages.add_message(request, messages.INFO, "Reddit account %s successfully added." % acc.username)
return HttpResponseRedirect(reverse('sso.views.profile')) # Redirect after POST return redirect('sso.views.profile') # Redirect after POST
else: else:
defaults = { 'username': request.user.username, } defaults = { 'username': request.user.username, }
form = RedditAccountForm(defaults) # An unbound form form = RedditAccountForm(defaults) # An unbound form
@@ -262,13 +259,13 @@ def reddit_del(request, redditid=0):
try: try:
acc = RedditAccount.objects.get(id=redditid) acc = RedditAccount.objects.get(id=redditid)
except RedditAccount.DoesNotExist: except RedditAccount.DoesNotExist:
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
if acc.user == request.user: if acc.user == request.user:
acc.delete() acc.delete()
messages.add_message(request, messages.INFO, "Reddit account successfully deleted.") messages.add_message(request, messages.INFO, "Reddit account successfully deleted.")
return HttpResponseRedirect(reverse('sso.views.profile')) return redirect('sso.views.profile')
@login_required @login_required
def user_view(request, username=None): def user_view(request, username=None):
@@ -276,9 +273,9 @@ def user_view(request, username=None):
try: try:
user = User.objects.get(username=username) user = User.objects.get(username=username)
except User.DoesNotExist: except User.DoesNotExist:
return HttpResponseRedirect(reverse('sso.views.user_lookup')) return redirect('sso.views.user_lookup')
else: else:
return HttpResponseRedirect(reverse('sso.views.user_lookup')) return redirect('sso.views.user_lookup')
profile = user.get_profile() profile = user.get_profile()
is_admin = request.user.is_staff is_admin = request.user.is_staff
@@ -312,15 +309,15 @@ def user_lookup(request):
users = User.objects.filter(email__icontains=form.cleaned_data['username']).only('username') users = User.objects.filter(email__icontains=form.cleaned_data['username']).only('username')
else: else:
messages.add_message(request, messages.ERROR, "Error parsing form, Type: %s, Value: %s" % (form.cleaned_data['type'], form.cleaned_data['username'])) messages.add_message(request, messages.ERROR, "Error parsing form, Type: %s, Value: %s" % (form.cleaned_data['type'], form.cleaned_data['username']))
return HttpResponseRedirect(reverse('sso.views.user_lookup')) return redirect('sso.views.user_lookup')
if users and len(users) == 1: if users and len(users) == 1:
return HttpResponseRedirect(reverse(user_view, args=[users[0].username])) return redirect(user_view, args=[users[0].username])
elif users and len(users) > 1: elif users and len(users) > 1:
return render_to_response('sso/lookup/lookuplist.html', locals(), context_instance=RequestContext(request)) return render_to_response('sso/lookup/lookuplist.html', locals(), context_instance=RequestContext(request))
else: else:
messages.add_message(request, messages.INFO, "No results found") messages.add_message(request, messages.INFO, "No results found")
return HttpResponseRedirect(reverse('sso.views.user_lookup')) return redirect('sso.views.user_lookup')
return render_to_response('sso/lookup/userlookup.html', locals(), context_instance=RequestContext(request)) return render_to_response('sso/lookup/userlookup.html', locals(), context_instance=RequestContext(request))
@@ -334,7 +331,7 @@ def set_apipasswd(request):
profile.api_service_password = hashlib.sha1(form.cleaned_data['password']).hexdigest() profile.api_service_password = hashlib.sha1(form.cleaned_data['password']).hexdigest()
profile.save() profile.save()
messages.add_message(request, messages.INFO, "Your API Services password has been set.") messages.add_message(request, messages.INFO, "Your API Services password has been set.")
return HttpResponseRedirect(reverse('sso.views.profile')) # Redirect after POST return redirect('sso.views.profile') # Redirect after POST
else: else:
form = APIPasswordForm() # An unbound form form = APIPasswordForm() # An unbound form