# HG changeset patch
# User durandn
# Date 1461229430 -7200
# Node ID 0f2d692a8333946d3c78efab745823b688d72fca
# Parent  d88cfa44fdcc90bf144d2dfed647ec23ba7fac5d
Quickfix on token validation json format

diff -r d88cfa44fdcc -r 0f2d692a8333 server/src/metaeducation/auth.py
--- a/server/src/metaeducation/auth.py	Thu Apr 07 13:22:04 2016 +0200
+++ b/server/src/metaeducation/auth.py	Thu Apr 21 11:03:50 2016 +0200
@@ -15,6 +15,7 @@
 
     def authenticate(self, request):
         # get token, get username
+        logger.debug("CLIENT CREDENTIAL AUTH: request meta - %r ", request.META)
         if ("act_as" not in request.GET) and ('HTTP_RENKAN_ACT_AS' not in request.META):
             logger.debug("CLIENT CREDENTIAL AUTH: no act_as, not client credentials, trying other authentication methods.")
             return None
@@ -64,12 +65,12 @@
         elif validate_response_json["access_token"] != token:
             logger.warning("CLIENT_CREDENTIAL_AUTH: Token in response %r is different from token extracted from header %r", validate_response_json["access_token"], token)
 
-        if "redirect_uri" not in validate_response_json.keys():
+        if "uriredirect" not in validate_response_json.keys():
             logger.warning("CLIENT_CREDENTIAL_AUTH: Token validate response doesn't have a redirect_uri key!")
         elif validate_response_json["redirect_uri"] != parse.quote_plus(settings.MTDC_GED_REDIRECT_URI):
             logger.warning("CLIENT_CREDENTIAL_AUTH: redirect_uri in response %r is different from redirect_uri transmitted in request %r", validate_response_json["redirect_uri"], parse.quote_plus(settings.MTDC_GED_REDIRECT_URI))
 
-        if "errors" not in validate_response_json.keys():
+        if "error" not in validate_response_json.keys():
             logger.warning("CLIENT_CREDENTIAL_AUTH: Token validate  response doesn't have an error key!")
             logger.warning("CLIENT_CREDENTIAL_AUTH: Aborting as the errors keys is required to check if token was validated")
             logger.warning("CLIENT_CREDENTIAL_AUTH: Response was %r", validate_response_json)