wip

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

@@ -231,9 +231,10 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(
 {
     MATTER_TRACE_SCOPE("CommissioningComplete", "GeneralCommissioning");
 
-    DeviceControlServer * devCtrl = &DeviceLayer::DeviceControlServer::DeviceControlSvr();
-    auto & failSafe               = Server::GetInstance().GetFailSafeContext();
-    auto & fabricTable            = Server::GetInstance().GetFabricTable();
+    DeviceControlServer * devCtrl    = &DeviceLayer::DeviceControlServer::DeviceControlSvr();
+    auto & failSafe                  = Server::GetInstance().GetFailSafeContext();
+    auto & fabricTable               = Server::GetInstance().GetFabricTable();
+    auto & termsAndConditionsManager = Server::GetInstance().GetTermsAndConditionsManager();
 
     ChipLogProgress(FailSafe, "GeneralCommissioning: Received CommissioningComplete");
 
@@ -254,6 +255,23 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(
             response.errorCode = CommissioningErrorEnum::kInvalidAuthentication;
             ChipLogError(FailSafe, "GeneralCommissioning: Got commissioning complete in invalid security context");
         }
+        else if (!termsAndConditionsManager.HasRequiredTermsAndConditionsBeenAcknowledged())
+        {
+            ChipLogError(AppServer, "Required terms and conditions have not been accepted");
+
+            /*
+             * Pass fabric of commissioner to DeviceControlSvr.
+             * This allows device to send messages back to commissioner.
+             * Once bindings are implemented, this may no longer be needed.
+             */
+            failSafe.DisarmFailSafe();
+            CheckSuccess(
+                devCtrl->PostCommissioningCompleteEvent(handle->AsSecureSession()->GetPeerNodeId(), handle->GetFabricIndex()),
+                Failure);
+
+            Breadcrumb::Set(commandPath.mEndpointId, 0);
+            response.errorCode = CommissioningErrorEnum::kRequiredTCNotAccepted;
+        }
         else
         {
             if (failSafe.NocCommandHasBeenInvoked())

src/app/server/Server.h

@@ -33,6 +33,7 @@
 #include <app/server/AppDelegate.h>
 #include <app/server/CommissioningWindowManager.h>
 #include <app/server/DefaultAclStorage.h>
+#include <app/server/TermsAndConditionsManager.h>
 #include <credentials/CertificateValidityPolicy.h>
 #include <credentials/FabricTable.h>
 #include <credentials/GroupDataProvider.h>
@@ -357,6 +358,8 @@ class Server
 
     app::FailSafeContext & GetFailSafeContext() { return mFailSafeContext; }
 
+    app::TermsAndConditionsManager & GetTermsAndConditionsManager() const { return mTermsAndConditionsManager; }
+
     TestEventTriggerDelegate * GetTestEventTriggerDelegate() { return mTestEventTriggerDelegate; }
 
     Crypto::OperationalKeystore * GetOperationalKeystore() { return mOperationalKeystore; }
@@ -636,6 +639,7 @@ class Server
     Crypto::OperationalKeystore * mOperationalKeystore;
     Credentials::OperationalCertificateStore * mOpCertStore;
     app::FailSafeContext mFailSafeContext;
+    app::TermsAndConditionsManager mTermsAndConditionsManager;
 
     bool mIsDnssdReady = false;
     uint16_t mOperationalServicePort;

src/app/server/TermsAndConditionsManager.cpp

@@ -0,0 +1,20 @@
+#include "TermsAndConditionsManager.h"
+
+CHIP_ERROR chip::app::TermsAndConditionsManager::SetTCAcknowledgements(uint16_t tcVersion, uint16_t tcUserResponse)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    err = ConfigurationMgr().StoreTCAcknowledgements(tcVersion, tcUserResponse);
+    SuccessOrExit(err);
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "SetTCAcknowledgements failed with error: %s", ErrorStr(err));
+    }
+    return err;
+}
+
+bool chip::app::TermsAndConditionsManager::HasRequiredTermsAndConditionsBeenAcknowledged() {
+    return false;
+}

src/app/server/TermsAndConditionsManager.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+
+namespace chip {
+namespace app {
+
+class TermsAndConditionsManager {
+public:
+    CHIP_ERROR SetTCAcknowledgements(uint16_t tcVersion, uint16_t tcUserResponse);
+    virtual bool HasRequiredTermsAndConditionsBeenAcknowledged() = 0;
+};
+
+}; // namespace app
+}; // namespace chip

src/include/platform/DeviceControlServer.h

@@ -35,7 +35,6 @@ class DeviceControlServer final
 
     CHIP_ERROR PostCommissioningCompleteEvent(NodeId peerNodeId, FabricIndex accessingFabricIndex);
     CHIP_ERROR SetRegulatoryConfig(uint8_t location, const CharSpan & countryCode);
-    CHIP_ERROR SetTCAcknowledgements(uint16_t tcVersion, uint16_t tcUserResponse);
     CHIP_ERROR PostConnectedToOperationalNetworkEvent(ByteSpan networkID);
     CHIP_ERROR PostCloseAllBLEConnectionsToOperationalNetworkEvent();
     CHIP_ERROR PostWiFiDeviceAvailableNetworkEvent();