Applied conversion function in 'ready()'-method

Author: Mischback

auth_enhanced/apps.py

@@ -6,15 +6,17 @@
 from django.conf import settings
 from django.core.checks import register
 from django.db.models.signals import post_save
+from django.utils import six
 
 # app imports
 from auth_enhanced.checks import check_settings_values
 from auth_enhanced.email import (
  callback_admin_information_new_signup,
  callback_user_signup_email_verification,
 )
+from auth_enhanced.exceptions import AuthEnhancedConversionError
 from auth_enhanced.settings import (
- DAE_CONST_MODE_EMAIL_ACTIVATION, set_app_default_settings,
+ DAE_CONST_MODE_EMAIL_ACTIVATION, DAE_CONST_VERIFICATION_TOKEN_MAX_AGE, convert_to_seconds, set_app_default_settings,
 )
 
 
@@ -35,6 +37,21 @@ def ready(self):
  # apply the default settings
  set_app_default_settings()
 
+ # convert time-strings to seconds
+ if isinstance(settings.DAE_VERIFICATION_TOKEN_MAX_AGE, six.string_types):
+ try:
+ setattr(
+ settings,
+ 'DAE_VERIFICATION_TOKEN_MAX_AGE',
+ convert_to_seconds(settings.DAE_VERIFICATION_TOKEN_MAX_AGE)
+ )
+ except AuthEnhancedConversionError:
+ setattr(
+ settings,
+ 'DAE_VERIFICATION_TOKEN_MAX_AGE',
+ DAE_CONST_VERIFICATION_TOKEN_MAX_AGE
+ )
+
  # register app-specific system checks
  register(check_settings_values)
 

auth_enhanced/settings.py

@@ -46,6 +46,10 @@
 # the name of the login url, as specified in 'urls.py'
 DAE_CONST_RECOMMENDED_LOGIN_URL = 'auth_enhanced:login'
 
+# this is the default value for DAE_VERIFICATION_TOKEN_MAX_AGE. It is directly
+# given in seconds, because it is the fallback value used in AppConfig
+DAE_CONST_VERIFICATION_TOKEN_MAX_AGE = 3600
+
 
 # #############################################################################
 # FUNCTIONS
@@ -153,4 +157,4 @@ def set_app_default_settings():
  # - an integer, specifying the maximum age of the token in seconds
  # TODO: add possible values: strings consisting of a number and a qualifier
  # like 'd', 'h', ... parsing of this (into seconds) has to be done somewhere!
- inject_setting('DAE_VERIFICATION_TOKEN_MAX_AGE', 3600)
+ inject_setting('DAE_VERIFICATION_TOKEN_MAX_AGE', DAE_CONST_VERIFICATION_TOKEN_MAX_AGE)

tests/test_apps.py

@@ -9,6 +9,7 @@
 
 # Django imports
 from django.apps import apps
+from django.conf import settings
 from django.db.models import signals
 from django.test import override_settings, tag # noqa
 
@@ -18,12 +19,33 @@
 )
 
 # app imports
-from .utils.testcases import AuthEnhancedPerTestDeactivatedSignalsTestCase
+from .utils.testcases import AuthEnhancedTestCase, AuthEnhancedPerTestDeactivatedSignalsTestCase
 
 
 @tag('appconfig')
-class AuthEnhancedConfigTests(AuthEnhancedPerTestDeactivatedSignalsTestCase):
- """These tests target the AppConfig."""
+class AuthEnhancedConfigTests(AuthEnhancedTestCase):
+ """These tests target the AppConfig, without any signal handling."""
+
+ @override_settings(DAE_VERIFICATION_TOKEN_MAX_AGE='1h')
+ def test_convert_time_strings(self):
+ """Time strings are converted to seconds."""
+
+ self.assertEqual(settings.DAE_VERIFICATION_TOKEN_MAX_AGE, '1h')
+ apps.get_app_config('auth_enhanced').ready()
+ self.assertEqual(settings.DAE_VERIFICATION_TOKEN_MAX_AGE, 3600)
+
+ @override_settings(DAE_VERIFICATION_TOKEN_MAX_AGE='foo')
+ def test_convert_use_fallback(self):
+ """If conversion fails, a fallback will be applied."""
+
+ self.assertEqual(settings.DAE_VERIFICATION_TOKEN_MAX_AGE, 'foo')
+ apps.get_app_config('auth_enhanced').ready()
+ self.assertEqual(settings.DAE_VERIFICATION_TOKEN_MAX_AGE, 3600)
+
+
+@tag('appconfig')
+class AuthEnhancedConfigSignalTests(AuthEnhancedPerTestDeactivatedSignalsTestCase):
+ """These tests target the AppConfig, especially the signal handling."""
 
  @override_settings(
  DAE_ADMIN_SIGNUP_NOTIFICATION=False,