github/openclaw
1
1
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-03 03:03:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

CLI: prefer gateway.remote auth for qr --remote

Browse Source
This commit is contained in:
Mariano Belinky
2026-02-16 12:56:50 +00:00
parent fa90b3c92b
commit 5ef811771a
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,8 +118,8 @@ describe("registerQrCli", () => {
it("uses gateway.remote.url when --remote is set (ignores device-pair publicUrl)", async () => {
loadConfig.mockReturnValue({
gateway: {
remote: { url: "wss://remote.example.com:444" },
auth: { mode: "token", token: "tok" },
auth: { mode: "token", token: "local-tok" },
remote: { url: "wss://remote.example.com:444", token: "remote-tok" },
},
plugins: {
entries: {
@@ -139,7 +139,7 @@ describe("registerQrCli", () => {
const expected = encodePairingSetupCode({
url: "wss://remote.example.com:444",
token: "tok",
token: "remote-tok",
});
expect(runtime.log).toHaveBeenCalledWith(expected);
});

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

@@ -79,6 +79,27 @@ export function registerQrCli(program: Command) {
}
const wantsRemote = opts.remote === true;
if (wantsRemote && !token && !password) {
const remoteToken =
typeof cfg.gateway?.remote?.token === "string" ? cfg.gateway.remote.token.trim() : "";
const remotePassword =
typeof cfg.gateway?.remote?.password === "string"
? cfg.gateway.remote.password.trim()
: "";
// In remote mode, prefer the client-side remote credentials. These are expected to match the
// remote gateway's auth settings (gateway.remote.token/password ~= gateway.auth.token/password).
if (remoteToken) {
cfg.gateway.auth.mode = "token";
cfg.gateway.auth.token = remoteToken;
cfg.gateway.auth.password = undefined;
} else if (remotePassword) {
cfg.gateway.auth.mode = "password";
cfg.gateway.auth.password = remotePassword;
cfg.gateway.auth.token = undefined;
}
}
if (wantsRemote && !opts.url && !opts.publicUrl) {
const tailscaleMode = cfg.gateway?.tailscale?.mode ?? "off";
const remoteUrl = cfg.gateway?.remote?.url;