Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Make Ipsilon API plugin compatible with 1.2 and 2.0

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2016-11-23 12:43:32 +00:00
parent c9c904f2bd
commit c70a3f2758
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
roles/ipsilon/files/api.py
View file

@ -2,6 +2,10 @@
from __future__ import absolute_import from __future__ import absolute_import
try:
from ipsilon.info.infofas import fas_make_userdata
except ImportError:
fas_make_userdata = None
from ipsilon.providers.openid.extensions.common import OpenidExtensionBase from ipsilon.providers.openid.extensions.common import OpenidExtensionBase
import ipsilon.root import ipsilon.root
from ipsilon.util.page import Page from ipsilon.util.page import Page
@ -83,7 +87,10 @@ class APIV1Page(Page):
userdata = None userdata = None
try: try:
_, user = fas.fpc.login(username, password) _, user = fas.fpc.login(username, password)
userdata = fas.page.make_userdata(user.user) if fas_make_userdata is None:
userdata = fas.page.make_userdata(user.user)
else:
userdata = fas_make_userdata(user.user)
except Exception, ex: except Exception, ex:
print 'Error during auth: %s' % ex print 'Error during auth: %s' % ex
pass pass