github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-07 15:01:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(gateway): prefer explicit token over stored auth

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-14 21:08:26 +01:00
parent c06a962bb6
commit d8a2c80cd7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gateway/client.ts
View File

@@ -190,8 +190,9 @@ export class GatewayClient {
const storedToken = this.opts.deviceIdentity const storedToken = this.opts.deviceIdentity
? loadDeviceAuthToken({ deviceId: this.opts.deviceIdentity.deviceId, role })?.token ? loadDeviceAuthToken({ deviceId: this.opts.deviceIdentity.deviceId, role })?.token
: null; : null;
const authToken = storedToken ?? this.opts.token ?? undefined; // Prefer explicitly provided credentials (e.g. CLI `--token`) over any persisted
const canFallbackToShared = Boolean(storedToken && this.opts.token); // device-auth tokens. Persisted tokens are only used when no token is provided.
const authToken = this.opts.token ?? storedToken ?? undefined;
const auth = const auth =
authToken || this.opts.password authToken || this.opts.password
? { ? {
@@ -270,12 +271,6 @@ export class GatewayClient {
this.opts.onHelloOk?.(helloOk); this.opts.onHelloOk?.(helloOk);
}) })
.catch((err) => { .catch((err) => {
if (canFallbackToShared && this.opts.deviceIdentity) {
clearDeviceAuthToken({
deviceId: this.opts.deviceIdentity.deviceId,
role,
});
}
this.opts.onConnectError?.(err instanceof Error ? err : new Error(String(err))); this.opts.onConnectError?.(err instanceof Error ? err : new Error(String(err)));
const msg = `gateway connect failed: ${String(err)}`; const msg = `gateway connect failed: ${String(err)}`;
if (this.opts.mode === GATEWAY_CLIENT_MODES.PROBE) { if (this.opts.mode === GATEWAY_CLIENT_MODES.PROBE) {