diff --git a/remnawave/__init__.py b/remnawave/__init__.py index 95d38fc..67f6628 100644 --- a/remnawave/__init__.py +++ b/remnawave/__init__.py @@ -137,6 +137,10 @@ class RemnawaveSDK: if self.custom_headers: headers.update(self.custom_headers) + if "http://" in self.base_url: + headers["x-forwarded-proto"] = "https" + headers["x-forwarded-for"] = "127.0.0.1" + return headers def _prepare_url(self) -> str: diff --git a/remnawave/models/users.py b/remnawave/models/users.py index d05e879..4df4b4a 100644 --- a/remnawave/models/users.py +++ b/remnawave/models/users.py @@ -8,6 +8,7 @@ from pydantic import ( RootModel, StringConstraints, ) +from pydantic.alias_generators import to_camel from remnawave.enums import TrafficLimitStrategy, UserStatus @@ -133,6 +134,8 @@ class UserResponseDto(BaseModel): external_squad_uuid: UUID | None = Field(None, alias="externalSquadUuid") created_at: datetime = Field(alias="createdAt") updated_at: datetime = Field(alias="updatedAt") + + model_config = {"alias_generator": to_camel, "populate_by_name": True} class EmailUserResponseDto(RootModel[list[UserResponseDto]]): diff --git a/remnawave/models/users_stats.py b/remnawave/models/users_stats.py index 171a75d..cb906be 100644 --- a/remnawave/models/users_stats.py +++ b/remnawave/models/users_stats.py @@ -3,6 +3,7 @@ from typing import List from uuid import UUID from pydantic import BaseModel, Field +from pydantic.alias_generators import to_camel class UserUsageByRange(BaseModel): @@ -11,6 +12,8 @@ class UserUsageByRange(BaseModel): node_name: str = Field(alias="nodeName") total: int date: datetime.date + + model_config = {"alias_generator": to_camel, "populate_by_name": True} class UserUsageByRangeResponseDto(List[UserUsageByRange]): diff --git a/remnawave/models/xray_config.py b/remnawave/models/xray_config.py index 945db42..12ed8dd 100644 --- a/remnawave/models/xray_config.py +++ b/remnawave/models/xray_config.py @@ -1,10 +1,13 @@ from typing import Any, Dict from pydantic import BaseModel +from pydantic.alias_generators import to_camel class ConfigData(BaseModel): config: Any + + model_config = {"alias_generator": to_camel, "populate_by_name": True} class GetConfigResponseDto(ConfigData):