--- a/server/src/metaeducation/auth.py	Fri Apr 01 12:56:16 2016 +0200
+++ b/server/src/metaeducation/auth.py	Fri Apr 01 15:13:39 2016 +0200
@@ -36,7 +36,7 @@
                 token = match.group(0)
             logger.debug("CLIENT CREDENTIAL AUTH: token is %r", token)
         # send token to Oauth server
-        validation_service_url = settings.MTDC_VALIDATE_TOKEN_BASE_URL+token+"?redirect_uri="+parse.quote_plus(settings.MTDC_GED_BASE_URL)
+        validation_service_url = settings.MTDC_VALIDATE_TOKEN_BASE_URL+token+"?redirect_uri="+parse.quote_plus(settings.MTDC_GED_REDIRECT_URI)
         logger.debug("CLIENT CREDENTIAL AUTH: Requesting validation service %r", validation_service_url)
         token_validate_response = requests.get(validation_service_url)
         if token_validate_response.status_code != 200:
@@ -60,8 +60,8 @@
         
         if "redirect_uri" 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_BASE_URL):
-            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_BASE_URL))
+        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():
             logger.warning("CLIENT_CREDENTIAL_AUTH: Token validate  response doesn't have an error key!")

--- a/server/src/metaeducation/settings/__init__.py	Fri Apr 01 12:56:16 2016 +0200
+++ b/server/src/metaeducation/settings/__init__.py	Fri Apr 01 15:13:39 2016 +0200
@@ -147,6 +147,7 @@
 MTDC_PROFILE_URL = "" # This URL is relative to a <CONTEXT> Base url that will be passed as query arg to the server
 
 MTDC_GED_BASE_URL = "" # Base URL of the GED server
+MTDC_GED_REDIRECT_URI = "" # GED server redirect URI for token validation
 MTDC_VALIDATE_TOKEN_BASE_URL = "" # "https://dev.enteduc.fr/rest/oauth/validate/"
 MTDC_CLIENT_CREDENTIALS_TOKEN_URL = "" # "https://dev.enteduc.fr/oauth/oauth2/token"
 MTDC_REFERENCE_RESOURCE_BASE_URL = MTDC_GED_BASE_URL + "" # "http://192.168.1.62:20411/ws/resource/" # MTDC_GED_BASE_URL + "/ws/resource/"

--- a/server/src/metaeducation/settings/dev.py.tmpl	Fri Apr 01 12:56:16 2016 +0200
+++ b/server/src/metaeducation/settings/dev.py.tmpl	Fri Apr 01 15:13:39 2016 +0200
@@ -120,6 +120,7 @@
 MTDC_PROFILE_URL = "" # This URL is the user profile endpoint URL, relative to a <CONTEXT> Base url that will be passed as query arg to the server
 
 MTDC_GED_BASE_URL = "" # Base URL of the GED server
+MTDC_GED_REDIRECT_URI = "" # GED server redirect URI for token validation
 MTDC_VALIDATE_TOKEN_URL = "" # This URL is the ABSOLUTE url for validating a token. There will be no context involved for validation token from server to server.
 MTDC_CLIENT_CREDENTIALS_TOKEN_URL = "" # This URL is the ABSOLUTE url for getting a token via Client Credentials from server to server.
 MTDC_REFERENCE_RESOURCE_BASE_URL = "" # This URL is the ABSOLUTE url for the GED resource referencement service from server to server.