From 4cc436540a9aadb31e7d6d6aba94be0dee340718 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Tue, 15 Jun 2010 20:09:05 +0100 Subject: [PATCH] Removed decorator (to be replaced by a piston authentication method) and added eveapi call --- api/handlers.py | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/api/handlers.py b/api/handlers.py index 0b75fa7..89e7d88 100644 --- a/api/handlers.py +++ b/api/handlers.py @@ -13,23 +13,6 @@ from api.models import AuthAPIKey, AuthAPILog from eve_api.models import EVEAccount from sso.models import ServiceAccount, Service -def apikey_required(meth): - def new(*args, **kwargs): - - if 'request' in kwargs: - url = kwargs['request'].META['QUERY_STRING'] - try: - key = AuthAPIKey.objects.get(key=kwargs['request'].GET['apikey']) - except AuthAPIKey.DoesNotExist: - pass - - if key and key.active: - AuthAPILog(key=key, url=url, access_datetime=datetime.utcnow()).save() - return meth(*args, **kwargs) - - return rc.NOT_HERE - - return new class UserHandler(BaseHandler): allowed_methods = ('GET') @@ -63,6 +46,7 @@ class UserHandler(BaseHandler): return d + class LoginHandler(BaseHandler): allowed_methods = ('GET') @@ -87,10 +71,15 @@ class LoginHandler(BaseHandler): return { 'auth': 'failed' } + class EveAPIHandler(BaseHandler): allowed_methods = ('GET') - @apikey_required - def read(self, request, id=None): - return get_object_or_404(EVEAccount, pk=id) + def read(self, request): + if request.GET.get('id', None): + return get_object_or_404(EVEAccount, pk=id) + elif request.GET.get('corpid', None): + return EVEAccount.objects.filter(characters__corporation__id=request.GET['corpid']) + elif request.GET.get('allianceid', None): + return EVEAccount.objects.filter(characters__corporation__alliance__id=request.GET['allianceid'])