Resolving potential nullpointer exceptions

Author: marcos-albornoz

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

@@ -64,6 +64,15 @@ 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/TppConnectorUtils.java

@@ -330,7 +330,7 @@ private static String[] retrieveUsernamesFromTPPContacts(String policyName, TppA
 		if (contactResponse != null && contactResponse.error() != null){
 			throw new ConnectorException.TppContactException(policyName, contactResponse.error());
 		}
-		if (contactResponse.values() != null) {
+		if (contactResponse != null && contactResponse.values() != null) {
 			Object[] contacts = contactResponse.values();
 			for (Object prefixedUniversal : contacts) {
 				try{

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

@@ -6,6 +6,7 @@
 import com.venafi.vcert.sdk.connectors.ConnectorException.FailedToRevokeTokenException;
 import com.venafi.vcert.sdk.connectors.ConnectorException.MissingAccessTokenException;
 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;
@@ -72,13 +73,17 @@ public void authorize(Authentication credentials) throws VCertException {
     }
 
     private boolean isEmptyTokens( Authentication credentials ){
-    	return isEmptyAccessToken(credentials) && isBlank(credentials.refreshToken());
+    	return isEmptyAccessToken(credentials) && isEmptyRefreshToken(credentials);
     }
 
     private boolean isEmptyAccessToken(Authentication credentials){
     	return credentials == null || isBlank(credentials.accessToken());
     }
 
+    private boolean isEmptyRefreshToken(Authentication credentials){
+    	return credentials == null || isBlank(credentials.refreshToken());
+    }
+    
     private void verifyAccessToken(Authentication credentials) throws VCertException {
     	if(!isBlank(credentials.accessToken())) {
 
@@ -121,31 +126,35 @@ public TokenInfo getTokenInfo() throws VCertException {
     @Override
     public TokenInfo getAccessToken(Authentication auth) throws VCertException {
 
-    	Authentication authTemp = null;
-    	
     	if (auth != null) {
 
-    		//creating a temp Authentication object based on the one passed as argument
-    		// in order to avoid to modify that original given it's needed that 
-    		// the Authentication object to be passed to the authenticate() method needs
-    		// that the accessToken and refreshToken doesn't set
-    		authTemp = Authentication.builder()
-    				.user(auth.user())
-    				.password(auth.password())
-    				.clientId(auth.clientId())
-    				.scope(auth.scope())
-    				.state(auth.state())
-    				.redirectUri(auth.redirectUri())
-    				.build();
-    	}
-    	
-        authenticate(authTemp);
-        
-        //setting the auth object as the credentials and setting into it the accessToken 
-        //and refreshToken hold by TokenInfo
-        setTokenCredentials(auth);
-        
-        return getTokenInfo();
+    		Authentication authTemp = null;
+
+    		if (auth != null) {
+
+    			//creating a temp Authentication object based on the one passed as argument
+    			// in order to avoid to modify that original given it's needed that 
+    			// the Authentication object to be passed to the authenticate() method needs
+    			// that the accessToken and refreshToken doesn't set
+    			authTemp = Authentication.builder()
+    					.user(auth.user())
+    					.password(auth.password())
+    					.clientId(auth.clientId())
+    					.scope(auth.scope())
+    					.state(auth.state())
+    					.redirectUri(auth.redirectUri())
+    					.build();
+    		}
+
+    		authenticate(authTemp);
+
+    		//setting the auth object as the credentials and setting into it the accessToken 
+    		//and refreshToken hold by TokenInfo
+    		setTokenCredentials(auth);
+
+    		return getTokenInfo();
+    	} else 
+    		throw new NullAuthenticationException();
     }
 
     @Override