Merge pull request #91 from foo290/90-unable-to-get-version-300-working-on-django-5113

90 unable to get version 300 working on django 5113

Author: foo290

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Django-Verify-Email
-version = 3.0.0
+version = 3.0.2
 author = Nitin
 author_email = ns290670@gamil.com
 description = A Django app for email verification.

verify_email/tests.py

@@ -50,18 +50,18 @@ def test_verification_link(self):
 
     def test_process(self):
         user_token = TokenManager().generate_token_for_user(self.user)
-        time.sleep(2)
+        time.sleep(1)
 
         link = ActivationLinkManager.generate_link(user_token, self.user.email)
         full_url = f"http://testserver{link}"
         resp = self.client.get(full_url)
         self.assertEquals(resp.status_code, 200)
 
     def test_timestamp_invalid_link(self):
-        user_token = TokenManager(max_age='2s').generate_token_for_user(self.user)
+        user_token = TokenManager().generate_token_for_user(self.user)
         time.sleep(3)
 
-        link = ActivationLinkManager(max_age='2s').generate_link(user_token, self.user.email)
+        link = ActivationLinkManager().generate_link(user_token, self.user.email)
         full_url = f"http://testserver{link}"
         resp = self.client.get(full_url)
         self.assertEquals(resp.status_code, 401)

verify_email/token_manager.py

@@ -27,10 +27,12 @@
 
 @dataclass
 class GeneralConfig:
-    settings: GetFieldFromSettings = GetFieldFromSettings()
-    max_age: str = settings.get("max_age", raise_exception=False)
-    max_retries: int = settings.get("max_retries") + 1
-    time_units: List = field(default_factory=lambda: ["s", "m", "h", "d"])
+    settings: GetFieldFromSettings = field(default_factory=GetFieldFromSettings)
+    time_units: List[str] = field(default_factory=lambda: ["s", "m", "h", "d"])
+
+    def __post_init__(self):
+        self.max_age = self.settings.get("max_age", raise_exception=False)
+        self.max_retries = self.settings.get("max_retries") + 1
 
 
 @dataclass
@@ -157,11 +159,13 @@ class TokenManager(signing.TimestampSigner, GeneralConfig):
     link_manager: ActivationLinkManager = ActivationLinkManager()
 
     def __post_init__(self):
+        GeneralConfig.__post_init__(self)
+
         self.key = self.settings.get("key", raise_exception=False)
         self.salt = self.settings.get("salt", raise_exception=False)
         self.sep = self.settings.get("sep", raise_exception=False)
 
-        super().__init__()
+        signing.TimestampSigner.__init__(self, key=self.key, sep=self.sep, salt=self.salt)
 
     @staticmethod
     def is_token_valid(plain_email, encrypted_user_token) -> bool: