Merge remote-tracking branch 'origin/master' into xamarin-fix-uwp-login

src/Services/Identity/Identity.API/Certificate/Certificate.cs

@@ -0,0 +1,42 @@
+// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
+
+using System.IO;
+using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
+
+namespace Identity.API.Certificate
+{
+    static class Certificate
+    {
+        public static X509Certificate2 Get()
+        {
+            var assembly = typeof(Certificate).GetTypeInfo().Assembly;
+            var names = assembly.GetManifestResourceNames();
+
+            /***********************************************************************************************
+             *  Please note that here we are using a local certificate only for testing purposes. In a 
+             *  real environment the certificate should be created and stored in a secure way, which is out
+             *  of the scope of this project.
+             **********************************************************************************************/
+            using (var stream = assembly.GetManifestResourceStream("Identity.API.Certificate.idsrv3test.pfx"))
+            {
+                return new X509Certificate2(ReadStream(stream), "idsrv3test");
+            }
+        }
+
+        private static byte[] ReadStream(Stream input)
+        {
+            byte[] buffer = new byte[16 * 1024];
+            using (MemoryStream ms = new MemoryStream())
+            {
+                int read;
+                while ((read = input.Read(buffer, 0, buffer.Length)) > 0)
+                {
+                    ms.Write(buffer, 0, read);
+                }
+                return ms.ToArray();
+            }
+        }
+    }
+}

src/Services/Identity/Identity.API/Identity.API.csproj

@@ -12,7 +12,7 @@
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
@@ -57,6 +57,10 @@
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0-msbuild3-final" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Certificate\idsrv3test.pfx" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" />
     <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.Data\Microsoft.Extensions.HealthChecks.Data.csproj" />

src/Services/Identity/Identity.API/Startup.cs

@@ -18,6 +18,7 @@ using System.Threading;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.HealthChecks;
+using Identity.API.Certificate;
 
 namespace eShopOnContainers.Identity
 {
@@ -75,7 +76,7 @@ namespace eShopOnContainers.Identity
 
             // Adds IdentityServer
             services.AddIdentityServer(x => x.IssuerUri = "null")
-                .AddTemporarySigningCredential()
+                .AddSigningCredential(Certificate.Get())
                 .AddInMemoryScopes(Config.GetScopes())
                 .AddInMemoryClients(Config.GetClients(clientUrls))
                 .AddAspNetIdentity<ApplicationUser>()