Skip to content

Commit ae5cae2

Browse files
committed
rename returnUrl to responseUrl
1 parent b266fd5 commit ae5cae2

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ This is the ``settings.json`` file:
306306
"url": "https://app.onelogin.com/trust/saml2/http-redirect/slo/<onelogin_connector_id>",
307307
// URL Location where the <Response> from the SP will returned (after IdP-initiated logout)
308308
// OPTIONAL: only specify if different from url parameter
309-
"returnUrl": "https://app.onelogin.com/trust/saml2/http-redirect/slo_return/<onelogin_connector_id>"
309+
"responseUrl": "https://app.onelogin.com/trust/saml2/http-redirect/slo_return/<onelogin_connector_id>"
310310
// SAML protocol binding to be used when returning the <Response>
311311
// message. OneLogin Toolkit supports the HTTP-Redirect binding
312312
// only for this endpoint.

src/onelogin/saml2/auth.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def process_slo(self, keep_local_session=False, request_id=None, delete_session_
190190
if security['logoutResponseSigned']:
191191
self.add_response_signature(parameters, security['signatureAlgorithm'])
192192

193-
return self.redirect_to(self.get_slo_return_url(), parameters)
193+
return self.redirect_to(self.get_slo_response_url(), parameters)
194194
else:
195195
self.__errors.append('invalid_binding')
196196
raise OneLogin_Saml2_Error(
@@ -468,15 +468,15 @@ def get_slo_url(self):
468468
if 'url' in idp_data['singleLogoutService']:
469469
return idp_data['singleLogoutService']['url']
470470

471-
def get_slo_return_url(self):
471+
def get_slo_response_url(self):
472472
"""
473473
Gets the SLO return URL for IdP-initiated logout.
474474
475475
:returns: an URL, the SLO return endpoint of the IdP
476476
:rtype: string
477477
"""
478478
slo_data = self.__settings.get_idp_data()['singleLogoutService']
479-
return slo_data.get('returnUrl', self.get_slo_url())
479+
return slo_data.get('responseUrl', self.get_slo_url())
480480

481481
def add_request_signature(self, request_data, sign_algorithm=OneLogin_Saml2_Constants.RSA_SHA1):
482482
"""

src/onelogin/saml2/logout_response.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def build(self, in_response_to):
162162

163163
uid = OneLogin_Saml2_Utils.generate_unique_id()
164164
issue_instant = OneLogin_Saml2_Utils.parse_time_to_SAML(OneLogin_Saml2_Utils.now())
165-
destination = idp_data['singleLogoutService'].get('returnUrl', idp_data['singleLogoutService']['url'])
165+
destination = idp_data['singleLogoutService'].get('responseUrl', idp_data['singleLogoutService']['url'])
166166

167167
logout_response = OneLogin_Saml2_Templates.LOGOUT_RESPONSE % \
168168
{

tests/src/OneLogin/saml2_tests/auth_test.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,20 @@ def testGetSLOurl(self):
8787
slo_url = settings_info['idp']['singleLogoutService']['url']
8888
self.assertEqual(auth.get_slo_url(), slo_url)
8989

90-
def testGetSLOReturnUrl(self):
90+
def testGetSLOresponseUrl(self):
9191
"""
92-
Tests the get_slo_return_url method of the OneLogin_Saml2_Auth class
92+
Tests the get_slo_response_url method of the OneLogin_Saml2_Auth class
9393
"""
9494
settings_info = self.loadSettingsJSON()
95-
settings_info['idp']['singleLogoutService']['returnUrl'] = "http://idp.example.com/SingleLogoutReturn.php"
95+
settings_info['idp']['singleLogoutService']['responseUrl'] = "http://idp.example.com/SingleLogoutReturn.php"
9696
auth = OneLogin_Saml2_Auth(self.get_request(), old_settings=settings_info)
97-
slo_url = settings_info['idp']['singleLogoutService']['returnUrl']
98-
self.assertEqual(auth.get_slo_return_url(), slo_url)
99-
# test that the function falls back to the url setting if returnUrl is not set
100-
settings_info['idp']['singleLogoutService'].pop('returnUrl')
97+
slo_url = settings_info['idp']['singleLogoutService']['responseUrl']
98+
self.assertEqual(auth.get_slo_response_url(), slo_url)
99+
# test that the function falls back to the url setting if responseUrl is not set
100+
settings_info['idp']['singleLogoutService'].pop('responseUrl')
101101
auth = OneLogin_Saml2_Auth(self.get_request(), old_settings=settings_info)
102102
slo_url = settings_info['idp']['singleLogoutService']['url']
103-
self.assertEqual(auth.get_slo_return_url(), slo_url)
103+
self.assertEqual(auth.get_slo_response_url(), slo_url)
104104

105105

106106
def testGetSessionIndex(self):

0 commit comments

Comments
 (0)