From 08f2eebd6e84edcbbade2789592c7d3caa7d7bc6 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 20 Apr 2024 10:10:57 +0200 Subject: [PATCH] Extract httpBasic from function header --- freqtrade/rpc/api_server/api_auth.py | 3 ++- freqtrade/rpc/rpc.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/freqtrade/rpc/api_server/api_auth.py b/freqtrade/rpc/api_server/api_auth.py index dd4749100..257c1cc24 100644 --- a/freqtrade/rpc/api_server/api_auth.py +++ b/freqtrade/rpc/api_server/api_auth.py @@ -26,6 +26,7 @@ def verify_auth(api_config, username: str, password: str): httpbasic = HTTPBasic(auto_error=False) +security = HTTPBasic() oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token", auto_error=False) @@ -117,7 +118,7 @@ def http_basic_or_jwt_token(form_data: HTTPBasicCredentials = Depends(httpbasic) @router_login.post('/token/login', response_model=AccessAndRefreshToken) -def token_login(form_data: HTTPBasicCredentials = Depends(HTTPBasic()), +def token_login(form_data: HTTPBasicCredentials = Depends(security), api_config=Depends(get_api_config)): if verify_auth(api_config, form_data.username, form_data.password): diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index ef330caf3..c3466a598 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -460,8 +460,10 @@ class RPC: def _rpc_trade_statistics( self, stake_currency: str, fiat_display_currency: str, - start_date: datetime = datetime.fromtimestamp(0)) -> Dict[str, Any]: + start_date: Optional[datetime] = None) -> Dict[str, Any]: """ Returns cumulative profit statistics """ + if start_date is None: + start_date = datetime.fromtimestamp(0) trade_filter = ((Trade.is_open.is_(False) & (Trade.close_date >= start_date)) | Trade.is_open.is_(True)) trades: Sequence[Trade] = Trade.session.scalars(Trade.get_trades_query(