fix: preserve WhatsApp backup during phone-code cleanup

VishalJ99 · openclaw-clownfish[bot] · commit 24f18c05bee1 · 2026-07-11T04:31:50.000Z
diff --git a/extensions/whatsapp/src/auth-store.test.ts b/extensions/whatsapp/src/auth-store.test.ts
@@ -294,6 +294,46 @@ describe("auth-store", () => {
     });
   });
 
+  it("restores valid backup before clearing partial phone-code pairing credentials", async () => {
+    await withOwnedOAuthAuthDir("openclaw-wa-auth-clear-pairing-with-backup", async (authDir) => {
+      const credsPath = path.join(authDir, "creds.json");
+      const backupPath = path.join(authDir, "creds.json.bak");
+      const backupCreds = {
+        account: { details: "present" },
+        me: { id: "15551234567@s.whatsapp.net" },
+        platform: "chrome",
+        registered: false,
+      };
+      fsSync.writeFileSync(
+        credsPath,
+        JSON.stringify({
+          me: { id: "15551234567@s.whatsapp.net" },
+          pairingCode: "ABCDEFGH",
+          registered: false,
+        }),
+        "utf-8",
+      );
+      fsSync.writeFileSync(backupPath, JSON.stringify(backupCreds), "utf-8");
+      const runtime = {
+        log: vi.fn(),
+        error: vi.fn(),
+        exit: vi.fn(),
+      };
+
+      await expect(
+        clearStalePhoneCodePairingAuthIfNeeded({ authDir, runtime: runtime as never }),
+      ).resolves.toBe(true);
+
+      expect(fsSync.existsSync(authDir)).toBe(true);
+      expect(JSON.parse(fsSync.readFileSync(credsPath, "utf-8"))).toEqual(backupCreds);
+      expect(JSON.parse(fsSync.readFileSync(backupPath, "utf-8"))).toEqual(backupCreds);
+      expect(hasWebCredsSync(authDir)).toBe(true);
+      expect(runtime.log).toHaveBeenCalledWith(
+        expect.stringContaining("Restored WhatsApp Web credentials from backup"),
+      );
+    });
+  });
+
   it("keeps fully linked credentials during partial-pairing cleanup", async () => {
     await withOwnedOAuthAuthDir("openclaw-wa-auth-keep-linked", async (authDir) => {
       fsSync.writeFileSync(
diff --git a/extensions/whatsapp/src/auth-store.ts b/extensions/whatsapp/src/auth-store.ts
@@ -92,15 +92,9 @@ export async function restoreCredsFromBackupIfNeeded(authDir: string): Promise<b
       return false;
     }
 
-    const backupRaw = readCredsJsonRaw(backupPath);
-    if (!backupRaw || !isValidJson(backupRaw)) {
+    if (!(await restoreWebCredsFromBackupRaw({ credsPath, backupPath }))) {
       return false;
     }
-    await writeWebCredsRawAtomically({
-      filePath: credsPath,
-      content: backupRaw,
-      tempPrefix: ".creds.restore",
-    });
     logger.warn({ credsPath }, "restored corrupted WhatsApp creds.json from backup");
     return true;
   } catch {
@@ -109,6 +103,25 @@ export async function restoreCredsFromBackupIfNeeded(authDir: string): Promise<b
   return false;
 }
 
+async function restoreWebCredsFromBackupRaw(params: {
+  backupPath: string;
+  credsPath: string;
+}): Promise<boolean> {
+  const backupRaw = readCredsJsonRaw(params.backupPath);
+  if (!backupRaw) {
+    return false;
+  }
+
+  // Ensure backup is parseable before restoring.
+  JSON.parse(backupRaw);
+  await writeWebCredsRawAtomically({
+    filePath: params.credsPath,
+    content: backupRaw,
+    tempPrefix: ".creds.restore",
+  });
+  return true;
+}
+
 async function clearOwnedWebAuthDir(params: {
   authDir: string;
   isLegacyAuthDir: boolean;
@@ -178,6 +191,20 @@ export async function clearStalePhoneCodePairingAuthIfNeeded(params: {
     return false;
   }
 
+  if (
+    await restoreWebCredsFromBackupRaw({
+      credsPath: resolveWebCredsPath(resolvedAuthDir),
+      backupPath: resolveWebCredsBackupPath(resolvedAuthDir),
+    }).catch(() => false)
+  ) {
+    runtime.log(
+      info(
+        "Restored WhatsApp Web credentials from backup instead of clearing partial phone-code auth.",
+      ),
+    );
+    return true;
+  }
+
   const cleared = await clearOwnedWebAuthDir({
     authDir: resolvedAuthDir,
     isLegacyAuthDir: Boolean(params.isLegacyAuthDir),
