Merge pull request #103 from ITfoxtec/development

Certificates folder
ITfoxtec · Dec 3, 2024 · 3d33b35 · 3d33b35
2 parents be1ae7b + c2469ab
commit 3d33b35
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 21 deletions.
diff --git a/src/AspNetCoreApi1Sample/AspNetCoreApi1Sample.csproj b/src/AspNetCoreApi1Sample/AspNetCoreApi1Sample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.5</Version>
+		<Version>1.4.6</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -15,7 +15,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Update="CN=AspNetCoreApi1Sample, O=test corp.cer">
+		<None Update="Certificates\CN=AspNetCoreApi1Sample, O=test corp.cer">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>

diff --git a/.../CN=AspNetCoreApi1Sample, O=test corp.cer → .../CN=AspNetCoreApi1Sample, O=test corp.cer b/.../CN=AspNetCoreApi1Sample, O=test corp.cer → .../CN=AspNetCoreApi1Sample, O=test corp.cer
diff --git a/.../CN=AspNetCoreApi1Sample, O=test corp.pfx → .../CN=AspNetCoreApi1Sample, O=test corp.pfx b/.../CN=AspNetCoreApi1Sample, O=test corp.pfx → .../CN=AspNetCoreApi1Sample, O=test corp.pfx
diff --git a/src/AspNetCoreApi1Sample/Controllers/ValuesApi2Controller.cs b/src/AspNetCoreApi1Sample/Controllers/ValuesApi2Controller.cs
@@ -92,25 +92,26 @@ private async Task<string> GetTokenForApi2()
 
         private X509Certificate2 GetClientCertificate()
         {
-            try
+            if (!identitySettings.TokenExchangeClientCertificateThumbprint.IsNullOrEmpty())
             {
-                if (!identitySettings.TokenExchangeClientCertificateThumbprint.IsNullOrEmpty())
-                {
-                    return CertificateUtil.Load(StoreName.My, StoreLocation.CurrentUser, X509FindType.FindByThumbprint, identitySettings.TokenExchangeClientCertificateThumbprint);
-                }
-                else
-                {
-                    return CertificateUtil.Load(Path.Combine(Startup.AppEnvironment.ContentRootPath, identitySettings.TokenExchangeClientCertificateFile), identitySettings.TokenExchangeClientCertificatePassword);
-                }
+                return CertificateUtil.Load(StoreName.My, StoreLocation.CurrentUser, X509FindType.FindByThumbprint, identitySettings.TokenExchangeClientCertificateThumbprint);
             }
-            catch (Exception ex)
+            else
             {
-                foreach (var path in Directory.GetFiles(Startup.AppEnvironment.ContentRootPath))
+                var parth = Path.Combine(Startup.AppEnvironment.ContentRootPath, "Certificates");
+                try
+                {
+                    return CertificateUtil.Load(Path.Combine(parth, identitySettings.TokenExchangeClientCertificateFile), identitySettings.TokenExchangeClientCertificatePassword);
+                }
+                catch (Exception ex)
                 {
-                    Console.WriteLine(path); // full path
-                    Console.WriteLine(Path.GetFileName(path)); // file name
+                    foreach (var path in Directory.GetFiles(Startup.AppEnvironment.ContentRootPath))
+                    {
+                        Console.WriteLine(path); // full path
+                        Console.WriteLine(Path.GetFileName(path)); // file name
+                    }
+                    throw new Exception($"Load certificate '{identitySettings.TokenExchangeClientCertificateFile}' error, path '{parth}'.", ex);
                 }
-                throw new Exception($"Load certificate '{identitySettings.TokenExchangeClientCertificateFile}' error, path '{Startup.AppEnvironment.ContentRootPath}'.", ex);
             }
         }
     }

diff --git a/src/AspNetCoreApi1Sample/Dockerfile b/src/AspNetCoreApi1Sample/Dockerfile
@@ -20,5 +20,5 @@ RUN dotnet publish "AspNetCoreApi1Sample.csproj" -c $BUILD_CONFIGURATION -o /app
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-COPY "src/AspNetCoreApi1Sample/CN=AspNetCoreApi1Sample, O=test corp.pfx" .
+COPY "src/AspNetCoreApi1Sample/Certificates/." .
 ENTRYPOINT ["dotnet", "AspNetCoreApi1Sample.dll"]
diff --git a/src/AspNetCoreApi2Sample/AspNetCoreApi2Sample.csproj b/src/AspNetCoreApi2Sample/AspNetCoreApi2Sample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.5</Version>
+		<Version>1.4.6</Version>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

diff --git a/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/AspNetCoreOidcAuthCodeAllUpPartiesSample.csproj b/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/AspNetCoreOidcAuthCodeAllUpPartiesSample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.5</Version>
+		<Version>1.4.6</Version>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>

diff --git a/src/AspNetCoreSamlIdPSample/AspNetCoreSamlIdPSample.csproj b/src/AspNetCoreSamlIdPSample/AspNetCoreSamlIdPSample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.5</Version>
+		<Version>1.4.6</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/ExternalLoginApiSample/ExternalLoginApiSample.csproj b/src/ExternalLoginApiSample/ExternalLoginApiSample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.5</Version>
+		<Version>1.4.6</Version>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>