Cleaner token verification method

nickstenning · Dec 31, 2010 · 3ff436b · 3ff436b
1 parent 5b126e2
commit 3ff436b
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/annotator/auth.py b/annotator/auth.py
@@ -57,7 +57,7 @@ def verify_token(token, key, userId, issueTime):
 def verify_request(request):
     pre = 'x-annotator-'
 
-    required = ['auth-token', 'auth-token-issue-time', 'consumer-key', 'user-id']
+    required = ['auth-token', 'consumer-key', 'user-id', 'auth-token-issue-time']
     headers  = [pre + key for key in required]
 
     rh = request.headers
@@ -66,12 +66,7 @@ def verify_request(request):
     if not set(headers) <= set([key.lower() for key in rh.keys()]):
         return False
 
-    result = verify_token(
-        rh[pre + 'auth-token'],
-        rh[pre + 'consumer-key'],
-        rh[pre + 'user-id'],
-        rh[pre + 'auth-token-issue-time']
-    )
+    result = verify_token( *[rh[h] for h in headers] )
 
     return result