openstack/python-keystoneclient
Code Issues Proposed changes

Rename saml2_token_url to token_url

Browse Source 
For the consisteny a property returning authentication url
should be called token_url.
This patch renames ``saml2_token_url`` to ``token_url`` in the
contrib.auth.v3.saml2.Saml2UnscopedPlugin plugin.

Change-Id: I435a118bb31338a37a29eec68b8e9ce50d163675
This commit is contained in:
Marek Denis
2014-07-23 12:18:21 +02:00
parent c758a2fc50
commit 14716ed1f2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystoneclient/contrib/auth/v3/saml2.py
View File

@@ -176,7 +176,7 @@ class Saml2UnscopedToken(v3.AuthConstructor):
"%(sp_consumer_url)s and Identity Provider " "%(sp_consumer_url)s and Identity Provider "
"%(identity_provider)s %(idp_consumer_url)s are not equal") "%(identity_provider)s %(idp_consumer_url)s are not equal")
msg = msg % { msg = msg % {
'service_provider': self.saml2_token_url, 'service_provider': self.token_url,
'sp_consumer_url': sp_response_consumer_url, 'sp_consumer_url': sp_response_consumer_url,
'identity_provider': self.identity_provider, 'identity_provider': self.identity_provider,
'idp_consumer_url': idp_sp_response_consumer_url 'idp_consumer_url': idp_sp_response_consumer_url
@@ -207,7 +207,7 @@ class Saml2UnscopedToken(v3.AuthConstructor):
:type session: keystoneclient.session.Session :type session: keystoneclient.session.Session
""" """
sp_response = session.get(self.saml2_token_url, sp_response = session.get(self.token_url,
headers=self.ECP_SP_EMPTY_REQUEST_HEADERS, headers=self.ECP_SP_EMPTY_REQUEST_HEADERS,
authenticated=False) authenticated=False)
@@ -299,7 +299,7 @@ class Saml2UnscopedToken(v3.AuthConstructor):
self.authenticated_response = response self.authenticated_response = response
@property @property
def saml2_token_url(self): def token_url(self):
"""Return full URL where authorization data is sent.""" """Return full URL where authorization data is sent."""
values = { values = {
'host': self.auth_url.rstrip('/'), 'host': self.auth_url.rstrip('/'),