From e256ebd7271bf138a381108cb237ab574947d025 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Fri, 9 Sep 2022 07:13:05 +0200
Subject: [PATCH] Add ws_token to auto-generated config

---
 freqtrade/commands/build_config_commands.py | 1 +
 freqtrade/enums/rpcmessagetype.py           | 1 -
 freqtrade/rpc/rpc.py                        | 4 ++--
 freqtrade/templates/base_config.json.j2     | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/freqtrade/commands/build_config_commands.py b/freqtrade/commands/build_config_commands.py
index 01cfa800a..1abd26328 100644
--- a/freqtrade/commands/build_config_commands.py
+++ b/freqtrade/commands/build_config_commands.py
@@ -211,6 +211,7 @@ def ask_user_config() -> Dict[str, Any]:
     )
     # Force JWT token to be a random string
     answers['api_server_jwt_key'] = secrets.token_hex()
+    answers['api_server_ws_token'] = secrets.token_urlsafe(25)
 
     return answers
 
diff --git a/freqtrade/enums/rpcmessagetype.py b/freqtrade/enums/rpcmessagetype.py
index 929f6d083..fae121a09 100644
--- a/freqtrade/enums/rpcmessagetype.py
+++ b/freqtrade/enums/rpcmessagetype.py
@@ -1,7 +1,6 @@
 from enum import Enum
 
 
-# We need to inherit from str so we can use as a str
 class RPCMessageType(str, Enum):
     STATUS = 'status'
     WARNING = 'warning'
diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index 9821bc001..943c1c667 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -1086,7 +1086,7 @@ class RPC:
         """ Whitelist data for WebSocket """
         return self._freqtrade.active_pair_whitelist
 
-    @ staticmethod
+    @staticmethod
     def _rpc_analysed_history_full(config, pair: str, timeframe: str,
                                    timerange: str, exchange) -> Dict[str, Any]:
         timerange_parsed = TimeRange.parse_timerange(timerange)
@@ -1117,7 +1117,7 @@ class RPC:
             self._freqtrade.strategy.plot_config['subplots'] = {}
         return self._freqtrade.strategy.plot_config
 
-    @ staticmethod
+    @staticmethod
     def _rpc_sysinfo() -> Dict[str, Any]:
         return {
             "cpu_pct": psutil.cpu_percent(interval=1, percpu=True),
diff --git a/freqtrade/templates/base_config.json.j2 b/freqtrade/templates/base_config.json.j2
index 681af84c6..299734a50 100644
--- a/freqtrade/templates/base_config.json.j2
+++ b/freqtrade/templates/base_config.json.j2
@@ -67,6 +67,7 @@
         "verbosity": "error",
         "enable_openapi": false,
         "jwt_secret_key": "{{ api_server_jwt_key }}",
+        "ws_token": "{{ api_server_ws_token }}",
         "CORS_origins": [],
         "username": "{{ api_server_username }}",
         "password": "{{ api_server_password }}"