From ac0f7620cf234f9e0823f6242cd303391bd10b4f Mon Sep 17 00:00:00 2001
From: Zhihui Xia <zhvxia@amazon.com>
Date: Wed, 27 Sep 2023 14:52:09 -0700
Subject: [PATCH] fix job sample, and add identity client demo

---
 identity/include/aws/iotidentity/IotIdentityClient.h | 2 ++
 identity/source/IotIdentityClient.cpp                | 7 +++++++
 jobs/include/aws/iotjobs/IotJobsClient.h             | 2 +-
 samples/jobs/describe_job_execution/main.cpp         | 3 ++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/identity/include/aws/iotidentity/IotIdentityClient.h b/identity/include/aws/iotidentity/IotIdentityClient.h
index b38594564..561bee397 100644
--- a/identity/include/aws/iotidentity/IotIdentityClient.h
+++ b/identity/include/aws/iotidentity/IotIdentityClient.h
@@ -11,6 +11,7 @@
 #include <aws/crt/StlAllocator.h>
 #include <aws/crt/Types.h>
 
+#include <aws/crt/mqtt/Mqtt5Client.h>
 #include <aws/crt/mqtt/MqttClient.h>
 
 namespace Aws
@@ -60,6 +61,7 @@ namespace Aws
         {
           public:
             IotIdentityClient(const std::shared_ptr<Aws::Crt::Mqtt::MqttConnection> &connection);
+            IotIdentityClient(const std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> &mqtt5client);
 
             operator bool() const noexcept;
             int GetLastError() const noexcept;
diff --git a/identity/source/IotIdentityClient.cpp b/identity/source/IotIdentityClient.cpp
index 524c5cd41..a1ff9bf34 100644
--- a/identity/source/IotIdentityClient.cpp
+++ b/identity/source/IotIdentityClient.cpp
@@ -26,6 +26,13 @@ namespace Aws
         {
         }
 
+
+        IotIdentityClient::IotIdentityClient(const std::shared_ptr<Aws::Crt::Mqtt5::Mqtt5Client> &mqtt5Client)
+        {
+            m_connection = Aws::Crt::Mqtt::MqttConnection::NewConnectionFromMqtt5Client(mqtt5Client);
+
+        }
+
         IotIdentityClient::operator bool() const noexcept { return m_connection && *m_connection; }
 
         int IotIdentityClient::GetLastError() const noexcept { return aws_last_error(); }
diff --git a/jobs/include/aws/iotjobs/IotJobsClient.h b/jobs/include/aws/iotjobs/IotJobsClient.h
index b229a2208..fb48a576d 100644
--- a/jobs/include/aws/iotjobs/IotJobsClient.h
+++ b/jobs/include/aws/iotjobs/IotJobsClient.h
@@ -11,8 +11,8 @@
 #include <aws/crt/StlAllocator.h>
 #include <aws/crt/Types.h>
 
-#include <aws/crt/mqtt/MqttClient.h>
 #include <aws/crt/mqtt/Mqtt5Client.h>
+#include <aws/crt/mqtt/MqttClient.h>
 
 namespace Aws
 {
diff --git a/samples/jobs/describe_job_execution/main.cpp b/samples/jobs/describe_job_execution/main.cpp
index 4e5cab7b5..eb89440f5 100644
--- a/samples/jobs/describe_job_execution/main.cpp
+++ b/samples/jobs/describe_job_execution/main.cpp
@@ -6,8 +6,9 @@
 #include <aws/crt/UUID.h>
 #include <aws/crt/io/HostResolver.h>
 
-#include <aws/iot/MqttClient.h>
+#include <aws/crt/mqtt/Mqtt5Client.h>
 #include <aws/iot/Mqtt5Client.h>
+#include <aws/iot/MqttClient.h>
 
 #include <aws/iotjobs/DescribeJobExecutionRequest.h>
 #include <aws/iotjobs/DescribeJobExecutionResponse.h>