feat: remove optional services step from setup wizard
Services are now installed post-setup from the Store page, so the wizard step that let users pre-select email/calendar/files is removed. Reduces wizard from 5 steps to 4 (Step4Services deleted, Step5Review renamed to Step4Review). Backend drops services_enabled validation, background install thread, and service_store_manager dependency. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+1
-22
@@ -10,7 +10,6 @@ import fcntl
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
import threading
|
||||
from typing import Any, Dict, List
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -95,10 +94,9 @@ def _build_ddns_config(domain_mode: str, cloudflare_api_token: str = '',
|
||||
class SetupManager:
|
||||
"""Manages the first-run setup wizard state and completion."""
|
||||
|
||||
def __init__(self, config_manager, auth_manager, service_store_manager=None):
|
||||
def __init__(self, config_manager, auth_manager):
|
||||
self.config_manager = config_manager
|
||||
self.auth_manager = auth_manager
|
||||
self.service_store_manager = service_store_manager
|
||||
|
||||
# ── state helpers ─────────────────────────────────────────────────────
|
||||
|
||||
@@ -174,7 +172,6 @@ class SetupManager:
|
||||
domain_mode = payload.get('domain_mode', '')
|
||||
domain_name = payload.get('domain_name', '')
|
||||
timezone = payload.get('timezone', '')
|
||||
services_enabled = payload.get('services_enabled', [])
|
||||
ddns_provider = payload.get('ddns_provider', 'none')
|
||||
cloudflare_api_token = payload.get('cloudflare_api_token', '')
|
||||
duckdns_token = payload.get('duckdns_token', '')
|
||||
@@ -188,8 +185,6 @@ class SetupManager:
|
||||
)
|
||||
if not timezone or not isinstance(timezone, str):
|
||||
errors.append('timezone is required.')
|
||||
if not isinstance(services_enabled, list):
|
||||
errors.append('services_enabled must be a list.')
|
||||
|
||||
if errors:
|
||||
return {'success': False, 'errors': errors}
|
||||
@@ -235,7 +230,6 @@ class SetupManager:
|
||||
if domain_name:
|
||||
self.config_manager.set_identity_field('domain_name', domain_name)
|
||||
self.config_manager.set_identity_field('timezone', timezone)
|
||||
self.config_manager.set_identity_field('services_enabled', services_enabled)
|
||||
self.config_manager.set_identity_field('ddns_provider', ddns_provider)
|
||||
if cloudflare_api_token:
|
||||
self.config_manager.set_identity_field('cloudflare_api_token', cloudflare_api_token)
|
||||
@@ -265,21 +259,6 @@ class SetupManager:
|
||||
# ── mark setup complete (must be last) ─────────────────────────
|
||||
self.config_manager.set_identity_field('setup_complete', True)
|
||||
|
||||
# Trigger service installs in background — non-blocking, failures are logged
|
||||
if services_enabled and self.service_store_manager is not None:
|
||||
def _install_services():
|
||||
for svc_id in services_enabled:
|
||||
try:
|
||||
result = self.service_store_manager.install(svc_id)
|
||||
if result.get('ok'):
|
||||
logger.info('Wizard: installed service %r', svc_id)
|
||||
else:
|
||||
logger.warning('Wizard: install %r failed: %s',
|
||||
svc_id, result.get('error') or result.get('errors'))
|
||||
except Exception as exc:
|
||||
logger.warning('Wizard: install %r raised: %s', svc_id, exc)
|
||||
threading.Thread(target=_install_services, daemon=True).start()
|
||||
|
||||
logger.info(f"Setup completed. cell_name={cell_name!r}, domain_mode={domain_mode!r}")
|
||||
return {'success': True, 'redirect': '/login'}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user