fix(user): handle expire on modify with template

Author: M03ED

app/db/crud/user.py

@@ -454,10 +454,13 @@ async def create_user(db: AsyncSession, new_user: UserCreate, groups: list[Group
     Returns:
         User: Created user object.
     """
-    db_user = User(**new_user.model_dump(exclude={"group_ids", "expire", "proxy_settings", "next_plan"}))
+    db_user = User(
+        **new_user.model_dump(exclude={"group_ids", "expire", "proxy_settings", "next_plan", "on_hold_timeout"})
+    )
     db_user.admin = admin
     db_user.groups = groups
     db_user.expire = new_user.expire or None
+    db_user.on_hold_timeout = new_user.on_hold_timeout or None
     db_user.proxy_settings = new_user.proxy_settings.dict()
 
     db.add(db_user)

app/operation/user.py

@@ -400,14 +400,14 @@ def load_base_user_args(template: UserTemplate) -> dict:
             if template.expire_duration:
                 user_args["expire"] = dt.now(tz.utc) + td(seconds=template.expire_duration)
             else:
-                user_args["expire"] = None
+                user_args["expire"] = 0
         else:
             user_args["expire"] = 0
             user_args["on_hold_expire_duration"] = template.expire_duration
             if template.on_hold_timeout:
                 user_args["on_hold_timeout"] = dt.now(tz.utc) + td(seconds=template.on_hold_timeout)
             else:
-                user_args["on_hold_timeout"] = None
+                user_args["on_hold_timeout"] = 0
 
         return user_args