ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-27 21:07:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(auth): skip legacy OAuth repair when destination profile already exists (#97541)

Browse Source 
When doctor --fix runs legacy OAuth profile id repair, it picks the
single non-legacy OAuth profile as the migration target. If that target
profile already exists as a separate user-configured account, the repair
unconditionally overwrites it, destroying the account's config
(displayName, email) and collapsing two distinct accounts into one.

Add a guard: if the destination profile id already exists in
cfg.auth.profiles, skip the repair entirely to preserve both accounts.
Also pass cfg to resolveAuthProfileMetadata so config-set displayName
is preserved when the repair does proceed.

Fixes #97522

(cherry picked from commit ee72fa7f5f)
This commit is contained in:
liuhao1024
2026-06-29 02:46:20 +08:00
committed by Dallin Romney
parent a4d5aa1457
commit c34dea1163
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agents/auth-profiles/repair.ts
+9
View File
@@ -123,7 +123,16 @@ export function repairOAuthProfileIdMismatch(params: {
return { config: params.cfg, changes: [], migrated: false };
}
// Skip repair if destination profile already exists as a separate
// user-configured account. Overwriting it would destroy the existing
// account's config (displayName, email, etc.) and collapse two distinct
// accounts into one. See #97522.
if (params.cfg.auth?.profiles?.[toProfileId]) {
return { config: params.cfg, changes: [], migrated: false };
}
const { email: toEmail, displayName: toDisplayName } = resolveAuthProfileMetadata({
cfg: params.cfg,
store: params.store,
profileId: toProfileId,
});