From c70a3f2758731fcb1570c3f00986a3b79c687d43 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 23 Nov 2016 12:43:32 +0000 Subject: Make Ipsilon API plugin compatible with 1.2 and 2.0 Signed-off-by: Patrick Uiterwijk --- roles/ipsilon/files/api.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'roles/ipsilon/files/api.py') diff --git a/roles/ipsilon/files/api.py b/roles/ipsilon/files/api.py index f0ebb17ef..40c4ef718 100644 --- a/roles/ipsilon/files/api.py +++ b/roles/ipsilon/files/api.py @@ -2,6 +2,10 @@ 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 import ipsilon.root from ipsilon.util.page import Page @@ -83,7 +87,10 @@ class APIV1Page(Page): userdata = None try: _, 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: print 'Error during auth: %s' % ex pass -- cgit