@@ -63,6 +63,7 @@ export async function finalizeSetupWizard(
6363): Promise<{ launchedTui: boolean }> {
6464const { flow, opts, baseConfig, nextConfig, settings, prompter, runtime } = options;
6565let gatewayProbe: { ok: boolean; detail?: string } = { ok: true };
66+let resolvedGatewayPassword = "";
66676768const withWizardProgress = async <T>(
6869label: string,
@@ -236,6 +237,26 @@ export async function finalizeSetupWizard(
236237}
237238}
238239240+if (settings.authMode === "password") {
241+try {
242+resolvedGatewayPassword =
243+(await resolveSetupSecretInputString({
244+config: nextConfig,
245+value: nextConfig.gateway?.auth?.password,
246+path: "gateway.auth.password",
247+env: process.env,
248+})) ?? "";
249+} catch (error) {
250+await prompter.note(
251+[
252+"Could not resolve gateway.auth.password SecretRef for setup auth.",
253+formatErrorMessage(error),
254+].join("\n"),
255+"Gateway auth",
256+);
257+}
258+}
259+239260if (!opts.skipHealth) {
240261const probeLinks = resolveControlUiLinks({
241262bind: nextConfig.gateway?.bind ?? "loopback",
@@ -247,7 +268,8 @@ export async function finalizeSetupWizard(
247268// Daemon install/restart can briefly flap the WS; wait a bit so health check doesn't false-fail.
248269gatewayProbe = await waitForGatewayReachable({
249270url: probeLinks.wsUrl,
250-token: settings.gatewayToken,
271+token: settings.authMode === "token" ? settings.gatewayToken : undefined,
272+password: settings.authMode === "password" ? resolvedGatewayPassword : undefined,
251273deadlineMs: 15_000,
252274});
253275if (gatewayProbe.ok) {
@@ -272,6 +294,7 @@ export async function finalizeSetupWizard(
272294timeoutMs: 10_000,
273295config: healthConfig,
274296token: settings.authMode === "token" ? settings.gatewayToken : undefined,
297+password: settings.authMode === "password" ? resolvedGatewayPassword : undefined,
275298},
276299runtime,
277300);
@@ -348,27 +371,6 @@ export async function finalizeSetupWizard(
348371settings.authMode === "token" && settings.gatewayToken
349372 ? `${links.httpUrl}#token=${encodeURIComponent(settings.gatewayToken)}`
350373 : links.httpUrl;
351-let resolvedGatewayPassword = "";
352-if (settings.authMode === "password") {
353-try {
354-resolvedGatewayPassword =
355-(await resolveSetupSecretInputString({
356-config: nextConfig,
357-value: nextConfig.gateway?.auth?.password,
358-path: "gateway.auth.password",
359-env: process.env,
360-})) ?? "";
361-} catch (error) {
362-await prompter.note(
363-[
364-"Could not resolve gateway.auth.password SecretRef for setup auth.",
365-formatErrorMessage(error),
366-].join("\n"),
367-"Gateway auth",
368-);
369-}
370-}
371-372374if (opts.skipHealth || !gatewayProbe.ok) {
373375gatewayProbe = await probeGatewayReachable({
374376url: links.wsUrl,
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。