entrouvert
/
authentic-adeline
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed is federated with msp to not be a method

This commit is contained in:
Frédéric Péters 2008-12-15 16:33:32 +01:00
parent 614590aa0b
commit a73f3c0e32
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extra/modules/root.ptl
View File

@ -27,16 +27,15 @@ from authentic.root import LoginError, RegistrationError
import stores
def is_federated_with_msp(self):
if not self.lasso_proxy_dump:
def is_federated_with_msp(authentic_identity):
if not authentic_identity.lasso_proxy_dump:
return False
identity = lasso.Identity.newFromDump(self.lasso_proxy_dump)
identity = lasso.Identity.newFromDump(authentic_identity.lasso_proxy_dump)
msp_provider_id = get_cfg('adeline', {}).get('msp_idp')
for p in identity.providerIds:
if p == msp_provider_id:
return True
return False
identities.Identity.is_federated_with_msp = is_federated_with_msp
def get_key_from_provider_id(provider_id):
return provider_id.replace('://', '-').replace('/', '-')
@ -72,7 +71,7 @@ class AlternateRootDirectory(OldRootDirectory):
except KeyError:
get_session_manager().expire_session()
else:
if identity.is_federated_with_msp():
if is_federated_with_msp(identity):
federated_with_msp = 'plop' # any value will do
get_response().filter['federated_with_msp'] = federated_with_msp
get_response().filter['msp_session_image_url'] = get_cfg('adeline', {}).get(
@ -87,7 +86,7 @@ class AlternateRootDirectory(OldRootDirectory):
federated_with_msp = False
if get_session() and get_session().user:
identity = identities.get_store().get_identity(get_session().user)
if identity.is_federated_with_msp():
if is_federated_with_msp(identity):
federated_with_msp = True
for klp, lp in get_cfg('providers', {}).items():
if lp['role'] == lasso.PROVIDER_ROLE_IDP:
@ -144,7 +143,7 @@ class AlternateRootDirectory(OldRootDirectory):
'<legend>%s</legend>' % _('Our partners services')
'<ul>'
if identity.is_federated_with_msp():
if is_federated_with_msp(identity):
msp_provider_id = get_cfg('adeline', {}).get('msp_idp')
klp = get_key_from_provider_id(msp_provider_id)
terminate_url = '/liberty/sp/%s/proxy_terminate_confirm' % klp