Added support for Jira Personal Access Token

n0v1c3 · Jan 12, 2023 · 3c92639 · 3c92639
1 parent 9910673
commit 3c92639
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/python/Vira/vira_api.py b/python/Vira/vira_api.py
@@ -188,12 +188,13 @@ def connect(self, server):
  cert_verify = True
 
  # Get auth for current server
+ token = self.vira_servers[server].get('token')
  username = self.vira_servers[server].get('username')
  password_cmd = self.vira_servers[server].get('password_cmd')
  if password_cmd:
  password = run_command(password_cmd)['stdout'].strip().split('\n')[0]
  else:
- password = self.vira_servers[server]['password']
+ password = self.vira_servers[server].get('password')
  except:
  self.msg_server_fail()
  raise
@@ -205,15 +206,26 @@ def connect(self, server):
  vim.command('let g:vira_serv = "' + server + '"')
 
  # Authorize
- self.jira = JIRA(
- options={
- 'server': server,
- 'verify': cert_verify,
- },
- basic_auth=(username, password),
- timeout=2,
- async_=True,
- max_retries=2)
+ if token:
+ self.jira = JIRA(
+ options={
+ 'server': server,
+ 'verify': cert_verify,
+ },
+ token_auth=token,
+ timeout=2,
+ async_=True,
+ max_retries=2)
+ else:
+ self.jira = JIRA(
+ options={
+ 'server': server,
+ 'verify': cert_verify,
+ },
+ basic_auth=(username, password),
+ timeout=2,
+ async_=True,
+ max_retries=2)
 
  # Initial list updates
  self.users = self.get_users()