feat(vmis): 租戶自動開通完整流程 + Admin Portal SSO + NC 行事曆訂閱
Backend: - schedule_tenant: NC 新容器自動 pgsql 安裝 (_nc_db_check 全新容器處理) - schedule_tenant: NC 初始化加入 Redis + APCu memcache 設定 (修正 OIDC invalid_state) - schedule_tenant: 新租戶 KC realm 自動設定 accessCodeLifespan=600s (修正 authentication_expired) - schedule_account: NC Mail 帳號自動設定 (nc_mail_result/nc_mail_done_at) - schedule_account: NC 台灣國定假日行事曆自動訂閱 (CalDAV MKCALENDAR) - nextcloud_client: 新增 subscribe_calendar() CalDAV 訂閱方法 - settings: 新增系統設定 API (site_title/version/timezone/SSO/Keycloak) - models/result: 新增 nc_mail_result, nc_mail_done_at 欄位 - alembic: 遷移 002(system_settings) 003(keycloak_admin) 004(nc_mail_result) Frontend (Admin Portal): - 新增完整管理後台 (index/tenants/accounts/servers/schedules/logs/settings/system-status) - api.js: Keycloak JS Adapter SSO 整合 (PKCE/S256, fallback KC JS 來源, 自動 token 更新) - index.html: Promise.allSettled 取代 Promise.all,防止單一 API 失敗影響整頁 - 所有頁面加入 try/catch + toast 錯誤處理 - 新增品牌 LOGO 與 favicon Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -32,6 +32,7 @@ class AccountStatusLight(BaseModel):
|
||||
sso_result: Optional[bool] = None
|
||||
mailbox_result: Optional[bool] = None
|
||||
nc_result: Optional[bool] = None
|
||||
nc_mail_result: Optional[bool] = None
|
||||
quota_usage: Optional[float] = None
|
||||
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
from typing import Optional, List
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
@@ -31,3 +31,39 @@ class ScheduleLogResponse(BaseModel):
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
|
||||
class TenantResultItem(BaseModel):
|
||||
tenant_id: int
|
||||
tenant_name: Optional[str] = None
|
||||
traefik_status: Optional[bool] = None
|
||||
sso_result: Optional[bool] = None
|
||||
mailbox_result: Optional[bool] = None
|
||||
nc_result: Optional[bool] = None
|
||||
office_result: Optional[bool] = None
|
||||
quota_usage: Optional[float] = None
|
||||
fail_reason: Optional[str] = None
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
|
||||
class AccountResultItem(BaseModel):
|
||||
account_id: int
|
||||
sso_account: Optional[str] = None
|
||||
sso_result: Optional[bool] = None
|
||||
mailbox_result: Optional[bool] = None
|
||||
nc_result: Optional[bool] = None
|
||||
nc_mail_result: Optional[bool] = None
|
||||
quota_usage: Optional[float] = None
|
||||
fail_reason: Optional[str] = None
|
||||
|
||||
class Config:
|
||||
from_attributes = True
|
||||
|
||||
|
||||
class LogResultsResponse(BaseModel):
|
||||
log_id: int
|
||||
schedule_id: int
|
||||
tenant_results: List[TenantResultItem] = []
|
||||
account_results: List[AccountResultItem] = []
|
||||
|
||||
31
backend/app/schemas/settings.py
Normal file
31
backend/app/schemas/settings.py
Normal file
@@ -0,0 +1,31 @@
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class SettingsUpdate(BaseModel):
|
||||
site_title: Optional[str] = None
|
||||
version: Optional[str] = None
|
||||
timezone: Optional[str] = None
|
||||
sso_enabled: Optional[bool] = None
|
||||
keycloak_url: Optional[str] = None
|
||||
keycloak_admin_user: Optional[str] = None
|
||||
keycloak_admin_pass: Optional[str] = None
|
||||
keycloak_realm: Optional[str] = None
|
||||
keycloak_client: Optional[str] = None
|
||||
|
||||
|
||||
class SettingsResponse(BaseModel):
|
||||
id: int
|
||||
site_title: str
|
||||
version: str
|
||||
timezone: str
|
||||
sso_enabled: bool
|
||||
keycloak_url: str
|
||||
keycloak_admin_user: str
|
||||
keycloak_admin_pass: str
|
||||
keycloak_realm: str
|
||||
keycloak_client: str
|
||||
updated_at: Optional[datetime] = None
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
Reference in New Issue
Block a user