intermittent commit

src/govoplan_core/mail/config.py

@@ -67,6 +67,32 @@ class ImapConfig(ImapServerConfig):
     password: str | None = None
 
 
+def normalize_split_transport_credentials(value: object) -> object:
+    """Move legacy transport username/password fields into credentials."""
+    if not isinstance(value, dict):
+        return value
+    data = dict(value)
+    credentials = data.get("credentials") if isinstance(data.get("credentials"), dict) else {}
+    credentials = {key: dict(item) for key, item in credentials.items() if isinstance(item, dict)}
+    for protocol in ("smtp", "imap"):
+        transport = data.get(protocol)
+        if not isinstance(transport, dict):
+            continue
+        next_transport = dict(transport)
+        next_credentials = dict(credentials.get(protocol) or {})
+        for field in ("username", "password"):
+            if field in next_transport and field not in next_credentials:
+                next_credentials[field] = next_transport[field]
+            next_transport.pop(field, None)
+        next_transport.pop("enabled", None)
+        data[protocol] = next_transport
+        if next_credentials:
+            credentials[protocol] = next_credentials
+    if credentials:
+        data["credentials"] = credentials
+    return data
+
+
 def default_smtp_port(security: TransportSecurity | str | None) -> int:
     if security == TransportSecurity.TLS or security == "tls":
         return 465