Merge branch 'master' of github.com:evonove/django-oauth-toolkit

RodneyRichardson · Jul 3, 2014 · aa798df · aa798df
2 parents d00ed44 + 29fdeba
commit aa798df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/oauth2_provider/generators.py b/oauth2_provider/generators.py
@@ -26,7 +26,7 @@ def hash(self):
 
 class ClientSecretGenerator(BaseHashGenerator):
     def hash(self):
-        return oauthlib_generate_client_id(length=128, chars=CLIENT_ID_CHARACTER_SET)
+        return oauthlib_generate_client_id(length=oauth2_settings.CLIENT_SECRET_GENERATOR_LENGTH, chars=CLIENT_ID_CHARACTER_SET)
 
 
 def generate_client_id():

diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
@@ -32,6 +32,7 @@
 DEFAULTS = {
     'CLIENT_ID_GENERATOR_CLASS': 'oauth2_provider.generators.ClientIdGenerator',
     'CLIENT_SECRET_GENERATOR_CLASS': 'oauth2_provider.generators.ClientSecretGenerator',
+    'CLIENT_SECRET_GENERATOR_LENGTH': 128,
     'OAUTH2_VALIDATOR_CLASS': 'oauth2_provider.oauth2_validators.OAuth2Validator',
     'SCOPES': {"read": "Reading scope", "write": "Writing scope"},
     'READ_SCOPE': 'read',