Add token based authentication

.env.dist

@@ -101,10 +101,7 @@ [email protected]
 jira_test_mode_storage_path='../var/issues.json'
 
 # Jira settings
-JIRA_HOST='https://jira.example.com'
-# if TOKEN_BASED_AUTH set to true, ignore JIRA_USER and JIRA_PASS.
-TOKEN_BASED_AUTH=true
-PERSONAL_ACCESS_TOKEN='your-access-token-here'
+# The basic authetication settings are supplied via env.j2
 
 # Jira default issue settings
 jira_issue_priority=Medium

src/Surfnet/ServiceProviderDashboard/Infrastructure/DashboardBundle/Resources/config/services.yml

@@ -555,8 +555,7 @@ services:
   Surfnet\ServiceProviderDashboard\Infrastructure\Jira\Factory\JiraServiceFactory:
     arguments:
       - '%env(jira_host)%'
-      - '%env(jira_username)%'
-      - '%env(jira_password)%'
+      - '%env(jira_personal_access_token)%'
       - '@logger'
 
   Surfnet\ServiceProviderDashboard\Infrastructure\DashboardBundle\Form\Entity\AclListType:

src/Surfnet/ServiceProviderDashboard/Infrastructure/Jira/Factory/JiraServiceFactory.php

@@ -24,26 +24,22 @@
 
 class JiraServiceFactory
 {
-    /**
-     * @var ArrayConfiguration
-     */
-    private $config;
+    private ArrayConfiguration $config;
 
     public function __construct(
         string $host,
-        string $username,
-        string $password,
+        string $personalAccessToken,
         private readonly LoggerInterface $logger
     ) {
         // Create a IssueService with a Jira connection built in.
         $this->config = new ArrayConfiguration([
             'jiraHost' => $host,
-            'jiraUser' => $username,
-            'jiraPassword' => $password
+            'useTokenBasedAuth' => true,
+            'personalAccessToken' => $personalAccessToken,
         ]);
     }
 
-    public function buildIssueService()
+    public function buildIssueService(): IssueService
     {
         return new IssueService($this->config, $this->logger);
     }