Add a generalised server API for MatterDataReset and emit event from …

…the server
jadhavrohit924 · Jan 18, 2024 · 87e754c · 87e754c
1 parent cafc7ae
commit 87e754c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 19 deletions.
diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
@@ -515,11 +515,40 @@ void Server::ScheduleFactoryReset()
     PlatformMgr().ScheduleWork([](intptr_t) {
         // Delete all fabrics and emit Leave event.
         GetInstance().GetFabricTable().DeleteAllFabrics();
+        if (GetInstance().GetFabricTable().FabricCount() == 0)
+        {
+            ChipDeviceEvent event;
+            event.Type     = DeviceEventType::PublicEventTypes::kFactoryReset;
+            CHIP_ERROR err = PlatformMgr().PostEvent(&event);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(DeviceLayer, "Failed to post factory reset event");
+            }
+        }
         PlatformMgr().HandleServerShuttingDown();
         ConfigurationMgr().InitiateFactoryReset();
     });
 }
 
+void Server::ScheduleMatterDataReset()
+{
+    PlatformMgr().ScheduleWork([](intptr_t) {
+        // Delete all fabrics and emit Leave event.
+        GetInstance().GetFabricTable().DeleteAllFabrics();
+        if (GetInstance().GetFabricTable().FabricCount() == 0)
+        {
+            ChipDeviceEvent event;
+            event.Type     = DeviceEventType::PublicEventTypes::kMatterDataReset;
+            CHIP_ERROR err = PlatformMgr().PostEvent(&event);
+            if (err != CHIP_NO_ERROR)
+            {
+                ChipLogError(DeviceLayer, "Failed to post matter data reset event");
+            }
+        }
+        ConfigurationMgr().InitiateMatterDataReset();
+    });
+}
+
 void Server::Shutdown()
 {
     assertChipStackLockedByCurrentThread();

diff --git a/src/app/server/Server.h b/src/app/server/Server.h
@@ -374,6 +374,8 @@ class Server
 
     void ScheduleFactoryReset();
 
+    void ScheduleMatterDataReset();
+
     System::Clock::Microseconds64 TimeSinceInit() const
     {
         return System::SystemClock().GetMonotonicMicroseconds64() - mInitTimestamp;

diff --git a/src/include/platform/CHIPDeviceEvent.h b/src/include/platform/CHIPDeviceEvent.h
@@ -258,7 +258,7 @@ enum PublicEventTypes
     kFactoryReset,
 
     /**
-     * Signals the application that device is going to reset matter data.
+     * Signals the application that device is going to reset matter data (on last fabric removed).
      */
     kMatterDataReset,
 };

diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h
@@ -129,8 +129,9 @@ class ConfigurationManager
     virtual void RunUnitTests() = 0;
 #endif
 
-    virtual bool IsFullyProvisioned()   = 0;
-    virtual void InitiateFactoryReset() = 0;
+    virtual bool IsFullyProvisioned()      = 0;
+    virtual void InitiateFactoryReset()    = 0;
+    virtual void InitiateMatterDataReset() = 0;
 
     // Gets called when starting BLE/DNS-SD advertisement
 #if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING

diff --git a/src/platform/ESP32/ConfigurationManagerImpl.cpp b/src/platform/ESP32/ConfigurationManagerImpl.cpp
@@ -330,7 +330,7 @@ void ConfigurationManagerImpl::DoMatterDataReset(intptr_t arg)
 {
     CHIP_ERROR err;
 
-    ChipLogProgress(DeviceLayer, "Performing factory reset without erasing network credentials");
+    ChipLogProgress(DeviceLayer, "Performing matter data reset");
 
     // Erase all values in the chip-config NVS namespace.
     err = ESP32Config::ClearNamespace(ESP32Config::kConfigNamespace_ChipConfig);
@@ -383,25 +383,11 @@ void ConfigurationManagerImpl::DoFactoryReset(intptr_t arg)
 
 void ConfigurationManagerImpl::InitiateMatterDataReset()
 {
-    ChipDeviceEvent event;
-    event.Type     = DeviceEventType::PublicEventTypes::kMatterDataReset;
-    CHIP_ERROR err = PlatformMgr().PostEvent(&event);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(DeviceLayer, "Failed to post matter data reset event");
-    }
     PlatformMgr().ScheduleWork(DoMatterDataReset);
 }
 
 void ConfigurationManagerImpl::InitiateFactoryReset()
 {
-    ChipDeviceEvent event;
-    event.Type     = DeviceEventType::PublicEventTypes::kFactoryReset;
-    CHIP_ERROR err = PlatformMgr().PostEvent(&event);
-    if (err != CHIP_NO_ERROR)
-    {
-        ChipLogError(DeviceLayer, "Failed to post factory reset event");
-    }
     PlatformMgr().ScheduleWork(DoFactoryReset);
 }
 

diff --git a/src/platform/ESP32/ConfigurationManagerImpl.h b/src/platform/ESP32/ConfigurationManagerImpl.h
@@ -78,7 +78,7 @@ class ConfigurationManagerImpl : public Internal::GenericConfigurationManagerImp
     void InitiateFactoryReset(void) override;
 
     // InitiateMatterDataReset erases matter data only (chip config, counters, kvs namespaces).
-    void InitiateMatterDataReset(void);
+    void InitiateMatterDataReset(void) override;
 
     CHIP_ERROR MapConfigError(esp_err_t error);
     CHIP_ERROR ReadPersistedStorageValue(::chip::Platform::PersistedStorage::Key key, uint32_t & value) override;