Edits

gsteve88 · gsteve88 · commit efd734e91084 · 2024-12-16T16:51:15.000-08:00
diff --git a/includes/iot-hub-howto-auth-device-cert-dotnet.md b/includes/iot-hub-howto-auth-device-cert-dotnet.md
@@ -16,12 +16,26 @@ To connect a device to IoT Hub using an X.509 certificate:
 
 1. Use [DeviceAuthenticationWithX509Certificate](/dotnet/api/microsoft.azure.devices.client.deviceauthenticationwithx509certificate) to create an object that contains device and certificate information. `DeviceAuthenticationWithX509Certificate` is passed as the second parameter to `DeviceClient.Create` (step 2).
 
-1. Use [DeviceClient.Create](/dotnet/api/microsoft.azure.devices.client.deviceclient.create?view=azure-dotnet&branch=main#microsoft-azure-devices-client-deviceclient-create(system-string-microsoft-azure-devices-client-iauthenticationmethod-microsoft-azure-devices-client-transporttype)) to connect the device to IoT Hub using an X.509 certificate.
+1. Use [DeviceClient.Create](/dotnet/api/microsoft.azure.devices.client.deviceclient.create?view=azure-dotnet&#microsoft-azure-devices-client-deviceclient-create(system-string-microsoft-azure-devices-client-iauthenticationmethod-microsoft-azure-devices-client-transporttype)) to connect the device to IoT Hub using an X.509 certificate.
 
-In this example, the device and certificate information has been populated in the `auth` `DeviceAuthenticationWithX509Certificate` object that is passed to `DeviceClient.Create`. An example of `DeviceAuthenticationWithX509Certificate` information population is omitted because of the flexible nature of how the certificate information can be added.
+In this example, the device and certificate information are populated in the `auth` `DeviceAuthenticationWithX509Certificate` object that is passed to `DeviceClient.Create`.
 
 ```csharp
+RootCertPath = "~/certificates/certs/sensor-thl-001-device.cert.pem";
+Intermediate1CertPath = "~/certificates/certs/sensor-thl-001-device.intermediate1.cert.pem";
+Intermediate2CertPath = "~/certificates/certs/sensor-thl-001-device.intermediate2.cert.pem";
+DevicePfxPath = "~/certificates/certs/sensor-thl-001-device.cert.pfx";
+DevicePfxPassword = "1234";
+DeviceName = "MyDevice";
 HostName = "xxxxx.azure-devices.net";
+
+var chainCerts = new X509Certificate2Collection();
+chainCerts.Add(new X509Certificate2(RootCertPath));
+chainCerts.Add(new X509Certificate2(Intermediate1CertPath));
+chainCerts.Add(new X509Certificate2(Intermediate2CertPath));
+using var deviceCert = new X509Certificate2(DevicePfxPath, DevicePfxPassword);
+using var auth = new DeviceAuthenticationWithX509Certificate(DeviceName, deviceCert, chainCerts);
+
 using var deviceClient = DeviceClient.Create(
     HostName,
     auth,
diff --git a/includes/iot-hub-howto-file-upload-dotnet.md b/includes/iot-hub-howto-file-upload-dotnet.md
@@ -120,21 +120,47 @@ You can create a backend service to receive file upload notification messages fr
 
 The [ServiceClient](/dotnet/api/microsoft.azure.devices.serviceclient) class contains methods that services can use to receive file upload notifications.
 
-To receive file upload notification:
+### Add service NuGet Package
 
-1. Call [CreateFromConnectionString](/dotnet/api/microsoft.azure.devices.serviceclient.createfromconnectionstring) to connect to IoT hub. Pass the IoT hub primary connection string.
-1. Create a [CancellationToken](/dotnet/api/azure.core.httpmessage.cancellationtoken?#azure-core-httpmessage-cancellationtoken).
-1. Call [GetFileNotificationReceiver](/dotnet/api/microsoft.azure.devices.serviceclient.getfilenotificationreceiver?#microsoft-azure-devices-serviceclient-getfilenotificationreceiver) to create a notification receiver.
-1. Use a loop with [ReceiveAsync](/dotnet/api/microsoft.azure.devices.receiver-1.receiveasync?#microsoft-azure-devices-receiver-1-receiveasync(system-threading-cancellationtoken)) to wait for the file upload notification.
+Backend service applications require the **Microsoft.Azure.Devices** NuGet package.
+
+### Connect to IoT hub
+
+You can connect a backend service to IoT Hub using the following methods:
+
+* Shared access policy
+* Microsoft Entra
+
+[!INCLUDE [iot-authentication-service-connection-string.md](iot-authentication-service-connection-string.md)]
+
+#### Connect using a shared access policy
+
+Connect a backend application to a device using [CreateFromConnectionString](/dotnet/api/microsoft.azure.devices.registrymanager.createfromconnectionstring). Your application needs **service connect** permission. Supply this shared access policy connection string as a parameter to `fromConnectionString`. For more information about shared access policies, see [Control access to IoT Hub with shared access signatures](/azure/iot-hub/authenticate-authorize-sas).
 
 For example:
 
 ```csharp
 using Microsoft.Azure.Devices;
 static ServiceClient serviceClient;
-static string connectionString = "{IoT hub connection string}";
+static string connectionString = "{Shared access policy connection string}";
 serviceClient = ServiceClient.CreateFromConnectionString(connectionString);
+```
+
+#### Connect using Microsoft Entra
 
+[!INCLUDE [iot-hub-howto-connect-service-iothub-entra-dotnet](iot-hub-howto-connect-service-iothub-entra-dotnet.md)]
+
+### Receive file upload notification
+
+To receive file upload notification:
+
+1. Create a [CancellationToken](/dotnet/api/azure.core.httpmessage.cancellationtoken?#azure-core-httpmessage-cancellationtoken).
+1. Call [GetFileNotificationReceiver](/dotnet/api/microsoft.azure.devices.serviceclient.getfilenotificationreceiver?#microsoft-azure-devices-serviceclient-getfilenotificationreceiver) to create a notification receiver.
+1. Use a loop with [ReceiveAsync](/dotnet/api/microsoft.azure.devices.receiver-1.receiveasync?#microsoft-azure-devices-receiver-1-receiveasync(system-threading-cancellationtoken)) to wait for the file upload notification.
+
+For example:
+
+```csharp
 // Define the cancellation token
 CancellationTokenSource source = new CancellationTokenSource();
 CancellationToken token = source.Token;
diff --git a/includes/iot-hub-howto-file-upload-java.md b/includes/iot-hub-howto-file-upload-java.md
@@ -123,18 +123,13 @@ Free the `client` resources.
 client.closeNow();
 ```
 
-## Receive a file upload notification in a backend application
+## Create a backend application
 
-You can create a backend application to receive file upload notifications.
-
-To create a file upload notification application:
-
-1. Connect to the IoT hub service client
-1. Check for a file upload notification
+This section describes how to receive a file upload notification in a backend application.
 
 The [ServiceClient](/java/api/com.azure.core.annotation.serviceclient) class contains methods that services can use to receive file upload notifications.
 
-### Connect to the IoT hub service client
+### Connect to the IoT Hub
 
 Create a `IotHubServiceClientProtocol` object. The connection uses the `AMQPS` protocol.
 
diff --git a/includes/iot-hub-howto-file-upload-node.md b/includes/iot-hub-howto-file-upload-node.md
@@ -13,12 +13,9 @@ ms.custom: mqtt, devx-track-js
 
 ## Overview
 
-This how-to contains two sections:
+This article describes how to use the [Azure IoT SDK for Node.js](https://github.com/Azure/azure-iot-sdk-node) to create a device app to upload a file and backend service application receive file upload notification.
 
-* Upload a file from a device application
-* Receive file upload notification in a backend application
-
-## Upload a file from a device application
+## Create a device application
 
 This section describes how to upload a file from a device to an IoT hub using the [azure-iot-device](/javascript/api/azure-iot-device) package in the Azure IoT SDK for Node.js.
 
@@ -32,7 +29,7 @@ npm install azure-iot-device azure-iot-device-mqtt @azure/storage-blob --save
 
 The [azure-iot-device](/javascript/api/azure-iot-device) package contains objects that interface with IoT devices.
 
-Follow this procedure for uploading a file from a device to IoT hub:
+Follow this procedure to upload a file from a device to IoT hub:
 
 1. Get Blob shared access signatures
 1. Upload the file to Azure Storage
@@ -43,15 +40,97 @@ Follow this procedure for uploading a file from a device to IoT hub:
 Create Client, Protocol, errors, and path modules using the installed packages.
 
 ```javascript
-const Client = require('azure-iot-device').Client;
 const Protocol = require('azure-iot-device-mqtt').Mqtt;
 const errors = require('azure-iot-common').errors;
 const path = require('path');
 ```
 
-### Get a SAS URI from IoT hub
+### Connect a device to IoT Hub
+
+A device app can authenticate with IoT Hub using the following methods:
+
+* X.509 certificate
+* Shared access key
+
+#### Authenticate using an X.509 certificate
+
+[!INCLUDE [iot-hub-howto-auth-device-cert-node](iot-hub-howto-auth-device-cert-node.md)]
+
+#### Authenticate using a shared access key
+
+##### Choose a transport protocol
+
+The `Client` object supports these protocols:
+
+* `Amqp`
+* `Http` - When using `Http`, the `Client` instance checks for messages from IoT Hub infrequently (a minimum of every 25 minutes).
+* `Mqtt`
+* `MqttWs`
+* `AmqpWs`
+
+Install needed transport protocols on your development machine.
+
+For example, this command installs the `Amqp` protocol:
+
+```cmd/sh
+npm install azure-iot-device-amqp --save
+```
+
+For more information about the differences between MQTT, AMQP, and HTTPS support, see [Cloud-to-device communications guidance](../articles/iot-hub/iot-hub-devguide-c2d-guidance.md) and [Choose a communication protocol](../articles/iot-hub/iot-hub-devguide-protocols.md).
+
+##### Create a client object
+
+Create a `Client` object using the installed package.
+
+For example:
+
+```javascript
+const Client = require('azure-iot-device').Client;
+```
+
+##### Create a protocol object
+
+Create a `Protocol` object using an installed transport package.
+
+This example assigns the AMQP protocol:
+
+```javascript
+const Protocol = require('azure-iot-device-amqp').Amqp;
+```
+
+##### Add the device connection string and transport protocol
+
+Call [fromConnectionString](/javascript/api/azure-iot-device/client?#azure-iot-device-client-fromconnectionstring) to supply device connection parameters:
+
+* **connStr** - The device connection string.
+* **transportCtor** - The transport protocol.
+
+This example uses the `Amqp` transport protocol:
+
+```javascript
+const deviceConnectionString = "{IoT hub device connection string}"
+const Protocol = require('azure-iot-device-mqtt').Amqp;
+let client = Client.fromConnectionString(deviceConnectionString, Protocol);
+```
+
+##### Open the connection to IoT Hub
 
-Use [getBlobSharedAccessSignature](/javascript/api/azure-iot-device/client?#azure-iot-device-client-getblobsharedaccesssignature) to get the linked storage account SAS token from IoT hub. As described in prerequisites, the IoT hub is linked to the Blob Storage.
+Use the [open](/javascript/api/azure-iot-device/client?#azure-iot-device-client-open) method to open connection between an IoT device and IoT Hub.
+
+For example:
+
+```javascript
+client.open(function(err) {
+  if (err) {
+    console.error('error connecting to hub: ' + err);
+    process.exit(1);
+  }
+})
+```
+
+#### Get a SAS URI from IoT hub
+
+Use [getBlobSharedAccessSignature](/javascript/api/azure-iot-device/client?#azure-iot-device-client-getblobsharedaccesssignature) to get the linked storage account SAS token from IoT hub.
 
 For example:
 
@@ -65,7 +144,7 @@ throw new errors.ArgumentError('Invalid upload parameters');
 }
 ```
 
-### Upload the file to IoT hub
+#### Upload the file to IoT hub
 
 To upload a file from a device to IoT hub:
 
@@ -125,6 +204,38 @@ console.log('uploadStreamToBlockBlob success');
 await client.notifyBlobUploadStatus(blobInfo.correlationId, isSuccess, statusCode, statusDescription);
 ```
 
+### Upload the local file to blob storage
+
+You can upload a local file to blob storage from a computer
+
+```javascript
+const deviceClient = Client.fromConnectionString(deviceConnectionString, Protocol);
+uploadToBlob(localFilePath, deviceClient)
+  .catch((err) => {
+    console.log(err);
+  })
+  .finally(() => {
+    process.exit();
+  });
+
+```
+
+#### SDK file upload sample
+
+The SDK includes an [upload to blob advanced](https://github.com/Azure/azure-iot-sdk-node/blob/main/device/samples/javascript/upload_to_blob_advanced.js) sample.
+
+## Create a backend application
+
+This section describes how to receive file upload notification in a backend application.
+
+### Install service SDK package
+
+Run this command to install **azure-iothub** on your development machine:
+
+```cmd/sh
+npm install azure-iothub --save
+```
+
 ## Receive file upload notification in a backend application
 
 You can create a backend application to check the IoT hub service client for device file upload notifications.
@@ -185,7 +296,3 @@ if (err) {
   });
 }
 ```
-
-### SDK file upload sample
-
-The SDK includes an [upload to blob advanced](https://github.com/Azure/azure-iot-sdk-node/blob/main/device/samples/javascript/upload_to_blob_advanced.js) sample.
diff --git a/includes/iot-hub-howto-file-upload-python.md b/includes/iot-hub-howto-file-upload-python.md
@@ -7,7 +7,7 @@ ms.author: kgremban
 ms.service: azure-iot-hub
 ms.devlang: python
 ms.topic: include
-ms.date: 07/01/2024
+ms.date: 12/12/2024
 ms.custom: mqtt, devx-track-python, py-fresh-zinc
 ---
 
