External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixing oauth token login and making module respect token over username/password

Browse Source
This commit is contained in:
John Westcott IV
2020-08-19 12:18:07 -04:00
parent a2eab45d61
commit 3abd77c4c0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx_collection/plugins/module_utils/tower_awxkit.py
View File

@@ -31,9 +31,12 @@ class TowerAWXKitModule(TowerModule):
def authenticate(self): def authenticate(self):
try: try:
self.connection.login(username=self.username, password=self.password, token=self.oauth_token) if self.oauth_token:
# If we have neither of these, then we can try un-authenticated access self.connection.login(None, None, token=self.oauth_token, auth_type='Bearer')
self.authenticated = True self.authenticated = True
elif self.username:
self.connection.login(username=self.username, password=self.password)
self.authenticated = True
except Exception: except Exception:
self.exit_json("Failed to authenticate") self.exit_json("Failed to authenticate")