Compare commits
1 Commits
v1.31.0
...
8da6b98bc5
Author | SHA1 | Date | |
---|---|---|---|
8da6b98bc5 |
@@ -5,6 +5,5 @@ APPROVED_DOMAINS="example.com,hello.com"
|
||||
APPROVED_ROOMS="abc123,def456"
|
||||
APPROVED_USERS="bob@example.com,john@me.com"
|
||||
BOT_NAME=""
|
||||
N8N_GET_WEBHOOK_URL=""
|
||||
N8N_POST_WEBHOOK_URL=""
|
||||
N8N_WEBHOOK_URL=""
|
||||
WEBEX_API_KEY=""
|
||||
|
@@ -42,14 +42,9 @@ class Config:
|
||||
return os.environ["ADMIN_EMAIL"].split(",")
|
||||
|
||||
@property
|
||||
def n8n_get_webhook_url(self) -> str:
|
||||
"""Returns the n8n GET webhook URL."""
|
||||
return os.environ["N8N_GET_WEBHOOK_URL"]
|
||||
|
||||
@property
|
||||
def n8n_post_webhook_url(self) -> str:
|
||||
"""Returns the n8n POST webhook URL."""
|
||||
return os.environ["N8N_POST_WEBHOOK_URL"]
|
||||
def n8n_webhook_url(self) -> str:
|
||||
"""Returns the n8n webhook URL."""
|
||||
return os.environ["N8N_WEBHOOK_URL"]
|
||||
|
||||
@property
|
||||
def approved_users(self) -> list:
|
||||
|
@@ -16,7 +16,7 @@ def __n8n_post(data: dict) -> bool:
|
||||
"""
|
||||
headers: dict = {"Content-Type": "application/json"}
|
||||
resp: requests.Response = requests.post(
|
||||
url=config.n8n_post_webhook_url,
|
||||
url=config.n8n_webhook_url,
|
||||
headers=headers,
|
||||
json=data,
|
||||
timeout=10,
|
||||
@@ -58,7 +58,7 @@ def get_tasks(requestor) -> bool:
|
||||
"""
|
||||
headers: dict = {"Content-Type": "application/json"}
|
||||
resp: requests.Response = requests.get(
|
||||
url=config.n8n_get_webhook_url,
|
||||
url=config.n8n_webhook_url,
|
||||
headers=headers,
|
||||
timeout=10,
|
||||
verify=True,
|
||||
|
@@ -16,8 +16,7 @@ def test_config() -> None:
|
||||
"WEBEX_API_KEY": "testing",
|
||||
"ADMIN_FIRST_NAME": "Test",
|
||||
"ADMIN_EMAIL": "test@test.com",
|
||||
"N8N_GET_WEBHOOK_URL": "https://n8n.test.com/webhook/abc",
|
||||
"N8N_POST_WEBHOOK_URL": "https://n8n.test.com/webhook/def",
|
||||
"N8N_WEBHOOK_URL": "https://n8n.test.com/webhook/abcdefg",
|
||||
"APPROVED_USERS": "test@test.com",
|
||||
"APPROVED_DOMAINS": "test.com",
|
||||
"APPROVED_ROOMS": "test",
|
||||
@@ -35,8 +34,7 @@ def test_config() -> None:
|
||||
assert config.approved_rooms == config_vars["APPROVED_ROOMS"].split(",")
|
||||
assert config.approved_users == config_vars["APPROVED_USERS"].split(",")
|
||||
assert config.bot_name == config_vars["BOT_NAME"]
|
||||
assert config.n8n_get_webhook_url == config_vars["N8N_GET_WEBHOOK_URL"]
|
||||
assert config.n8n_post_webhook_url == config_vars["N8N_POST_WEBHOOK_URL"]
|
||||
assert config.n8n_webhook_url == config_vars["N8N_WEBHOOK_URL"]
|
||||
assert config.version == config_vars["APP_VERSION"]
|
||||
assert config.webex_token == config_vars["WEBEX_API_KEY"]
|
||||
|
||||
|
@@ -16,8 +16,7 @@ def test_config_no_admin_vars() -> None:
|
||||
"WEBEX_API_KEY": "testing",
|
||||
"ADMIN_FIRST_NAME": "Test",
|
||||
"ADMIN_EMAIL": "test@test.com",
|
||||
"N8N_GET_WEBHOOK_URL": "https://n8n.test.com/webhook/abc",
|
||||
"N8N_POST_WEBHOOK_URL": "https://n8n.test.com/webhook/def",
|
||||
"N8N_WEBHOOK_URL": "https://n8n.test.com/webhook/abcdefg",
|
||||
}
|
||||
|
||||
for config_var, value in config_vars.items():
|
||||
@@ -32,8 +31,7 @@ def test_config_no_admin_vars() -> None:
|
||||
assert config.admin_emails == config_vars["ADMIN_EMAIL"].split(",")
|
||||
assert config.admin_first_name == config_vars["ADMIN_FIRST_NAME"]
|
||||
assert config.bot_name == config_vars["BOT_NAME"]
|
||||
assert config.n8n_get_webhook_url == config_vars["N8N_GET_WEBHOOK_URL"]
|
||||
assert config.n8n_post_webhook_url == config_vars["N8N_POST_WEBHOOK_URL"]
|
||||
assert config.n8n_webhook_url == config_vars["N8N_WEBHOOK_URL"]
|
||||
assert config.version == config_vars["APP_VERSION"]
|
||||
assert config.webex_token == config_vars["WEBEX_API_KEY"]
|
||||
|
||||
|
8
uv.lock
generated
8
uv.lock
generated
@@ -1,5 +1,5 @@
|
||||
version = 1
|
||||
revision = 3
|
||||
revision = 2
|
||||
requires-python = ">=3.11, <4.0"
|
||||
resolution-markers = [
|
||||
"python_full_version >= '3.12'",
|
||||
@@ -54,11 +54,11 @@ wheels = [
|
||||
|
||||
[[package]]
|
||||
name = "certifi"
|
||||
version = "2025.8.3"
|
||||
version = "2025.7.14"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/dc/67/960ebe6bf230a96cda2e0abcf73af550ec4f090005363542f0765df162e0/certifi-2025.8.3.tar.gz", hash = "sha256:e564105f78ded564e3ae7c923924435e1daa7463faeab5bb932bc53ffae63407", size = 162386, upload-time = "2025-08-03T03:07:47.08Z" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/b3/76/52c535bcebe74590f296d6c77c86dabf761c41980e1347a2422e4aa2ae41/certifi-2025.7.14.tar.gz", hash = "sha256:8ea99dbdfaaf2ba2f9bac77b9249ef62ec5218e7c2b2e903378ed5fccf765995", size = 163981, upload-time = "2025-07-14T03:29:28.449Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/e5/48/1549795ba7742c948d2ad169c1c8cdbae65bc450d6cd753d124b17c8cd32/certifi-2025.8.3-py3-none-any.whl", hash = "sha256:f6c12493cfb1b06ba2ff328595af9350c65d6644968e5d3a2ffd78699af217a5", size = 161216, upload-time = "2025-08-03T03:07:45.777Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/4f/52/34c6cf5bb9285074dc3531c437b3919e825d976fde097a7a73f79e726d03/certifi-2025.7.14-py3-none-any.whl", hash = "sha256:6b31f564a415d79ee77df69d757bb49a5bb53bd9f756cbbe24394ffd6fc1f4b2", size = 162722, upload-time = "2025-07-14T03:29:26.863Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
Reference in New Issue
Block a user