Replacing the NullAuthenticationException by MissingCredentialsException

Author: marcos-albornoz

src/main/java/com/venafi/vcert/sdk/connectors/ConnectorException.java

@@ -64,15 +64,6 @@ public TppPingException(int status, String reason) {
 		}
 	}
 
-	public static class NullAuthenticationException extends ConnectorException {
-		
-		private static final long serialVersionUID = 1L;
-		
-		public NullAuthenticationException() {
-			super("Authentication object is null");
-		}
-	}
-	
 	public static class MissingCredentialsException extends ConnectorException {
 
 		private static final long serialVersionUID = 1L;

src/main/java/com/venafi/vcert/sdk/connectors/tpp/TppConnector.java

@@ -23,7 +23,6 @@
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.io.CharStreams;
 import com.venafi.vcert.sdk.VCertException;
 import com.venafi.vcert.sdk.certificate.CertificateRequest;
 import com.venafi.vcert.sdk.certificate.ChainOption;
@@ -47,6 +46,7 @@
 import com.venafi.vcert.sdk.connectors.ConnectorException.CertificateNotFoundByThumbprintException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.CertificatePendingException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.CouldNotParseRevokeReasonException;
+import com.venafi.vcert.sdk.connectors.ConnectorException.MissingCredentialsException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.MoreThanOneCertificateWithSameThumbprintException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.RenewFailureException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.RetrieveCertificateTimeoutException;
@@ -57,18 +57,7 @@
 import com.venafi.vcert.sdk.connectors.Policy;
 import com.venafi.vcert.sdk.connectors.ServerPolicy;
 import com.venafi.vcert.sdk.connectors.ZoneConfiguration;
-import com.venafi.vcert.sdk.connectors.tpp.Tpp.CertificateRenewalResponse;
-import com.venafi.vcert.sdk.connectors.tpp.Tpp.CertificateRequestResponse;
-import com.venafi.vcert.sdk.connectors.tpp.Tpp.CertificateRetrieveResponse;
-import com.venafi.vcert.sdk.connectors.tpp.Tpp.CertificateRevokeResponse;
-import com.venafi.vcert.sdk.connectors.tpp.Tpp.CertificateSearchResponse;
-import com.venafi.vcert.sdk.connectors.tpp.endpoint.*;
-import com.venafi.vcert.sdk.connectors.tpp.endpoint.ssh.TppSshCaTemplateRequest;
-import com.venafi.vcert.sdk.connectors.tpp.endpoint.ssh.TppSshCaTemplateResponse;
-import com.venafi.vcert.sdk.connectors.tpp.endpoint.ssh.TppSshCertRequest;
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.ssh.TppSshCertRequestResponse;
-import com.venafi.vcert.sdk.connectors.tpp.endpoint.ssh.TppSshCertRetrieveRequest;
-import com.venafi.vcert.sdk.connectors.tpp.endpoint.ssh.TppSshCertRetrieveResponse;
 import com.venafi.vcert.sdk.endpoint.Authentication;
 import com.venafi.vcert.sdk.endpoint.ConnectorType;
 import com.venafi.vcert.sdk.policy.api.domain.TPPPolicy;
@@ -143,7 +132,8 @@ public void ping() throws VCertException {
    * @throws VCertException if the call to {@link Tpp#authorize(AuthorizeRequest)} throws a {@link Unauthorized} or {@link BadRequest}
    */
   @Override
-  public void authorize(Authentication credentials) throws VCertException { 
+  public void authorize(Authentication credentials) throws VCertException {
+	  if (credentials != null) {
 	  try {
 		  AuthorizeResponse response = tpp.authorize(new AuthorizeRequest(credentials.user(), credentials.password()));
 		  apiKey = response.apiKey();
@@ -153,6 +143,9 @@ public void authorize(Authentication credentials) throws VCertException {
 	  }  catch(Unauthorized | BadRequest e){
 		  throw VCertException.fromFeignException(e);
 	  }
+	  } else {
+		  throw new MissingCredentialsException();
+	  }
   }
 
   /**

src/main/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnector.java

@@ -5,8 +5,8 @@
 import com.venafi.vcert.sdk.VCertException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.FailedToRevokeTokenException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.MissingAccessTokenException;
+import com.venafi.vcert.sdk.connectors.ConnectorException.MissingCredentialsException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.MissingRefreshTokenException;
-import com.venafi.vcert.sdk.connectors.ConnectorException.NullAuthenticationException;
 import com.venafi.vcert.sdk.connectors.TokenConnector;
 import com.venafi.vcert.sdk.endpoint.Authentication;
 import com.venafi.vcert.sdk.endpoint.ConnectorType;
@@ -64,11 +64,15 @@ public boolean isEmptyCredentials(Authentication credentials){
      */
     @Override
     public void authorize(Authentication credentials) throws VCertException {
-    	//If the AccessToken or RefreshToken were provided then only verify the accessToken is still valid
-    	if(!isEmptyTokens(credentials)) {
-    		verifyAccessToken(credentials);
-    	} else { // The user and password were provided so then generate an accessToken from them 
-    		authorizeToken(credentials);
+    	if(credentials != null) {
+    		//If the AccessToken or RefreshToken were provided then only verify the accessToken is still valid
+    		if(!isEmptyTokens(credentials)) {
+    			verifyAccessToken(credentials);
+    		} else { // The user and password were provided so then generate an accessToken from them 
+    			authorizeToken(credentials);
+    		}
+    	} else {
+    		throw new MissingCredentialsException();
     	}
     }
 
@@ -149,7 +153,7 @@ public TokenInfo getAccessToken(Authentication auth) throws VCertException {
 
     		return getTokenInfo();
     	} else 
-    		throw new NullAuthenticationException();
+    		throw new MissingCredentialsException();
     }
 
     @Override

src/test/java/com/venafi/vcert/sdk/VCertTknClientAuthenticationAT.java

@@ -13,7 +13,6 @@
 import org.junit.jupiter.api.Test;
 
 import com.venafi.vcert.sdk.connectors.ConnectorException.MissingCredentialsException;
-import com.venafi.vcert.sdk.connectors.ConnectorException.NullAuthenticationException;
 import com.venafi.vcert.sdk.connectors.tpp.TokenInfo;
 import com.venafi.vcert.sdk.endpoint.Authentication;
 import com.venafi.vcert.sdk.endpoint.ConnectorType;
@@ -220,7 +219,7 @@ void invalidAuthenticationMissingCredentialsInAccessToken() {
 		VCertTknClient client = getClientUnauthenticated();
 
 		//asserting that the credentials were not provided
-		assertThrows(NullAuthenticationException.class, () -> client.getAccessToken());
+		assertThrows(MissingCredentialsException.class, () -> client.getAccessToken());
 
 		//asserting that the credentials were not provided
 		assertThrows(MissingCredentialsException.class, () -> client.getAccessToken(getAuthenticationMissingAccessToken()));