Merge pull request #50 from blackducksoftware/mc_plugin_install_fixes

IALERT_3130: Fix broken headers in marketplace install

Author: ChomickiM

src/main/java/com/synopsys/integration/jira/common/rest/service/PluginManagerService.java

@@ -134,8 +134,14 @@ public String retrievePluginToken() throws IntegrationException {
         requestBuilder.addQueryParameter(QUERY_KEY_OS_AUTH_TYPE, QUERY_VALUE_OS_AUTH_TYPE);
         requestBuilder.method(HttpMethod.GET);
         requestBuilder.addHeader(ACCEPT_HEADER, MEDIA_TYPE_INSTALLED);
-        Map<String, String> response = jiraApiClient.getResponseHeaders(requestBuilder.build());
-        return response.get("upm-token");
+        JiraRequest request = requestBuilder.build();
+        Map<String, String> response = jiraApiClient.getResponseHeaders(request);
+        // Jira Cloud had a breaking change in its public API where the "upm-token" was renamed for their credential client
+        //  This change will support the new header name but keep the functionality of the old headers which are still used
+        //  by the OAuth client and Jira Server.
+        Optional<String> pluginToken = Optional.ofNullable(response.get("upm-token"));
+        return pluginToken.or(() -> Optional.ofNullable(response.get("Upm-Token")))
+                   .orElseThrow(() -> new IntegrationException("Jira upm-token not found."));
     }
 
     private AvailableAppResponseModel getAvailableApp(String path, String appKey) throws IntegrationException {

src/test/java/com/synopsys/integration/jira/common/cloud/service/JiraCloudAppServiceTestIT.java

@@ -21,8 +21,8 @@
 import com.synopsys.integration.rest.RestConstants;
 import com.synopsys.integration.rest.exception.IntegrationRestException;
 
-public class JiraCloudAppServiceTestIT extends JiraCloudParameterizedTestIT {
-    private static final int WAIT_TIME = 1000;
+class JiraCloudAppServiceTestIT extends JiraCloudParameterizedTestIT {
+    private static final int WAIT_TIME = 10000;
     private static final String APP_KEY = "com.synopsys.integration.alert";
     private static final String APP_CLOUD_URI = "https://blackducksoftware.github.io/alert-issue-property-indexer/JiraCloudApp/1.0.0/atlassian-connect.json";
 
@@ -33,8 +33,7 @@ public void waitForUninstallToFinish() throws InterruptedException {
 
     @ParameterizedTest
     @MethodSource("getParameters")
-    @Disabled("This test is flaky as it occasionally takes too long to install and fails the test")
-    public void installMarketplaceAppTest(JiraHttpClient jiraHttpClient) throws Exception {
+    void installMarketplaceAppTest(JiraHttpClient jiraHttpClient) throws Exception {
         JiraCloudServiceTestUtility.validateConfiguration();
         JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
         PluginManagerService pluginManagerService = serviceFactory.createPluginManagerService();
@@ -49,7 +48,7 @@ public void installMarketplaceAppTest(JiraHttpClient jiraHttpClient) throws Exce
     @ParameterizedTest
     @MethodSource("getParameters")
     @Disabled("Disabled because development mode will likely not be turned on most of the time")
-    public void installCloudDevelopmentAppTest(JiraHttpClient jiraHttpClient) throws Exception {
+    void installCloudDevelopmentAppTest(JiraHttpClient jiraHttpClient) throws Exception {
         JiraCloudServiceTestUtility.validateConfiguration();
         JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
         PluginManagerService pluginManagerService = serviceFactory.createPluginManagerService();
@@ -63,8 +62,7 @@ public void installCloudDevelopmentAppTest(JiraHttpClient jiraHttpClient) throws
 
     @ParameterizedTest
     @MethodSource("getParameters")
-    @Disabled("This test is flaky as it occasionally takes too long to install and fails the test")
-    public void getInstalledAppsTest(JiraHttpClient jiraHttpClient) throws IntegrationException, InterruptedException {
+    void getInstalledAppsTest(JiraHttpClient jiraHttpClient) throws IntegrationException, InterruptedException {
         JiraCloudServiceTestUtility.validateConfiguration();
         JiraCloudServiceFactory serviceFactory = JiraCloudServiceTestUtility.createServiceFactory(jiraHttpClient);
         PluginManagerService pluginManagerService = serviceFactory.createPluginManagerService();

src/test/java/com/synopsys/integration/jira/common/rest/service/PluginManagerServiceServerTestIT.java

@@ -1,5 +1,7 @@
 package com.synopsys.integration.jira.common.rest.service;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -9,11 +11,11 @@
 import com.synopsys.integration.jira.common.server.JiraServerServiceTestUtility;
 import com.synopsys.integration.jira.common.server.service.JiraServerServiceFactory;
 
-public class PluginManagerServiceServerTestIT extends JiraServerParameterizedTestIT {
+class PluginManagerServiceServerTestIT extends JiraServerParameterizedTestIT {
 
     @ParameterizedTest
     @MethodSource("getParameters")
-    public void createIssueTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
+    void createIssueTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
         JiraServerServiceTestUtility.validateConfiguration();
 
         JiraServerServiceFactory serviceFactory = JiraServerServiceTestUtility.createServiceFactory(jiraHttpClient);
@@ -22,4 +24,16 @@ public void createIssueTest(JiraHttpClient jiraHttpClient) throws IntegrationExc
         boolean appInstalled = pluginManagerService.isAppInstalled("com.synopsys.integration.alert");
         System.out.println("App is installed " + appInstalled);
     }
+
+    @ParameterizedTest
+    @MethodSource("getParameters")
+    void retrievePluginTokenJiraServerCredentialClientTest(JiraHttpClient jiraHttpClient) throws IntegrationException {
+        JiraServerServiceTestUtility.validateConfiguration();
+
+        JiraServerServiceFactory serviceFactory = JiraServerServiceTestUtility.createServiceFactory(jiraHttpClient);
+        PluginManagerService pluginManagerService = serviceFactory.createPluginManagerService();
+
+        String pluginToken = pluginManagerService.retrievePluginToken();
+        assertNotNull(pluginToken);
+    }
 }