Feature: Add 'https://' before dps service endpoint (#471)

* add https * fix unit test Co-authored-by: crib <[email protected]>
CGI-FR · Mar 22, 2022 · 882c0b7 · 882c0b7
1 parent 80e727d
commit 882c0b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/AzureIoTHub.Portal.Server.Tests.Unit/Managers/DeviceProvisioningServiceManagerTests.cs b/src/AzureIoTHub.Portal.Server.Tests.Unit/Managers/DeviceProvisioningServiceManagerTests.cs
@@ -264,7 +264,7 @@ public async Task GetEnrollmentCredentialsAsyncShouldGetDPSAttestation(string mo
             // Assert
             Assert.IsNotNull(result);
             Assert.AreEqual("sn-007-888-abc-mac-a1-b2-c3-d4-e5-f6", result.RegistrationID);
-            Assert.AreEqual("FakeEndpoint", result.ProvisioningEndpoint);
+            Assert.AreEqual("https://FakeEndpoint", result.ProvisioningEndpoint);
             Assert.AreEqual("Jsm0lyGpjaVYVP2g3FnmnmG9dI/9qU24wNoykUmermc=", result.SymmetricKey);
             this.mockRepository.VerifyAll();
         }
@@ -316,7 +316,7 @@ public async Task WhenEnrollmentGoupsNotExistGetEnrollmentCredentialsAsyncShould
             // Assert
             Assert.IsNotNull(result);
             Assert.AreEqual("sn-007-888-abc-mac-a1-b2-c3-d4-e5-f6", result.RegistrationID);
-            Assert.AreEqual("FakeEndpoint", result.ProvisioningEndpoint);
+            Assert.AreEqual("https://FakeEndpoint", result.ProvisioningEndpoint);
             Assert.AreEqual("Jsm0lyGpjaVYVP2g3FnmnmG9dI/9qU24wNoykUmermc=", result.SymmetricKey);
 
             this.mockRepository.VerifyAll();

diff --git a/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/ConnectionStringDialog.razor b/src/AzureIoTHub.Portal/Client/Pages/Edge_Devices/ConnectionStringDialog.razor
@@ -22,7 +22,7 @@
                         <MudGrid>
                             <MudItem xs="12">
                                 <MudText Style="text-decoration:underline"><b>Service Endpoint</b></MudText>
-                                <MudTextField @bind-Value="@Credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ProvisioningEndpoint))" />
+                                <MudTextField @bind-Value="@Credentials.ProvisioningEndpoint" Class="mt-0" Variant="Variant.Text" Margin="Margin.Dense" ReadOnly="true"  Adornment="Adornment.End" AdornmentIcon="@Icons.Filled.ContentCopy" OnAdornmentClick="@(() => ClipboardService.WriteTextAsync(Credentials.ProvisioningEndpoint))"/>
                             </MudItem>
                             <MudItem Class="mt-0" xs="12">
                                 <MudText Style="text-decoration:underline"><b>Device Id</b></MudText>

diff --git a/src/AzureIoTHub.Portal/Server/Managers/DeviceProvisioningServiceManager.cs b/src/AzureIoTHub.Portal/Server/Managers/DeviceProvisioningServiceManager.cs
@@ -112,7 +112,7 @@ public async Task<EnrollmentCredentials> GetEnrollmentCredentialsAsync(string de
             {
                 SymmetricKey = symmetricKey,
                 RegistrationID = deviceId,
-                ProvisioningEndpoint = this.config.DPSEndpoint
+                ProvisioningEndpoint = $"https://{this.config.DPSEndpoint}"
             };
         }