vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-01 20:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

pairing: keep setup codes bootstrap-token only (#51259)

Browse Source
This commit is contained in:
Vincent Koc
2026-03-20 13:27:39 -07:00
committed by GitHub
parent 5a5e84ca1d
commit 11d71ca352
4 changed files with 17 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,24 +135,16 @@ describe("registerQrCli", () => {
};
}
function expectLoggedSetupCode(
url: string,
auth?: {
token?: string;
password?: string;
},
) {
function expectLoggedSetupCode(url: string) {
const expected = encodePairingSetupCode({
url,
bootstrapToken: "bootstrap-123",
...(auth?.token ? { token: auth.token } : {}),
...(auth?.password ? { password: auth.password } : {}),
});
expect(runtime.log).toHaveBeenCalledWith(expected);
}
function expectLoggedLocalSetupCode(auth?: { token?: string; password?: string }) {
expectLoggedSetupCode("ws://gateway.local:18789", auth);
function expectLoggedLocalSetupCode() {
expectLoggedSetupCode("ws://gateway.local:18789");
}
function mockTailscaleStatusLookup() {
@@ -189,7 +181,6 @@ describe("registerQrCli", () => {
const expected = encodePairingSetupCode({
url: "ws://gateway.local:18789",
bootstrapToken: "bootstrap-123",
token: "tok",
});
expect(runtime.log).toHaveBeenCalledWith(expected);
expect(qrGenerate).not.toHaveBeenCalled();
@@ -225,7 +216,7 @@ describe("registerQrCli", () => {
await runQr(["--setup-code-only", "--token", "override-token"]);
expectLoggedLocalSetupCode({ token: "override-token" });
expectLoggedLocalSetupCode();
});
it("skips local password SecretRef resolution when --token override is provided", async () => {
@@ -237,7 +228,7 @@ describe("registerQrCli", () => {
await runQr(["--setup-code-only", "--token", "override-token"]);
expectLoggedLocalSetupCode({ token: "override-token" });
expectLoggedLocalSetupCode();
});
it("resolves local gateway auth password SecretRefs before setup code generation", async () => {
@@ -250,7 +241,7 @@ describe("registerQrCli", () => {
await runQr(["--setup-code-only"]);
expectLoggedLocalSetupCode({ password: "local-password-secret" });
expectLoggedLocalSetupCode();
expect(resolveCommandSecretRefsViaGateway).not.toHaveBeenCalled();
});
@@ -264,7 +255,7 @@ describe("registerQrCli", () => {
await runQr(["--setup-code-only"]);
expectLoggedLocalSetupCode({ password: "password-from-env" });
expectLoggedLocalSetupCode();
expect(resolveCommandSecretRefsViaGateway).not.toHaveBeenCalled();
});
@@ -279,7 +270,7 @@ describe("registerQrCli", () => {
await runQr(["--setup-code-only"]);
expectLoggedLocalSetupCode({ token: "token-123" });
expectLoggedLocalSetupCode();
expect(resolveCommandSecretRefsViaGateway).not.toHaveBeenCalled();
});
@@ -293,7 +284,7 @@ describe("registerQrCli", () => {
await runQr(["--setup-code-only"]);
expectLoggedLocalSetupCode({ password: "inferred-password" });
expectLoggedLocalSetupCode();
expect(resolveCommandSecretRefsViaGateway).not.toHaveBeenCalled();
});
@@ -342,7 +333,6 @@ describe("registerQrCli", () => {
const expected = encodePairingSetupCode({
url: "wss://remote.example.com:444",
bootstrapToken: "bootstrap-123",
token: "remote-tok",
});
expect(runtime.log).toHaveBeenCalledWith(expected);
expect(resolveCommandSecretRefsViaGateway).toHaveBeenCalledWith(
@@ -386,7 +376,6 @@ describe("registerQrCli", () => {
const expected = encodePairingSetupCode({
url: "wss://remote.example.com:444",
bootstrapToken: "bootstrap-123",
token: "remote-tok",
});
expect(runtime.log).toHaveBeenCalledWith(expected);
});