config saved to .env. Some changes may require an app restart.
+ config saved to the app database. Some changes may require an app restart.
{% endif %}
{% if ticktick_oauth_error %}
@@ -88,10 +88,11 @@
TickTick OAuth
+
Redirect URI: {{ ticktick_redirect_uri or "configure APP_HOSTNAME to generate the callback URI" }}
{% if ticktick_oauth_ready %}
Use the saved TickTick client settings to start the authorization flow.
{% else %}
-
Fill in TickTick Client ID, Client Secret, and Redirect URI before starting OAuth.
+
Fill in App Hostname, TickTick Client ID, and TickTick Client Secret before starting OAuth.
{% endif %}
{% if ticktick_oauth_ready %}
diff --git a/docker-compose.yml b/docker-compose.yml
index eceb282..2cab369 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,13 +4,11 @@ services:
app:
build: .
ports:
- - "8000:8000"
+ - "${APP_PORT:-8000}:8000"
env_file:
- .env
environment:
LOCATION_DATABASE_URL: sqlite:////app/data/locationRecorder.db
POO_DATABASE_URL: sqlite:////app/data/pooRecorder.db
- APP_HOST: 0.0.0.0
- APP_PORT: 8000
volumes:
- ./data:/app/data
diff --git a/docs/ticktick.md b/docs/ticktick.md
index cce6796..b572a7c 100644
--- a/docs/ticktick.md
+++ b/docs/ticktick.md
@@ -22,15 +22,16 @@
## 当前配置项
+- `APP_HOSTNAME`
- `TICKTICK_CLIENT_ID`
- `TICKTICK_CLIENT_SECRET`
-- `TICKTICK_REDIRECT_URI`
- `TICKTICK_TOKEN`
- `HOME_ASSISTANT_ACTION_TASK_PROJECT_ID`
## 兼容性说明
- 仍保留 legacy 的 OAuth authorization code flow
+- OAuth callback URI 现在由 `APP_HOSTNAME` 和当前环境自动推导：`development` 使用 `http`，其他环境使用 `https`
- `state` 仍是进程内临时状态；如果服务在 start 和 callback 之间重启，本轮实现下授权需要重新开始
- 不再把 token 写回 `.env` 或其他配置文件，统一写入 config 表
- 当前没有引入 legacy 的第三方 TickTick 库，先用标准库完成兼容行为
diff --git a/tests/test_auth.py b/tests/test_auth.py
index 32a12b7..b0d8c56 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -58,7 +58,7 @@ def test_login_success_sets_session_cookie_and_allows_admin_access(client: TestC
assert "New Password" in config_response.text
assert "Save Config" in config_response.text
assert "当前用户" in config_response.text
- assert "Fill in TickTick Client ID, Client Secret, and Redirect URI before starting OAuth." in config_response.text
+ assert "Fill in App Hostname, TickTick Client ID, and TickTick Client Secret before starting OAuth." in config_response.text
assert 'aria-disabled="true">Authorize TickTick<' in config_response.text
@@ -200,9 +200,10 @@ def test_config_page_shows_ticktick_oauth_link_when_ticktick_is_configured(
auth_database,
monkeypatch,
) -> None:
+ monkeypatch.setenv("APP_ENV", "production")
+ monkeypatch.setenv("APP_HOSTNAME", "localhost:8000")
monkeypatch.setenv("TICKTICK_CLIENT_ID", "ticktick-client-id")
monkeypatch.setenv("TICKTICK_CLIENT_SECRET", "ticktick-client-secret")
- monkeypatch.setenv("TICKTICK_REDIRECT_URI", "http://localhost:8000/ticktick/auth/code")
get_settings.cache_clear()
reset_auth_db_caches()
@@ -224,6 +225,7 @@ def test_config_page_shows_ticktick_oauth_link_when_ticktick_is_configured(
assert config_response.status_code == 200
assert "Use the saved TickTick client settings to start the authorization flow." in config_response.text
+ assert "Redirect URI: https://localhost:8000/ticktick/auth/code" in config_response.text
assert 'href="/ticktick/auth/start">Authorize TickTick<' in config_response.text
diff --git a/tests/test_config.py b/tests/test_config.py
index 6dd13ea..598d280 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -5,6 +5,7 @@ def test_settings_support_two_independent_database_urls(monkeypatch) -> None:
monkeypatch.setenv("APP_DATABASE_URL", "sqlite:///./data/app.db")
monkeypatch.setenv("LOCATION_DATABASE_URL", "sqlite:///./data/locationRecorder.db")
monkeypatch.setenv("POO_DATABASE_URL", "sqlite:///./data/pooRecorder.db")
+ monkeypatch.setenv("APP_HOSTNAME", "home.example.com")
monkeypatch.setenv("POO_WEBHOOK_ID", "poo-hook")
monkeypatch.setenv("POO_SENSOR_ENTITY_NAME", "sensor.test_poo_status")
monkeypatch.setenv("POO_SENSOR_FRIENDLY_NAME", "Poo Status")
@@ -28,6 +29,9 @@ def test_settings_support_two_independent_database_urls(monkeypatch) -> None:
assert settings.home_assistant_base_url == "http://ha.local:8123"
assert settings.home_assistant_auth_token == "token"
assert settings.home_assistant_timeout_seconds == 2.5
+ assert settings.app_hostname == "home.example.com"
+ assert settings.app_base_url == "https://home.example.com"
+ assert settings.ticktick_redirect_uri == "https://home.example.com/ticktick/auth/code"
assert settings.auth_bootstrap_username == "admin"
assert settings.auth_bootstrap_password == "secret"
assert settings.auth_session_cookie_name == "auth_cookie"
@@ -39,3 +43,13 @@ def test_settings_support_two_independent_database_urls(monkeypatch) -> None:
assert settings.poo_sqlite_path is not None
assert settings.poo_sqlite_path.name == "pooRecorder.db"
assert settings.auth_cookie_secure is True
+
+
+def test_settings_derive_development_ticktick_redirect_uri(monkeypatch) -> None:
+ monkeypatch.setenv("APP_ENV", "development")
+ monkeypatch.setenv("APP_HOSTNAME", "localhost:11001")
+
+ settings = Settings(_env_file=None)
+
+ assert settings.app_base_url == "http://localhost:11001"
+ assert settings.ticktick_redirect_uri == "http://localhost:11001/ticktick/auth/code"
diff --git a/tests/test_ticktick.py b/tests/test_ticktick.py
index 1c2766f..32ea1a9 100644
--- a/tests/test_ticktick.py
+++ b/tests/test_ticktick.py
@@ -38,9 +38,10 @@ class _FakeJsonResponse:
def _configured_settings(**overrides) -> Settings:
payload = {
+ "app_env": "development",
+ "app_hostname": "localhost:8000",
"ticktick_client_id": "ticktick-client-id",
"ticktick_client_secret": "ticktick-client-secret",
- "ticktick_redirect_uri": "http://localhost:8000/ticktick/auth/code",
"ticktick_token": "ticktick-access-token",
"home_assistant_action_task_project_id": "project-123",
}
@@ -105,9 +106,9 @@ def test_exchange_authorization_code_trims_ticktick_config_values(monkeypatch: p
captured = {}
client = TickTickClient(
settings=_configured_settings(
+ app_hostname=" localhost:8000 ",
ticktick_client_id=" ticktick-client-id ",
ticktick_client_secret=" ticktick-client-secret ",
- ticktick_redirect_uri=" http://localhost:8000/ticktick/auth/code ",
)
)
default_auth_state_store.pending_state = "trimmed-state"
@@ -214,9 +215,9 @@ def test_homeassistant_publish_creates_ticktick_action_task(
auth_database,
monkeypatch: pytest.MonkeyPatch,
) -> None:
+ monkeypatch.setenv("APP_HOSTNAME", "localhost:8000")
monkeypatch.setenv("TICKTICK_CLIENT_ID", "ticktick-client-id")
monkeypatch.setenv("TICKTICK_CLIENT_SECRET", "ticktick-client-secret")
- monkeypatch.setenv("TICKTICK_REDIRECT_URI", "http://localhost:8000/ticktick/auth/code")
monkeypatch.setenv("TICKTICK_TOKEN", "ticktick-access-token")
monkeypatch.setenv("HOME_ASSISTANT_ACTION_TASK_PROJECT_ID", "project-123")
get_settings.cache_clear()
@@ -260,9 +261,9 @@ def test_ticktick_auth_start_redirects_authenticated_user(
auth_database,
monkeypatch: pytest.MonkeyPatch,
) -> None:
+ monkeypatch.setenv("APP_HOSTNAME", "localhost:8000")
monkeypatch.setenv("TICKTICK_CLIENT_ID", "ticktick-client-id")
monkeypatch.setenv("TICKTICK_CLIENT_SECRET", "ticktick-client-secret")
- monkeypatch.setenv("TICKTICK_REDIRECT_URI", "http://localhost:8000/ticktick/auth/code")
get_settings.cache_clear()
reset_auth_db_caches()
monkeypatch.setattr("app.integrations.ticktick.secrets.token_hex", lambda _: "state-redirect")
@@ -296,9 +297,9 @@ def test_ticktick_auth_callback_persists_token(
auth_database,
monkeypatch: pytest.MonkeyPatch,
) -> None:
+ monkeypatch.setenv("APP_HOSTNAME", "localhost:8000")
monkeypatch.setenv("TICKTICK_CLIENT_ID", "ticktick-client-id")
monkeypatch.setenv("TICKTICK_CLIENT_SECRET", "ticktick-client-secret")
- monkeypatch.setenv("TICKTICK_REDIRECT_URI", "http://localhost:8000/ticktick/auth/code")
get_settings.cache_clear()
reset_auth_db_caches()
default_auth_state_store.pending_state = "callback-state"
@@ -337,9 +338,9 @@ def test_ticktick_auth_callback_redirects_on_invalid_state(
auth_database,
monkeypatch: pytest.MonkeyPatch,
) -> None:
+ monkeypatch.setenv("APP_HOSTNAME", "localhost:8000")
monkeypatch.setenv("TICKTICK_CLIENT_ID", "ticktick-client-id")
monkeypatch.setenv("TICKTICK_CLIENT_SECRET", "ticktick-client-secret")
- monkeypatch.setenv("TICKTICK_REDIRECT_URI", "http://localhost:8000/ticktick/auth/code")
get_settings.cache_clear()
reset_auth_db_caches()
default_auth_state_store.pending_state = "expected-state"
@@ -361,9 +362,9 @@ def test_ticktick_auth_callback_redirects_when_token_exchange_fails(
auth_database,
monkeypatch: pytest.MonkeyPatch,
) -> None:
+ monkeypatch.setenv("APP_HOSTNAME", "localhost:8000")
monkeypatch.setenv("TICKTICK_CLIENT_ID", "ticktick-client-id")
monkeypatch.setenv("TICKTICK_CLIENT_SECRET", "ticktick-client-secret")
- monkeypatch.setenv("TICKTICK_REDIRECT_URI", "http://localhost:8000/ticktick/auth/code")
get_settings.cache_clear()
reset_auth_db_caches()
default_auth_state_store.pending_state = "callback-state"