From 14716ed1f2b03aa9e49ab51a87b1a7ecf99abdb3 Mon Sep 17 00:00:00 2001 From: Marek Denis Date: Wed, 23 Jul 2014 12:18:21 +0200 Subject: [PATCH] Rename saml2_token_url to token_url 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 --- keystoneclient/contrib/auth/v3/saml2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keystoneclient/contrib/auth/v3/saml2.py b/keystoneclient/contrib/auth/v3/saml2.py index 947c1e78..74ec64f8 100644 --- a/keystoneclient/contrib/auth/v3/saml2.py +++ b/keystoneclient/contrib/auth/v3/saml2.py @@ -176,7 +176,7 @@ class Saml2UnscopedToken(v3.AuthConstructor): "%(sp_consumer_url)s and Identity Provider " "%(identity_provider)s %(idp_consumer_url)s are not equal") msg = msg % { - 'service_provider': self.saml2_token_url, + 'service_provider': self.token_url, 'sp_consumer_url': sp_response_consumer_url, 'identity_provider': self.identity_provider, 'idp_consumer_url': idp_sp_response_consumer_url @@ -207,7 +207,7 @@ class Saml2UnscopedToken(v3.AuthConstructor): :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, authenticated=False) @@ -299,7 +299,7 @@ class Saml2UnscopedToken(v3.AuthConstructor): self.authenticated_response = response @property - def saml2_token_url(self): + def token_url(self): """Return full URL where authorization data is sent.""" values = { 'host': self.auth_url.rstrip('/'),