From 452bf87121eb5fcdf84d557aee4b452ce5121860 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Thu, 16 Apr 2015 10:24:35 +1000 Subject: [PATCH] Remove retry parameter Remove the retry parameter from the validate function because - as mentioned in the doc string - it is no longer relevant. Change-Id: I08eb096435d5501e00d8b11f8fcd43a06221d56d --- keystonemiddleware/auth_token/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py index ffd29493..131aa735 100644 --- a/keystonemiddleware/auth_token/__init__.py +++ b/keystonemiddleware/auth_token/__init__.py @@ -735,12 +735,11 @@ class AuthProtocol(object): start_response('401 Unauthorized', resp.headers) return resp.body - def _validate_token(self, token, env, retry=True): + def _validate_token(self, token, env): """Authenticate user token :param token: token id :param env: wsgi environment - :param retry: Ignored, as it is not longer relevant :returns: uncrypted body of the token if the token is valid :raises exc.InvalidToken: if token is rejected @@ -785,7 +784,7 @@ class AuthProtocol(object): expires = _get_token_expiration(data) _confirm_token_not_expired(expires) else: - data = self._identity_server.verify_token(token, retry) + data = self._identity_server.verify_token(token) # No need to confirm token expiration here since # verify_token fails for expired tokens. expires = _get_token_expiration(data)