fix wizard empty state

Author: t-aleksander

crates/defguard_common/src/db/models/initial_setup_wizard.rs

@@ -14,6 +14,10 @@ pub enum InitialSetupStep {
     // Adoption is not present, since the proxy is saved
     // only after completing adoption step.
     EdgeComponent,
+    InternalUrlSettings,
+    InternalUrlSslConfig,
+    ExternalUrlSettings,
+    ExternalUrlSslConfig,
     Confirmation,
     Finished,
 }

crates/defguard_core/src/handlers/component_setup.rs

@@ -609,13 +609,13 @@ pub async fn setup_proxy_tls_stream(
             Ok(wizard) => {
                 if !wizard.completed {
                     let state = InitialSetupState {
-                        step: InitialSetupStep::Confirmation,
+                        step: InitialSetupStep::InternalUrlSettings,
                     };
                     if let Err(err) = state.save(&pool).await {
                         yield Ok(flow.error(&format!("Failed to update setup step in wizard: {err}")));
                         return;
                     }
-                    debug!("Initial setup step advanced to 'Confirmation'");
+                    debug!("Initial setup step advanced to 'InternalUrlSettings'");
                 }
             }
             Err(err) => {

crates/defguard_proxy_manager/src/handler.rs

@@ -121,6 +121,7 @@ impl ProxyHandler {
         }
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub(super) fn from_proxy(
         proxy: &Proxy<Id>,
         pool: PgPool,

crates/defguard_setup/src/handlers/auto_wizard.rs

@@ -7,6 +7,7 @@ use defguard_common::{
     db::models::{
         Certificates, WireguardNetwork,
         certificates::{CoreCertSource, ProxyCertSource},
+        initial_setup_wizard::InitialSetupStep,
         settings::update_current_settings,
         setup_auto_adoption::{AutoAdoptionWizardState, AutoAdoptionWizardStep},
         wireguard::LocationMfaMode,
@@ -26,6 +27,8 @@ use serde_json::json;
 use sqlx::{PgPool, query_scalar};
 use tracing::{debug, info};
 
+use crate::handlers::initial_wizard::advance_initial_wizard_to_step;
+
 pub(crate) async fn is_auto_wizard_active(pool: &PgPool) -> Result<bool, WebError> {
     let wizard = Wizard::get(pool).await?;
     Ok(wizard.active_wizard == ActiveWizard::AutoAdoption)
@@ -185,6 +188,7 @@ pub async fn set_internal_url_settings(
     };
 
     advance_auto_wizard_to_step(&pool, AutoAdoptionWizardStep::InternalUrlSslConfig).await?;
+    advance_initial_wizard_to_step(&pool, InitialSetupStep::InternalUrlSslConfig).await?;
 
     info!("Auto-adoption wizard internal URL settings applied");
 
@@ -216,10 +220,11 @@ pub async fn get_internal_ssl_info(
 }
 
 /// SSL configuration type for the external (proxy) web server.
-#[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]
+#[derive(Default, Deserialize, Serialize, Debug, Clone, PartialEq)]
 #[serde(rename_all = "snake_case")]
 pub enum ExternalSslType {
     /// No SSL - plain HTTP, user manages reverse proxy / SSL termination themselves.
+    #[default]
     None,
     /// Obtain certificate via ACME / Let's Encrypt.
     LetsEncrypt,
@@ -238,12 +243,6 @@ pub struct ExternalUrlSettingsConfig {
     key_pem: Option<String>,
 }
 
-impl Default for ExternalSslType {
-    fn default() -> Self {
-        Self::None
-    }
-}
-
 /// Updates external proxy URL settings (step 4).
 pub async fn set_external_url_settings(
     _: AdminOrSetupRole,
@@ -360,6 +359,7 @@ pub async fn set_external_url_settings(
     };
 
     advance_auto_wizard_to_step(&pool, AutoAdoptionWizardStep::ExternalUrlSslConfig).await?;
+    advance_initial_wizard_to_step(&pool, InitialSetupStep::ExternalUrlSslConfig).await?;
 
     info!("Auto-adoption wizard external URL settings applied");
     Ok(ApiResponse::new(

crates/defguard_setup/src/handlers/initial_wizard.rs

@@ -37,12 +37,18 @@ use tracing::{debug, info};
 
 use crate::handlers::auto_wizard::{advance_auto_wizard_to_step, is_auto_wizard_active};
 
-async fn advance_initial_wizard_to_step(
+pub(crate) async fn advance_initial_wizard_to_step(
     pool: &PgPool,
     step: InitialSetupStep,
 ) -> Result<(), WebError> {
     let wizard = Wizard::get(pool).await?;
 
+    // Don't try to advance if the initial wizard is not active
+    if wizard.active_wizard != ActiveWizard::Initial {
+        debug!("Not advancing initial wizard step as initial wizard is not active");
+        return Ok(());
+    }
+
     // Don't try to advance if setup is already completed
     if wizard.completed {
         debug!("Not advancing setup step as initial setup is already completed");
@@ -329,7 +335,7 @@ pub async fn set_general_config(
 
     info!("Initial general configuration applied");
 
-    advance_initial_wizard_to_step(&pool, InitialSetupStep::Ca).await?;
+    advance_initial_wizard_to_step(&pool, InitialSetupStep::InternalUrlSettings).await?;
 
     Ok(ApiResponse::with_status(StatusCode::CREATED))
 }

crates/defguard_setup/tests/auto_wizard_url_settings.rs

@@ -56,7 +56,7 @@ fn generate_test_cert_pem(common_name: &str) -> (String, String) {
     let dn = vec![(DnType::CommonName, common_name)];
     let csr = Csr::new(&key_pair, &san, dn).unwrap();
     let cert = ca.sign_csr(&csr).unwrap();
-    let cert_pem = der_to_pem(&cert.der().to_vec(), PemLabel::Certificate).unwrap();
+    let cert_pem = der_to_pem(cert.der(), PemLabel::Certificate).unwrap();
     let key_pem = der_to_pem(key_pair.serialize_der().as_slice(), PemLabel::PrivateKey).unwrap();
     (cert_pem, key_pem)
 }

web/src/pages/MigrationWizardPage/steps/MigrationWizardExternalUrlSslConfigStep.tsx

@@ -61,6 +61,15 @@ export const MigrationWizardExternalUrlSslConfigStep = () => {
 
   const [acmeState, setAcmeState] = useState<AcmeStepState>(defaultAcmeState);
 
+  // If ssl_type is not set (e.g. fresh browser session), redirect back so the
+  // user can re-submit the settings step and repopulate the store.
+  // biome-ignore lint/correctness/useExhaustiveDependencies: only run on mount
+  useEffect(() => {
+    if (sslType === null) {
+      useMigrationWizardStore.getState().back();
+    }
+  }, []);
+
   const { data: sslInfoData } = useQuery({
     queryKey: ['external_ssl_info'],
     queryFn: () => api.initial_setup.getExternalSslInfo(),
@@ -301,7 +310,7 @@ export const MigrationWizardExternalUrlSslConfigStep = () => {
           text={m.controls_back()}
           variant="outlined"
           onClick={() => useMigrationWizardStore.getState().back()}
-          disabled={isLetsEncryptProcessing || acmeState.isComplete}
+          disabled={isLetsEncryptProcessing}
         />
         <div className="right">
           <Button

web/src/pages/MigrationWizardPage/steps/MigrationWizardInternalUrlSslConfigStep.tsx

@@ -1,4 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
+import { useEffect } from 'react';
 import { m } from '../../../paraglide/messages';
 import api from '../../../shared/api/api';
 import { Controls } from '../../../shared/components/Controls/Controls';
@@ -16,6 +17,15 @@ export const MigrationWizardInternalUrlSslConfigStep = () => {
   const sslType = useMigrationWizardStore((s) => s.internal_ssl_type);
   const certInfo = useMigrationWizardStore((s) => s.internal_ssl_cert_info);
 
+  // If ssl_type is not set (e.g. fresh browser session), redirect back so the
+  // user can re-submit the settings step and repopulate the store.
+  // biome-ignore lint/correctness/useExhaustiveDependencies: only run on mount
+  useEffect(() => {
+    if (sslType === null) {
+      useMigrationWizardStore.getState().back();
+    }
+  }, []);
+
   const { data: sslInfoData } = useQuery({
     queryKey: ['internal_ssl_info'],
     queryFn: () => api.initial_setup.getInternalSslInfo(),

web/src/pages/MigrationWizardPage/store/useMigrationWizardStore.tsx

@@ -30,10 +30,10 @@ interface StoreValues extends MigrationWizardApiState {
   authentication_period_days: number;
   mfa_code_timeout_seconds: number;
   // internal URL SSL configuration
-  internal_ssl_type: InternalSslType;
+  internal_ssl_type: InternalSslType | null;
   internal_ssl_cert_info: CertInfo | null;
   // external URL SSL configuration
-  external_ssl_type: ExternalSslType;
+  external_ssl_type: ExternalSslType | null;
   external_ssl_cert_info: CertInfo | null;
   // ca
   ca_common_name: string;
@@ -65,9 +65,9 @@ const defaults: StoreValues = {
   default_admin_group_name: 'admin',
   authentication_period_days: 30,
   mfa_code_timeout_seconds: 300,
-  internal_ssl_type: 'none',
+  internal_ssl_type: null,
   internal_ssl_cert_info: null,
-  external_ssl_type: 'none',
+  external_ssl_type: null,
   external_ssl_cert_info: null,
   ca_common_name: m.migration_wizard_ca_placeholder_common_name(),
   ca_email: '',

web/src/pages/SetupPage/autoAdoption/steps/AutoAdoptionExternalUrlSslConfigStep.tsx

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect } from 'react';
 import { m } from '../../../../paraglide/messages';
 import api from '../../../../shared/api/api';
 import { Controls } from '../../../../shared/components/Controls/Controls';
@@ -61,7 +61,14 @@ export const AutoAdoptionExternalUrlSslConfigStep = () => {
   const sslType = useAutoAdoptionSetupWizardStore((s) => s.external_ssl_type);
   const certInfo = useAutoAdoptionSetupWizardStore((s) => s.external_ssl_cert_info);
 
-  const [acmeState, setAcmeState] = useState<AcmeStepState>(defaultAcmeState);
+  // If ssl_type is not set (e.g. fresh browser session), redirect back so the
+  // user can re-submit the settings step and repopulate the store.
+  // biome-ignore lint/correctness/useExhaustiveDependencies: only run on mount
+  useEffect(() => {
+    if (sslType === null) {
+      setActiveStep(AutoAdoptionSetupStep.ExternalUrlSettings);
+    }
+  }, []);
 
   const { data: sslInfoData } = useQuery({
     queryKey: ['external_ssl_info'],
@@ -99,33 +106,24 @@ export const AutoAdoptionExternalUrlSslConfigStep = () => {
     };
   }, []);
 
-  const stepDone = useCallback(
-    (stepId: AcmeStepId): boolean => {
-      const stepIndex = ACME_STEP_IDS.indexOf(stepId);
-      const currentIndex = acmeState.currentStep
-        ? ACME_STEP_IDS.indexOf(acmeState.currentStep)
-        : -1;
-      return stepIndex < currentIndex || acmeState.isComplete;
-    },
-    [acmeState.isComplete, acmeState.currentStep],
-  );
+  const stepDone = useCallback((stepId: AcmeStepId): boolean => {
+    const stepIndex = ACME_STEP_IDS.indexOf(stepId);
+    const currentIndex = acmeState.currentStep
+      ? ACME_STEP_IDS.indexOf(acmeState.currentStep)
+      : -1;
+    return stepIndex < currentIndex || acmeState.isComplete;
+  }, []);
 
-  const stepLoading = useCallback(
-    (stepId: AcmeStepId): boolean => {
-      return acmeState.isProcessing && acmeState.currentStep === stepId;
-    },
-    [acmeState.isProcessing, acmeState.currentStep],
-  );
+  const stepLoading = useCallback((stepId: AcmeStepId): boolean => {
+    return acmeState.isProcessing && acmeState.currentStep === stepId;
+  }, []);
 
-  const stepError = useCallback(
-    (stepId: AcmeStepId): string | null => {
-      if (acmeState.errorMessage && acmeState.currentStep === stepId) {
-        return acmeState.errorMessage;
-      }
-      return null;
-    },
-    [acmeState.errorMessage, acmeState.currentStep],
-  );
+  const stepError = useCallback((stepId: AcmeStepId): string | null => {
+    if (acmeState.errorMessage && acmeState.currentStep === stepId) {
+      return acmeState.errorMessage;
+    }
+    return null;
+  }, []);
 
   const handleDownloadCaCert = () => {
     if (!sslInfoData?.ca_cert_pem) return;
@@ -303,7 +301,7 @@ export const AutoAdoptionExternalUrlSslConfigStep = () => {
           text={m.initial_setup_controls_back()}
           variant="outlined"
           onClick={() => setActiveStep(AutoAdoptionSetupStep.ExternalUrlSettings)}
-          disabled={isLetsEncryptProcessing || acmeState.isComplete}
+          disabled={isLetsEncryptProcessing}
         />
         <div className="right">
           <Button