#254 Jira Cloud Support

.github/workflows/docs.yaml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-and-deploy:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

backend/.env.example

@@ -5,15 +5,11 @@ SERVER_URL=http://localhost:8080
 LOCALE=en
 
 
-#ClientId and ClientSecret are shown in the Atlassion Developer app settings
-JIRA_CLOUD_CLIENTID=0XeKG8gq0JWWAShLLUv6Y27Zh8B9pPt8
-JIRA_CLOUD_CLIENTSECRET=EJmAzc3yi1mXhlHEUx7kNDxa8VrbrH6NE79_839izauaWHGoBGnT9iRs90h9N1t9
+#Consumer key
+JIRA_CLOUD_CONSUMERKEY=OauthKey
 
-#URL for the authorization server from Jira Cloud
-JIRA_CLOUD_AUTHORIZE_URL=https://auth.atlassian.com/authorize?...
-
-#The estimation field is a customfield which is different for every Jira instance and must therefore be set manually
-JIRA_CLOUD_ESTIMATIONFIELD=customfield_10016
+#Private key
+JIRA_CLOUD_PRIVATEKEY=[key]
 
 
 #URL to the Jira Server instance
@@ -32,7 +28,6 @@ JIRA_SERVER_ESTIMATIONFIELD=customfield_estimation
 JIRA_SERVER_RANKNAME=RANK
 
 
-
 #The name of the organization in Azure
 AZURE_ORGANIZATION=organization
 

backend/src/main/java/io/diveni/backend/controller/ConfigController.java

@@ -3,8 +3,8 @@
 import io.diveni.backend.service.projectmanagementproviders.azuredevops.AzureDevOpsService;
 import io.diveni.backend.service.projectmanagementproviders.github.GithubService;
 import io.diveni.backend.service.projectmanagementproviders.gitlab.GitlabService;
-import io.diveni.backend.service.projectmanagementproviders.jiracloud.JiraCloudService;
-import io.diveni.backend.service.projectmanagementproviders.jiraserver.JiraServerService;
+import io.diveni.backend.service.projectmanagementproviders.jira.cloud.JiraCloudService;
+import io.diveni.backend.service.projectmanagementproviders.jira.server.JiraServerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -18,11 +18,11 @@
 @RequestMapping("/config")
 public class ConfigController {
 
-  @Autowired private JiraServerService jiraServerService;
+  private JiraServerService jiraServerService;
 
-  @Autowired private JiraCloudService jiraCloudService;
+  private JiraCloudService jiraCloudService;
 
-  @Autowired private AzureDevOpsService azureDevOpsService;
+  private AzureDevOpsService azureDevOpsService;
 
   @Autowired private GithubService githubService;
 
@@ -31,14 +31,13 @@ public class ConfigController {
   @Value("${LOCALE:en}")
   private String LOCALE;
 
-  @GetMapping("/issueTracker")
+  @GetMapping("/issue-tracker")
   public Map<String, String> getIssueTrackerConfig() {
     Map<String, String> issueTrackerConfig = new HashMap<>();
     issueTrackerConfig.put(
         "isJiraServerEnabled", Boolean.toString(jiraServerService.serviceEnabled()));
     issueTrackerConfig.put(
         "isJiraCloudEnabled", Boolean.toString(jiraCloudService.serviceEnabled()));
-    issueTrackerConfig.put("jiraCloudAuthorizeUrl", jiraCloudService.getJiraCloudAuthorizeUrl());
     issueTrackerConfig.put(
         "isAzureDevOpsEnabled", Boolean.toString(azureDevOpsService.serviceEnabled()));
     issueTrackerConfig.put("isGithubEnabled", Boolean.toString(githubService.serviceEnabled()));
@@ -52,4 +51,19 @@ public Map<String, String> getLocale() {
     localeConfig.put("locale", LOCALE);
     return localeConfig;
   }
+
+  @Autowired
+  public void setJiraServerService(JiraServerService jiraServerService) {
+    this.jiraServerService = jiraServerService;
+  }
+
+  @Autowired
+  public void setJiraCloudService(JiraCloudService jiraCloudService) {
+    this.jiraCloudService = jiraCloudService;
+  }
+
+  @Autowired
+  public void setAzureDevOpsService(AzureDevOpsService azureDevOpsService) {
+    this.azureDevOpsService = azureDevOpsService;
+  }
 }

backend/src/main/java/io/diveni/backend/controller/ErrorMessages.java

@@ -17,6 +17,9 @@ public class ErrorMessages {
 
   public static String wrongPasswordMessage = "no or wrong password given";
 
+  public static String failedToAuthorizeToJiraCloud =
+      "failed to authorize to JIRA Cloud! Make sure the application link is set up correctly!";
+
   public static String failedToRetrieveRequestTokenErrorMessage =
       "failed to retrieve request token";