Skip to content

Commit 79cb4c4

Browse files
committed
add extension for certificate information
1 parent 6caae6e commit 79cb4c4

File tree

1 file changed

+28
-0
lines changed
  • src/ResourceManager/ApiManagement/Commands.ApiManagement/Helpers

1 file changed

+28
-0
lines changed

src/ResourceManager/ApiManagement/Commands.ApiManagement/Helpers/Extensions.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ public static HostnameConfiguration GetHostnameConfiguration(
5555
hostnameConfiguration.NegotiateClientCertificate = hostnameConfig.NegotiateClientCertificate.Value;
5656
}
5757

58+
// if no new certificate is provided, then copy over details of existing certificate
59+
if (hostnameConfig.CertificateInformation != null &&
60+
string.IsNullOrEmpty(hostnameConfig.EncodedCertificate))
61+
{
62+
hostnameConfiguration.Certificate = hostnameConfig.CertificateInformation.GetCertificateInformation();
63+
}
64+
5865
return hostnameConfiguration;
5966
}
6067

@@ -76,7 +83,28 @@ public static CertificateConfiguration GetCertificateConfiguration(this PsApiMan
7683
certificateConfiguration.CertificatePassword = systemCertificate.CertificatePassword;
7784
}
7885

86+
if (systemCertificate.CertificateInformation != null &&
87+
string.IsNullOrEmpty(systemCertificate.EncodedCertificate))
88+
{
89+
certificateConfiguration.Certificate = systemCertificate.CertificateInformation.GetCertificateInformation();
90+
}
91+
7992
return certificateConfiguration;
8093
}
94+
95+
public static CertificateInformation GetCertificateInformation(this PsApiManagementCertificateInformation psCertificateInformation)
96+
{
97+
if (psCertificateInformation == null)
98+
{
99+
return null;
100+
}
101+
102+
var certificateInformation = new CertificateInformation();
103+
certificateInformation.Expiry = psCertificateInformation.Expiry;
104+
certificateInformation.Thumbprint = psCertificateInformation.Thumbprint;
105+
certificateInformation.Subject = psCertificateInformation.Subject;
106+
107+
return certificateInformation;
108+
}
81109
}
82110
}

0 commit comments

Comments
 (0)