last fabric

src/app/clusters/general-commissioning-server/general-commissioning-server.cpp

@@ -38,6 +38,7 @@
 #include <platform/ConfigurationManager.h>
 #include <platform/DeviceControlServer.h>
 #include <tracing/macros.h>
+#include <credentials/FabricTable.h>
 
 using namespace chip;
 using namespace chip::app;
@@ -477,12 +478,7 @@ void OnPlatformEventHandler(const DeviceLayer::ChipDeviceEvent * event, intptr_t
 
 } // anonymous namespace
 
-void MatterGeneralCommissioningPluginServerInitCallback()
-{
-    Breadcrumb::Set(0, 0);
-    AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
-    DeviceLayer::PlatformMgrImpl().AddEventHandler(OnPlatformEventHandler);
-}
+
 
 namespace chip {
 namespace app {
@@ -496,3 +492,29 @@ void SetBreadcrumb(Attributes::Breadcrumb::TypeInfo::Type breadcrumb)
 } // namespace Clusters
 } // namespace app
 } // namespace chip
+
+class GeneralCommissioningFabricTableDelegate : public chip::FabricTable::Delegate
+{
+public:
+    // Gets called when a fabric is deleted
+    void OnFabricRemoved(const FabricTable & fabricTable, FabricIndex fabricIndex) override
+    {
+        // If the FabricIndex matches the last remaining entry in the Fabrics list, then the device SHALL delete all Matter
+        // related data on the node which was created since it was commissioned.
+        if (Server::GetInstance().GetFabricTable().FabricCount() == 0)
+        {
+            ChipLogProgress(Zcl, "general-commissioning-server: Last Fabric index 0x%x was removed", static_cast<unsigned>(fabricIndex));
+            Server::GetInstance().GetTermsAndConditionsProvider()->ResetAcceptance();
+        }
+    }
+};
+
+void MatterGeneralCommissioningPluginServerInitCallback()
+{
+    Breadcrumb::Set(0, 0);
+    AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
+    DeviceLayer::PlatformMgrImpl().AddEventHandler(OnPlatformEventHandler);
+
+    static GeneralCommissioningFabricTableDelegate generalCommissioningFabricTableDelegate;
+    Server::GetInstance().GetFabricTable().AddFabricDelegate(&generalCommissioningFabricTableDelegate);
+}

src/app/server/DefaultTermsAndConditionsProvider.cpp

@@ -69,7 +69,7 @@ CHIP_ERROR chip::app::DefaultTermsAndConditionsProvider::CheckAcceptance(const O
     // Validate if we have received any terms and conditions acceptance
     if (!inTermsAndConditions.HasValue())
     {
-        ChipLogError(AppServer, "Failed to HasReceivedTermsAndConditionsAcknowledgements");
+        ChipLogError(AppServer, "No terms and conditions have been accepted");
         outState = TermsAndConditionsState::TC_ACKNOWLEDGEMENTS_NOT_RECEIVED;
         return CHIP_NO_ERROR;
     }