Make AsymetricKeyCredential, ClientSecret, ClientAssertion Constructors

private

Author: sgonzalezMSFT

src/main/java/com/microsoft/aad/msal4j/AsymmetricKeyCredential.java

@@ -29,7 +29,7 @@
  */
 public final class AsymmetricKeyCredential implements IClientCredential{
 
-    public final static int MIN_KEY_SIZE_IN_BITS = 2048;
+    private final static int MIN_KEY_SIZE_IN_BITS = 2048;
 
     /**
      * Returns private key of the credential.
@@ -93,23 +93,22 @@ else if("sun.security.mscapi.RSAPrivateKey".equals(key.getClass().getName())){
      * @throws CertificateEncodingException if an encoding error occurs
      * @throws NoSuchAlgorithmException if requested algorithm is not available in the environment
      */
-    public String getPublicCertificateHash()
+    public String publicCertificateHash()
             throws CertificateEncodingException, NoSuchAlgorithmException {
         return Base64.encodeBase64String(AsymmetricKeyCredential
                 .getHash(this.publicCertificate.getEncoded()));
     }
 
     /**
      * Base64 encoded public certificate.
-     * 
+     *
      * @return base64 encoded string
      * @throws CertificateEncodingException if an encoding error occurs
      */
     public String publicCertificate() throws CertificateEncodingException {
         return Base64.encodeBase64String(this.publicCertificate.getEncoded());
     }
 
-
     /**
      * Static method to create KeyCredential instance.
      *
@@ -126,7 +125,7 @@ public String publicCertificate() throws CertificateEncodingException {
      * @throws IOException {@link IOException}
      * @throws UnrecoverableKeyException {@link UnrecoverableKeyException}
      */
-    public static AsymmetricKeyCredential create(final InputStream pkcs12Certificate, final String password)
+    static AsymmetricKeyCredential create(final InputStream pkcs12Certificate, final String password)
             throws KeyStoreException, NoSuchProviderException,
             NoSuchAlgorithmException, CertificateException, IOException, UnrecoverableKeyException {
         final KeyStore keystore = KeyStore.getInstance("PKCS12", "SunJSSE");
@@ -149,7 +148,7 @@ public static AsymmetricKeyCredential create(final InputStream pkcs12Certificate
      *            Public certificate used for thumb print.
      * @return KeyCredential instance
      */
-    public static AsymmetricKeyCredential create(final PrivateKey key, final X509Certificate publicCertificate) {
+    static AsymmetricKeyCredential create(final PrivateKey key, final X509Certificate publicCertificate) {
         return new AsymmetricKeyCredential(key, publicCertificate);
     }
 

src/main/java/com/microsoft/aad/msal4j/ClientAssertion.java

@@ -15,7 +15,7 @@
 @Accessors(fluent = true)
 @Getter
 @EqualsAndHashCode
-final class ClientAssertion implements IClientCredential{
+public final class ClientAssertion implements IClientCredential{
 
     public static final String assertionType = JWTAuthentication.CLIENT_ASSERTION_TYPE;
     private final String assertion;

src/main/java/com/microsoft/aad/msal4j/ClientCredentialFactory.java

@@ -15,7 +15,7 @@
 public class ClientCredentialFactory {
 
     /**
-     *
+     * Static method to create a {@link ClientSecret} instance from a client secret
      * @param secret secret of application requesting a token
      * @return {@link ClientSecret}
      */
@@ -24,10 +24,10 @@ public static IClientCredential createFromSecret(String secret){
     }
 
     /**
-     *
+     * Static method to create a {@link AsymmetricKeyCredential} instance from a certificate
      * @param pkcs12Certificate InputStream containing PCKS12 formatted certificate
      * @param password certificate password
-     * @return {@link IClientCredential}
+     * @return {@link AsymmetricKeyCredential}
      * @throws CertificateException
      * @throws UnrecoverableKeyException
      * @throws NoSuchAlgorithmException
@@ -42,19 +42,19 @@ public static IClientCredential createFromCertificate(final InputStream pkcs12Ce
     }
 
     /**
-     *
+     * Static method to create a {@link AsymmetricKeyCredential} instance.
      * @param key  RSA private key to sign the assertion.
      * @param publicCertificate x509 public certificate used for thumbprint
-     * @return {@link IClientCredential}
+     * @return {@link AsymmetricKeyCredential}
      */
     public static IClientCredential createFromCertificate(final PrivateKey key, final X509Certificate publicCertificate) {
         return AsymmetricKeyCredential.create(key, publicCertificate);
     }
 
     /**
-     *
+     * Static method to create a {@link ClientAssertion} instance.
      * @param clientAssertion Jwt token encoded as a base64 URL encoded string
-     * @return {@link IClientCredential}
+     * @return {@link ClientAssertion}
      */
     public static IClientCredential createFromClientAssertion(String clientAssertion){
         return new ClientAssertion(clientAssertion);

src/main/java/com/microsoft/aad/msal4j/ClientSecret.java

@@ -25,7 +25,7 @@ public final class ClientSecret implements IClientCredential {
      * @param clientSecret
      *            Secret of the client requesting the token.
      */
-    public ClientSecret(final String clientSecret) {
+    ClientSecret(final String clientSecret) {
         if (StringHelper.isBlank(clientSecret)) {
             throw new IllegalArgumentException("clientSecret is null or empty");
         }

src/main/java/com/microsoft/aad/msal4j/JwtHelper.java

@@ -50,7 +50,7 @@ static ClientAssertion buildJwt(String clientId, final AsymmetricKeyCredential c
 
             JWSHeader.Builder builder = new Builder(JWSAlgorithm.RS256);
             builder.x509CertChain(certs);
-            builder.x509CertThumbprint(new Base64URL(credential.getPublicCertificateHash()));
+            builder.x509CertThumbprint(new Base64URL(credential.publicCertificateHash()));
 
             jwt = new SignedJWT(builder.build(), claimsSet);
             final RSASSASigner signer = new RSASSASigner(credential.key());