fix: update verification token settings

Utilize verification token settings directly
from the standard 'settings'-module.

Add missing 'VERIFICATION_TOKEN_LENGTH'-setting
and update 'PERSONAL_DATA_RETENTION_PERIOD_MONTHS'-type.

Refs: PT-1947

Author: mhieta

palvelutarjotin/settings.py

@@ -77,6 +77,7 @@
     KULTUS_TEACHER_UI_BASE_URL=(str, "https://kultus.hel.fi/"),
     ENABLE_SUMMARY_REPORT=(bool, False),
     VERIFICATION_TOKEN_VALID_MINUTES=(int, 15),
+    VERIFICATION_TOKEN_LENGTH=(int, 32),
     PERSONAL_DATA_RETENTION_PERIOD_MONTHS=(int, 24),
     UPDATE_LAST_LOGIN_ENABLED=(bool, True),
     UPDATE_LAST_LOGIN_INTERVAL_MINUTES=(int, 60),
@@ -428,6 +429,8 @@
     "TARGET_GROUP": env.str("KEYWORD_SET_TARGET_GROUP_ID"),
 }
 
+VERIFICATION_TOKEN_VALID_MINUTES = env.int("VERIFICATION_TOKEN_VALID_MINUTES")
+VERIFICATION_TOKEN_LENGTH = env.int("VERIFICATION_TOKEN_LENGTH")
 VERIFICATION_TOKEN_URL_MAPPING = {
     "occurrences.enrolment.CANCELLATION": f"{KULTUS_TEACHER_UI_BASE_URL}"
     + "{lang}/enrolments/cancel/{unique_id}",
@@ -437,7 +440,7 @@
 
 MAX_UPLOAD_SIZE = 2621440  # 2MB
 
-PERSONAL_DATA_RETENTION_PERIOD_MONTHS = env("PERSONAL_DATA_RETENTION_PERIOD_MONTHS")
+PERSONAL_DATA_RETENTION_PERIOD_MONTHS = env.int("PERSONAL_DATA_RETENTION_PERIOD_MONTHS")
 
 # local_settings.py can be used to override environment-specific settings
 # like database and email that differ between development and production.

verification_token/models.py

@@ -11,11 +11,6 @@
 
 from organisations.models import Person
 
-VERIFICATION_TOKEN_VALID_MINUTES = getattr(
-    settings, "VERIFICATION_TOKEN_VALID_MINUTES", 15
-)
-VERIFICATION_TOKEN_LENGTH = getattr(settings, "VERIFICATION_TOKEN_LENGTH", 32)
-
 
 class VerificationTokenManager(models.Manager):
     def deactivate_token(
@@ -33,7 +28,7 @@ def deactivate_and_create_token(
         obj,
         person,
         verification_type,
-        expiry_minutes=VERIFICATION_TOKEN_VALID_MINUTES,
+        expiry_minutes=settings.VERIFICATION_TOKEN_VALID_MINUTES,
     ):
         """
         Deactivate old tokens (of a type) and create a new one.
@@ -47,7 +42,7 @@ def create_token(
         person,
         verification_type,
         email=None,
-        expiry_minutes=VERIFICATION_TOKEN_VALID_MINUTES,
+        expiry_minutes=settings.VERIFICATION_TOKEN_VALID_MINUTES,
     ):
         key = self.model.generate_key()
 
@@ -141,7 +136,7 @@ class VerificationToken(models.Model):
     @classmethod
     def generate_key(cls):
         """Generates a new key for a verification token."""
-        return token_urlsafe(VERIFICATION_TOKEN_LENGTH)
+        return token_urlsafe(settings.VERIFICATION_TOKEN_LENGTH)
 
     def is_valid(self):
         """Validates token state."""