vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-06-02 03:14:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: repair local approval resolution (#86771)

Browse Source
This commit is contained in:
Jason (Json)
2026-05-26 20:56:30 -06:00
committed by GitHub
parent f89fcdd5b3
commit 13cfb77c10
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gateway/operator-approvals-client.test.ts
View File

@@ -117,7 +117,7 @@ describe("withOperatorApprovalsGatewayClient", () => {
expect(clientState.options?.deviceIdentity).toBeUndefined();
});
it("omits approval runtime token for explicit gateway URL overrides", async () => {
it("keeps approval runtime token for loopback explicit gateway URL overrides", async () => {
await withOperatorApprovalsGatewayClient(
{
config: {} as never,
@@ -127,6 +127,21 @@ describe("withOperatorApprovalsGatewayClient", () => {
async () => undefined,
);
expect(typeof clientState.options?.approvalRuntimeToken).toBe("string");
});
it("omits approval runtime token for remote explicit gateway URL overrides", async () => {
bootstrapState.url = "wss://gateway.example/ws";
await withOperatorApprovalsGatewayClient(
{
config: {} as never,
gatewayUrl: "wss://gateway.example/ws",
clientDisplayName: "Matrix approval (@owner:example.org)",
},
async () => undefined,
);
expect(clientState.options).not.toHaveProperty("approvalRuntimeToken");
});

5
src/gateway/operator-approvals-client.ts
View File

@@ -44,12 +44,15 @@ export async function createOperatorApprovalsGatewayClient(
gatewayUrl: params.gatewayUrl,
env: process.env,
});
const shouldSendApprovalRuntimeToken = !params.gatewayUrl || isLoopbackGatewayUrl(bootstrap.url);
return new GatewayClient({
url: bootstrap.url,
token: bootstrap.auth.token,
password: bootstrap.auth.password,
...(params.gatewayUrl ? {} : { approvalRuntimeToken: getOperatorApprovalRuntimeToken() }),
...(shouldSendApprovalRuntimeToken
? { approvalRuntimeToken: getOperatorApprovalRuntimeToken() }
: {}),
preauthHandshakeTimeoutMs: bootstrap.preauthHandshakeTimeoutMs,
clientName: GATEWAY_CLIENT_NAMES.GATEWAY_CLIENT,
clientDisplayName: params.clientDisplayName,