esp32: erase fabric information during factoryreset (#13861)

src/platform/ESP32/ConfigurationManagerImpl.cpp

@@ -286,6 +286,14 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
 #elif CHIP_DEVICE_CONFIG_ENABLE_THREAD
  ThreadStackMgr().ErasePersistentInfo();
 #endif
+
+ // Erase all key-values including fabric info.
+ err = PersistedStorage::KeyValueStoreMgrImpl().EraseAll();
+ if (err != CHIP_NO_ERROR)
+ {
+ ChipLogError(DeviceLayer, "Clear Key-Value Storage failed");
+ }
+
  // Restart the system.
  ChipLogProgress(DeviceLayer, "System restarting");
  esp_restart();

src/platform/ESP32/KeyValueStoreManagerImpl.cpp

@@ -87,6 +87,17 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
  return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR KeyValueStoreManagerImpl::EraseAll(void)
+{
+ Internal::ScopedNvsHandle handle;
+
+ ReturnErrorOnFailure(handle.Open(kNamespace, NVS_READWRITE));
+ ReturnMappedErrorOnFailure(nvs_erase_all(handle));
+ ReturnMappedErrorOnFailure(nvs_commit(handle));
+
+ return CHIP_NO_ERROR;
+}
+
 } // namespace PersistedStorage
 } // namespace DeviceLayer
 } // namespace chip

src/platform/ESP32/KeyValueStoreManagerImpl.h

@@ -42,6 +42,8 @@ class KeyValueStoreManagerImpl final : public KeyValueStoreManager
 
  CHIP_ERROR _Put(const char * key, const void * value, size_t value_size);
 
+ CHIP_ERROR EraseAll(void);
+
 private:
  const char * kNamespace = "CHIP_KVS";