From a1f1f2a13a4f4c6151489efe6961e9f55a1fbe7a Mon Sep 17 00:00:00 2001
From: Abdul Samad <abdul.samad@smartthings.com>
Date: Fri, 19 Jul 2024 17:27:19 -0500
Subject: [PATCH] Add target endpoint id to commissioning window opener params

Co-authored-by: Yufeng Wang <yufengwang@google.com>
---
 src/controller/CommissioningWindowOpener.cpp | 12 +++++++++---
 src/controller/CommissioningWindowOpener.h   |  3 ++-
 src/controller/CommissioningWindowParams.h   |  9 +++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/controller/CommissioningWindowOpener.cpp b/src/controller/CommissioningWindowOpener.cpp
index 35011e69565c4a..37364883730293 100644
--- a/src/controller/CommissioningWindowOpener.cpp
+++ b/src/controller/CommissioningWindowOpener.cpp
@@ -126,6 +126,10 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindow(const Commissionin
     mCommissioningWindowVerifierCallback = nullptr;
     mNodeId                              = params.GetNodeId();
     mCommissioningWindowTimeout          = params.GetTimeout();
+    if (params.HasEndpointId())
+    {
+        mTargetEndpointId = params.GetEndpointId();
+    }
 
     if (params.GetReadVIDPIDAttributes())
     {
@@ -162,6 +166,10 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindow(const Commissionin
     mPBKDFIterations                     = params.GetIteration();
     mCommissioningWindowOption           = CommissioningWindowOption::kTokenWithProvidedPIN;
     mDiscriminator.SetLongValue(params.GetDiscriminator());
+    if (params.HasEndpointId())
+    {
+        mTargetEndpointId = params.GetEndpointId();
+    }
 
     mNextStep = Step::kOpenCommissioningWindow;
 
@@ -173,9 +181,7 @@ CHIP_ERROR CommissioningWindowOpener::OpenCommissioningWindowInternal(Messaging:
 {
     ChipLogProgress(Controller, "OpenCommissioningWindow for device ID 0x" ChipLogFormatX64, ChipLogValueX64(mNodeId));
 
-    constexpr EndpointId kAdministratorCommissioningClusterEndpoint = 0;
-
-    ClusterBase cluster(exchangeMgr, sessionHandle, kAdministratorCommissioningClusterEndpoint);
+    ClusterBase cluster(exchangeMgr, sessionHandle, mTargetEndpointId);
 
     if (mCommissioningWindowOption != CommissioningWindowOption::kOriginalSetupCode)
     {
diff --git a/src/controller/CommissioningWindowOpener.h b/src/controller/CommissioningWindowOpener.h
index b657345ca53219..28a25d77f7a014 100644
--- a/src/controller/CommissioningWindowOpener.h
+++ b/src/controller/CommissioningWindowOpener.h
@@ -165,7 +165,8 @@ class CommissioningWindowOpener
     Callback::Callback<OnOpenBasicCommissioningWindow> * mBasicCommissioningWindowCallback           = nullptr;
     SetupPayload mSetupPayload;
     SetupDiscriminator mDiscriminator{};
-    NodeId mNodeId                                       = kUndefinedNodeId;
+    NodeId mNodeId               = kUndefinedNodeId;
+    EndpointId mTargetEndpointId = kRootEndpointId; // Default endpoint for Administrator Commissioning Cluster
     System::Clock::Seconds16 mCommissioningWindowTimeout = System::Clock::kZero;
     CommissioningWindowOption mCommissioningWindowOption = CommissioningWindowOption::kOriginalSetupCode;
     Crypto::Spake2pVerifier mVerifier; // Used for non-basic commissioning.
diff --git a/src/controller/CommissioningWindowParams.h b/src/controller/CommissioningWindowParams.h
index a4f0e43fa096c2..cd81f78a823d53 100644
--- a/src/controller/CommissioningWindowParams.h
+++ b/src/controller/CommissioningWindowParams.h
@@ -53,6 +53,14 @@ class CommissioningWindowCommonParams
         return static_cast<Derived &>(*this);
     }
 
+    bool HasEndpointId() const { return mEndpointId.HasValue(); }
+    EndpointId GetEndpointId() const { return mEndpointId.Value(); }
+    Derived & SetEndpointId(EndpointId endpointId)
+    {
+        mEndpointId = MakeOptional(endpointId);
+        return static_cast<Derived &>(*this);
+    }
+
     System::Clock::Seconds16 GetTimeout() const { return mTimeout; }
     // The duration for which the commissioning window should remain open.
     Derived & SetTimeout(System::Clock::Seconds16 timeout)
@@ -82,6 +90,7 @@ class CommissioningWindowCommonParams
 
 private:
     NodeId mNodeId                    = kUndefinedNodeId;
+    Optional<EndpointId> mEndpointId  = NullOptional;
     System::Clock::Seconds16 mTimeout = System::Clock::Seconds16(300); // Defaulting
     uint32_t mIteration               = 1000;                          // Defaulting
     Optional<uint16_t> mDiscriminator = NullOptional; // Using optional type to avoid picking a sentinnel in valid range