Merge branch 'master' of ssh://git@dev.dredd.it/dreddit-auth

api/auth.py

@@ -6,10 +6,13 @@ class APIKeyAuthentication(object):
 
     def is_authenticated(self, request):
 
-        apikey = request.GET.get('apikey', None)
-        if apikey:
+        params = {}
+        for key,value in request.GET.items():
+            params[key.lower()] = value
+
+        if params['apikey']:
             try:
-                keyobj = AuthAPIKey.objects.get(key=apikey)
+                keyobj = AuthAPIKey.objects.get(key=params['apikey'])
             except:
                 keyobj = None
 

api/handlers.py

@@ -105,10 +105,10 @@ class EveAPIProxyHandler(BaseHandler):
 
         params = {}
         for key,value in request.GET.items():
-            params[key] = value
+            params[key.lower()] = value
 
-        if request.GET.get('userid', None):
-            obj = get_object_or_404(EVEAccount, pk=request.GET.get('userid', None))
+        if 'userid' in params:
+            obj = get_object_or_404(EVEAccount, pk=params['userid'])
             params['apikey'] = obj.api_key
 
         print params
@@ -120,7 +120,7 @@ class OpTimerHandler(BaseHandler):
     allowed_methods = ('GET')
 
     def read(self, request, id=None):
-        obj = get_object_or_404(EVEAccount, user=FULL_API_USER_ID)
+        obj = get_object_or_404(EVEAccount, id=FULL_API_USER_ID)
             
         params = {'userID':obj.id,'apiKey':obj.api_key,'characterID':FULL_API_CHARACTER_ID}
         

settings.py

@@ -123,8 +123,8 @@ REDDIT_PASSWD = ''
 
 HR_STAFF_GROUP = 'HR Staff'
 
-FULL_API_USER_ID = 1
-FULL_API_CHARACTER_ID = 217608501
+FULL_API_USER_ID = 415631
+FULL_API_CHARACTER_ID = 246102445
 
 # try and import local settings
 try: