Logout users, when deleting APIManagerAdapter instance

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/adapter/APIManagerAdapter.java

@@ -54,6 +54,7 @@
 import com.axway.apim.lib.errorHandling.ErrorState;
 import com.axway.apim.lib.utils.TestIndicator;
 import com.axway.apim.lib.utils.rest.APIMHttpClient;
+import com.axway.apim.lib.utils.rest.DELRequest;
 import com.axway.apim.lib.utils.rest.GETRequest;
 import com.axway.apim.lib.utils.rest.POSTRequest;
 import com.axway.apim.lib.utils.rest.RestAPICall;
@@ -143,7 +144,11 @@ public static synchronized void deleteInstance() throws AppException {
 			APIManagerAdapter.cacheManager.close();
 			LOG.debug("Closing cache end");
 		}
-		APIManagerAdapter.instance = null;
+		if(APIManagerAdapter.instance!=null) {
+			APIManagerAdapter.instance.logoutFromAPIManager(false); // Logout potentially logged in OrgAdmin
+			APIManagerAdapter.instance.logoutFromAPIManager(true); // Logout potentially logged in Admin
+			APIManagerAdapter.instance = null;
+		}
 	}
 
 	private APIManagerAdapter() throws AppException {
@@ -232,6 +237,29 @@ public void loginToAPIManager(boolean useAdminClient) throws AppException {
 		}	
 	}
 
+	public void logoutFromAPIManager(boolean useAdminClient) throws AppException {
+		if(useAdminClient && !hasAdminAccount()) return;
+		URI uri;
+		HttpResponse httpResponse = null;
+		try {
+			uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/login").build();
+			DELRequest logoutRequest = new DELRequest(uri, useAdminClient);
+			httpResponse = logoutRequest.execute();
+			int statusCode = httpResponse.getStatusLine().getStatusCode();
+			if(statusCode != 204){
+				String response = EntityUtils.toString(httpResponse.getEntity());
+				LOG.warn("Logout failed with statusCode: " +statusCode+ ". Got response: '"+response+"'");
+			}
+		} catch (Exception e) {
+			throw new AppException("Can't logout from API-Manager", ErrorCode.API_MANAGER_COMMUNICATION, e);
+		} finally {
+			try {
+				if(httpResponse!=null) 
+					((CloseableHttpResponse)httpResponse).close();
+			} catch (Exception ignore) {}
+		}	
+	}
+	
 	private String[] getAdminUsernamePassword() throws AppException {
 		if(CommandParameters.getInstance().getAdminUsername()==null) return null;
 		String[] usernamePassword =  {CommandParameters.getInstance().getAdminUsername(), CommandParameters.getInstance().getAdminPassword()};