Decouple OpCredCluster (project-chip#42918)

* Resolve merge conflicts

* Fix vaiables; fix tests

* Restyled by whitespace

* Restyled

* Restyled by clang-format

* Add dependencies

* Restyled by clang-format

* Fix rvalue

* Fix double initialization

* Test

* dereference pointer

* Restyled by clang-format

* Move dac provideer

* Restyled by whitespace

* Restyled by clang-format

* Fix context

* Resolve comments

* Test

* Restyled by whitespace

* Restyled by clang-format

* Restyled by clang-format

* Test PAC

* Test DAC

* Test DAC

* Test obj lifetime

* Test

* Fix test

* Remove std::move

* Test

* test

* Restyled by whitespace

* Test

* Resolve comments

* Test

* Restyled by whitespace

* Test

* Restyled by whitespace

* Test

* Restyled by whitespace

* Restyled by clang-format

* Test

* Restyled by clang-format

* Test

* Test

* Test

* Compilable version

* Restyled by whitespace

* Test

* Restyled by clang-format

* test

* Test

* Chnage ordering

* Resolve comments

* Fix Merge Conflict

* Restyled by clang-format

* Fix typo

* Remove  getters

* Restyled by clang-format

* Fix init order

* Fix Erased

* Restyled by whitespace

* Change ordering

* Change order

* Fix ordering

* Update src/app/clusters/operational-credentials-server/OperationalCredentialsCluster.cpp

---------

Co-authored-by: Restyled.io <commits@restyled.io>
Co-authored-by: Andrei Litvin <andy314@gmail.com>

Author: 3 people

examples/air-purifier-app/cc32xx/main/AppTask.cpp

@@ -161,14 +161,8 @@ int AppTask::Init()
             ;
     }
 
-    // Init ZCL Data Model and start server
-    PLAT_LOG("Initialize Server");
-    static chip::CommonCaseDeviceServerInitParams initParams;
-    (void) initParams.InitializeStaticResourcesBeforeServerInit();
-    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
-    TEMPORARY_RETURN_IGNORED chip::Server::GetInstance().Init(initParams);
-
-    // Initialize device attestation config
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
     PLAT_LOG("Initialize device attestation config");
 #ifdef CC32XX_ATTESTATION_CREDENTIALS
     SetDeviceAttestationCredentialsProvider(CC32XX::GetCC32XXDacProvider());
@@ -177,6 +171,13 @@ int AppTask::Init()
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 #endif
 
+    // Init ZCL Data Model and start server
+    PLAT_LOG("Initialize Server");
+    static chip::CommonCaseDeviceServerInitParams initParams;
+    (void) initParams.InitializeStaticResourcesBeforeServerInit();
+    initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
+    TEMPORARY_RETURN_IGNORED chip::Server::GetInstance().Init(initParams);
+
     // init air purifier stuff
     TEMPORARY_RETURN_IGNORED SetParentEndpointForEndpoint(AIR_QUALITY_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);
     TEMPORARY_RETURN_IGNORED SetParentEndpointForEndpoint(TEMPERATURE_SENSOR_ENDPOINT, AIR_PURIFIER_ENDPOINT);

examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp

@@ -127,6 +127,10 @@ void NetWorkCommissioningInstInit()
 
 static void InitServer(intptr_t context)
 {
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
@@ -139,8 +143,6 @@ static void InitServer(intptr_t context)
     gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     GetAppTask().InitOTARequestor();
 #endif

examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp

@@ -125,6 +125,10 @@ void NetWorkCommissioningInstInit()
 
 static void InitServer(intptr_t context)
 {
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
@@ -137,8 +141,6 @@ static void InitServer(intptr_t context)
     gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
     chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     GetAppTask().InitOTARequestor();
 #endif

examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.cpp

@@ -110,6 +110,12 @@ CHIP_ERROR RootNodeDevice::Register(EndpointId endpointId, CodeDrivenDataModelPr
                                               .sessionManager             = mContext.sessionManager,
                                               .dnssdServer                = mContext.dnssdServer,
                                               .commissioningWindowManager = mContext.commissioningWindowManager,
+                                              .dacProvider                = mContext.dacProvider,
+                                              .groupDataProvider          = mContext.groupDataProvider,
+                                              .accessControl              = mContext.accessControl,
+                                              .platformManager            = mContext.platformManager,
+                                              .eventManagement            = mContext.eventManagement,
+
                                           });
     ReturnErrorOnFailure(provider.AddCluster(mOperationalCredentialsCluster.Registration()));
 

examples/all-devices-app/all-devices-common/devices/root-node/RootNodeDevice.h

@@ -57,8 +57,9 @@ class RootNodeDevice : public SingleEndpointDevice
         DeviceLoadStatusProvider & deviceLoadStatusProvider;
         DeviceLayer::DiagnosticDataProvider & diagnosticDataProvider;
         TestEventTriggerDelegate * testEventTriggerDelegate;
+        Credentials::DeviceAttestationCredentialsProvider & dacProvider;
+        EventManagement & eventManagement;
         SafeAttributePersistenceProvider & safeAttributePersistenceProvider;
-
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
         TermsAndConditionsProvider & termsAndConditionsProvider;
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED

examples/all-devices-app/esp32/main/main.cpp

@@ -220,23 +220,24 @@ chip::app::DataModel::Provider * PopulateCodeDrivenDataModelProvider(PersistentS
 
     gRootNodeDevice = std::make_unique<WifiRootNodeDevice>(
         RootNodeDevice::Context {
-            .commissioningWindowManager           = Server::GetInstance().GetCommissioningWindowManager(), //
-                .configurationManager             = DeviceLayer::ConfigurationMgr(),                       //
-                .deviceControlServer              = DeviceLayer::DeviceControlServer::DeviceControlSvr(),  //
-                .fabricTable                      = Server::GetInstance().GetFabricTable(),                //
-                .accessControl                    = Server::GetInstance().GetAccessControl(),              //
-                .persistentStorage                = Server::GetInstance().GetPersistentStorage(),          //
-                .failSafeContext                  = Server::GetInstance().GetFailSafeContext(),            //
-                .deviceInstanceInfoProvider       = *provider,                                             //
-                .platformManager                  = DeviceLayer::PlatformMgr(),                            //
-                .groupDataProvider                = gGroupDataProvider,                                    //
-                .sessionManager                   = Server::GetInstance().GetSecureSessionManager(),       //
-                .dnssdServer                      = DnssdServer::Instance(),                               //
-                .deviceLoadStatusProvider         = *InteractionModelEngine::GetInstance(),                //
-                .diagnosticDataProvider           = DeviceLayer::GetDiagnosticDataProvider(),              //
-                .testEventTriggerDelegate         = testEventTriggerDelegate,                              //
-                .safeAttributePersistenceProvider = gSafeAttributePersistenceProvider,                     //
-
+            .commissioningWindowManager           = Server::GetInstance().GetCommissioningWindowManager(),  //
+                .configurationManager             = DeviceLayer::ConfigurationMgr(),                        //
+                .deviceControlServer              = DeviceLayer::DeviceControlServer::DeviceControlSvr(),   //
+                .fabricTable                      = Server::GetInstance().GetFabricTable(),                 //
+                .accessControl                    = Server::GetInstance().GetAccessControl(),               //
+                .persistentStorage                = Server::GetInstance().GetPersistentStorage(),           //
+                .failSafeContext                  = Server::GetInstance().GetFailSafeContext(),             //
+                .deviceInstanceInfoProvider       = *provider,                                              //
+                .platformManager                  = DeviceLayer::PlatformMgr(),                             //
+                .groupDataProvider                = gGroupDataProvider,                                     //
+                .sessionManager                   = Server::GetInstance().GetSecureSessionManager(),        //
+                .dnssdServer                      = DnssdServer::Instance(),                                //
+                .deviceLoadStatusProvider         = *InteractionModelEngine::GetInstance(),                 //
+                .diagnosticDataProvider           = DeviceLayer::GetDiagnosticDataProvider(),               //
+                .testEventTriggerDelegate         = testEventTriggerDelegate,                               //
+                .dacProvider                      = Credentials::GetDeviceAttestationCredentialsProvider(), //
+                .eventManagement                  = EventManagement::GetInstance(),                         //
+                .safeAttributePersistenceProvider = gSafeAttributePersistenceProvider,                      //
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
                 .termsAndConditionsProvider = TermsAndConditionsManager::GetInstance(),
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED

examples/all-devices-app/posix/main.cpp

@@ -96,6 +96,8 @@ class CodeDrivenDataModelDevices
         DeviceLoadStatusProvider & deviceLoadStatusProvider;
         DeviceLayer::DiagnosticDataProvider & diagnosticDataProvider;
         TestEventTriggerDelegate * testEventTriggerDelegate;
+        Credentials::DeviceAttestationCredentialsProvider & dacProvider;
+        EventManagement & eventManagement;
         SafeAttributePersistenceProvider & safeAttributePersistenceProvider;
 
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
@@ -122,8 +124,9 @@ class CodeDrivenDataModelDevices
                     .deviceLoadStatusProvider         = mContext.deviceLoadStatusProvider,         //
                     .diagnosticDataProvider           = mContext.diagnosticDataProvider,           //
                     .testEventTriggerDelegate         = mContext.testEventTriggerDelegate,         //
+                    .dacProvider                      = mContext.dacProvider,                      //
+                    .eventManagement                  = mContext.eventManagement,                  //
                     .safeAttributePersistenceProvider = mContext.safeAttributePersistenceProvider, //
-
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
                     .termsAndConditionsProvider = mContext.termsAndConditionsProvider,
 #endif // CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
@@ -193,32 +196,38 @@ void RunApplication(AppMainLoopImplementation * mainLoop = nullptr)
     DeviceLayer::DeviceInstanceInfoProvider * provider = DeviceLayer::GetDeviceInstanceInfoProvider();
     if (provider == nullptr)
     {
-        ChipLogError(AppServer, "Failed to get the DeviceInstanceInfoProvifer.");
+        ChipLogError(AppServer, "Failed to get the DeviceInstanceInfoProvider.");
         chipDie();
     }
 
     // Initialize the safe attribute persistence provider
     SuccessOrDie(gSafeAttributePersistenceProvider.Init(initParams.persistentStorageDelegate));
     SetSafeAttributePersistenceProvider(&gSafeAttributePersistenceProvider);
 
+    // Set the global DAC provider before server/cluster init so any integration path that
+    // snapshots the provider during construction sees a valid implementation.
+    SetDeviceAttestationCredentialsProvider(Credentials::Examples::GetExampleDACProvider());
+
     static CodeDrivenDataModelDevices devices({
-        .storageDelegate                      = *initParams.persistentStorageDelegate,                 //
-            .commissioningWindowManager       = Server::GetInstance().GetCommissioningWindowManager(), //
-            .configurationManager             = DeviceLayer::ConfigurationMgr(),                       //
-            .deviceControlServer              = DeviceLayer::DeviceControlServer::DeviceControlSvr(),  //
-            .fabricTable                      = Server::GetInstance().GetFabricTable(),                //
-            .accessControl                    = Server::GetInstance().GetAccessControl(),              //
-            .persistentStorage                = Server::GetInstance().GetPersistentStorage(),          //
-            .failSafeContext                  = Server::GetInstance().GetFailSafeContext(),            //
-            .deviceInstanceInfoProvider       = *provider,                                             //
-            .platformManager                  = DeviceLayer::PlatformMgr(),                            //
-            .groupDataProvider                = gGroupDataProvider,                                    //
-            .sessionManager                   = Server::GetInstance().GetSecureSessionManager(),       //
-            .dnssdServer                      = DnssdServer::Instance(),                               //
-            .deviceLoadStatusProvider         = *InteractionModelEngine::GetInstance(),                //
-            .diagnosticDataProvider           = DeviceLayer::GetDiagnosticDataProvider(),              //
-            .testEventTriggerDelegate         = initParams.testEventTriggerDelegate,                   //
-            .safeAttributePersistenceProvider = gSafeAttributePersistenceProvider,                     //
+        .storageDelegate                      = *initParams.persistentStorageDelegate,                   //
+            .commissioningWindowManager       = Server::GetInstance().GetCommissioningWindowManager(),   //
+            .configurationManager             = DeviceLayer::ConfigurationMgr(),                         //
+            .deviceControlServer              = DeviceLayer::DeviceControlServer::DeviceControlSvr(),    //
+            .fabricTable                      = Server::GetInstance().GetFabricTable(),                  //
+            .accessControl                    = Server::GetInstance().GetAccessControl(),                //
+            .persistentStorage                = Server::GetInstance().GetPersistentStorage(),            //
+            .failSafeContext                  = Server::GetInstance().GetFailSafeContext(),              //
+            .deviceInstanceInfoProvider       = *provider,                                               //
+            .platformManager                  = DeviceLayer::PlatformMgr(),                              //
+            .groupDataProvider                = gGroupDataProvider,                                      //
+            .sessionManager                   = Server::GetInstance().GetSecureSessionManager(),         //
+            .dnssdServer                      = DnssdServer::Instance(),                                 //
+            .deviceLoadStatusProvider         = *InteractionModelEngine::GetInstance(),                  //
+            .diagnosticDataProvider           = DeviceLayer::GetDiagnosticDataProvider(),                //
+            .testEventTriggerDelegate         = initParams.testEventTriggerDelegate,                     //
+            .dacProvider                      = *Credentials::GetDeviceAttestationCredentialsProvider(), //
+            .eventManagement                  = EventManagement::GetInstance(),                          //
+            .safeAttributePersistenceProvider = gSafeAttributePersistenceProvider,                       //
 
 #if CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED
             .termsAndConditionsProvider = TermsAndConditionsManager::GetInstance(),
@@ -267,8 +276,6 @@ void RunApplication(AppMainLoopImplementation * mainLoop = nullptr)
     SuccessOrDie(chip::DeviceLayer::GetDeviceInstanceInfoProvider()->GetProductId(payload.productID));
     PrintOnboardingCodes(payload);
 
-    SetDeviceAttestationCredentialsProvider(Credentials::Examples::GetExampleDACProvider());
-
     chip::app::SetTerminateHandler(StopSignalHandler);
 
     // This message is used as a marker for when the application process has started.

examples/light-switch-app/genio/src/AppTask.cpp

@@ -122,15 +122,16 @@ CHIP_ERROR AppTask::Init()
     sWiFiNetworkCommissioningInstance.Init();
 #endif
 
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-
     // Create FreeRTOS sw timer for Function Selection.
     sFunctionTimer = xTimerCreate("FnTmr",          // Just a text name, not used by the RTOS kernel
                                   1,                // == default timer period (mS)

examples/lighting-app/beken/main/chipinterface.cpp

@@ -187,8 +187,10 @@ extern "C" void _init(void)
 
 static void InitServer(intptr_t context)
 {
-    BekenAppServer::Init();
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+    BekenAppServer::Init();
     OTAHelpers::Instance().InitOTARequestor();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 }

examples/lighting-app/genio/src/AppTask.cpp

@@ -323,15 +323,16 @@ CHIP_ERROR AppTask::Init()
     sWiFiNetworkCommissioningInstance.Init();
 #endif
 
+    // Initialize device attestation config before server init so Operational
+    // Credentials sees the configured provider during cluster construction.
+    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
+
     // Init ZCL Data Model and start server
     static chip::CommonCaseDeviceServerInitParams initParams;
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     initParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     chip::Server::GetInstance().Init(initParams);
 
-    // Initialize device attestation config
-    SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
-
     // Create FreeRTOS sw timer for Function Selection.
     sFunctionTimer = xTimerCreate("FnTmr",          // Just a text name, not used by the RTOS kernel
                                   1,                // == default timer period (mS)