Jira server log in not work with a Token

[sasirven]

Be informative
We are unable to log in through JIRA with a Token.

Bug description
Because the Username is mandatory and you only use basic auth in the jira connect method:

def connect_to_jira(jira_server, jira_username, jira_password):
    return JIRA(
        server=jira_server,
        basic_auth=(jira_username, jira_password),
        max_retries=0,
        options={
            "verify": settings.JIRA_SSL_VERIFY,
            "headers": settings.ADDITIONAL_HEADERS,
        })

We are unable to log in through Token.

Steps to reproduce
Steps to reproduce the behavior:

1. Go to 'Config / Jira'
2. Click on 'Add Jira Instance (Advanced)'
3. Fill in 'all the needed information (put TOKEN in the password field)'
4. Click on 'Submit'
5. See error

Expected behavior
The connection to JIRA should work.

Deployment method (select with an X)

• Docker Compose
• Kubernetes
• GoDojo

Environment information

• DefectDojo version: 2.40.3

Additional context (optional)
For me, I see two solutions:

1. Do not make the Username mandatory and if only the password is filled, use the token for JIRA connection instead of Basic auth.
2. Add a third field named Token and if it's filled, ignore the username and Basic auth and use Token auth.

How to connect to JIRA with token (with the second solution):

def connect_to_jira(jira_server, jira_username, jira_password, jira_token):
    if jira_token:
        return JIRA(
            server=jira_server,
            token_auth=jira_token,
            max_retries=0,
            options={
                "verify": settings.JIRA_SSL_VERIFY,
                "headers": settings.ADDITIONAL_HEADERS,
            })
    
    return JIRA(
        server=jira_server,
        basic_auth=(jira_username, jira_password),
        max_retries=0,
        options={
            "verify": settings.JIRA_SSL_VERIFY,
            "headers": settings.ADDITIONAL_HEADERS,
        })