mirror of
https://github.com/openclaw/openclaw.git
synced 2026-04-18 05:17:28 +00:00
refactor(tui): dedupe gateway token resolution path
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user