vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-04 12:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: dedupe gateway and flow string helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-07 09:31:35 +01:00
parent 6236db5192
commit b697cec223
11 changed files with 33 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/qr-cli.ts
View File

@@ -2,7 +2,7 @@ import type { Command } from "commander";
import qrcode from "qrcode-terminal";
import { loadConfig } from "../config/config.js";
import { hasConfiguredSecretInput } from "../config/types.secrets.js";
import { readGatewayPasswordEnv, readGatewayTokenEnv } from "../gateway/credentials.js";
import { trimToUndefined } from "../gateway/credentials.js";
import { resolveRequiredConfiguredSecretRefInputString } from "../gateway/resolve-configured-secret-input-string.js";
import { resolvePairingSetupFromConfig, encodePairingSetupCode } from "../pairing/setup-code.js";
import { runCommandWithTimeout } from "../process/exec.js";
@@ -44,7 +44,7 @@ function shouldResolveLocalGatewayPasswordSecret(
cfg: ReturnType<typeof loadConfig>,
env: NodeJS.ProcessEnv,
): boolean {
if (readGatewayPasswordEnv(env)) {
if (trimToUndefined(env.OPENCLAW_GATEWAY_PASSWORD)) {
return false;
}
const authMode = cfg.gateway?.auth?.mode;
@@ -54,7 +54,7 @@ function shouldResolveLocalGatewayPasswordSecret(
if (authMode === "token" || authMode === "none" || authMode === "trusted-proxy") {
return false;
}
const envToken = readGatewayTokenEnv(env);
const envToken = trimToUndefined(env.OPENCLAW_GATEWAY_TOKEN);
const configTokenConfigured = hasConfiguredSecretInput(
cfg.gateway?.auth?.token,
cfg.secrets?.defaults,