refactor(tui): dedupe gateway token resolution path

This commit is contained in:
Peter Steinberger
2026-03-07 17:37:22 +00:00
parent a96ef12061
commit e60b28fd1f

View File

@@ -369,7 +369,7 @@ export async function resolveGatewayConnection(
};
}
if (gatewayAuthMode === "token") {
const resolveToken = async () => {
const localToken =
explicitAuth.token || envToken
? { value: explicitAuth.token ?? envToken }
@@ -385,6 +385,11 @@ export async function resolveGatewayConnection(
localToken.unresolvedRefReason ?? "Missing gateway auth token.",
);
}
return token;
};
if (gatewayAuthMode === "token") {
const token = await resolveToken();
return {
url,
token,
@@ -418,21 +423,7 @@ export async function resolveGatewayConnection(
};
}
const localToken =
explicitAuth.token || envToken
? { value: explicitAuth.token ?? envToken }
: await resolveConfiguredSecretInputString({
value: config.gateway?.auth?.token,
path: "gateway.auth.token",
env,
config,
});
const token = explicitAuth.token ?? envToken ?? localToken.value;
if (!token) {
throwGatewayAuthResolutionError(
localToken.unresolvedRefReason ?? "Missing gateway auth token.",
);
}
const token = await resolveToken();
return {
url,
token,