Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions descope/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def _fetch_public_keys(self) -> None:
# just continue to the next key
pass

def _generate_auth_info(self, response_body: dict, refresh_cookie: str) -> dict:
def _generate_auth_info(self, response_body: dict, refresh_token: str) -> dict:
jwt_response = {}
st_jwt = response_body.get("sessionJwt", "")
if st_jwt:
Expand All @@ -285,9 +285,9 @@ def _generate_auth_info(self, response_body: dict, refresh_cookie: str) -> dict:
rt_jwt, None
)

if refresh_cookie:
if refresh_token:
jwt_response[REFRESH_SESSION_TOKEN_NAME] = self._validate_and_load_tokens(
refresh_cookie, None
refresh_token, None
)

jwt_response[COOKIE_DATA_NAME] = {
Expand Down Expand Up @@ -327,12 +327,12 @@ def _get_default_headers(self, pswd: str = None):
headers["Authorization"] = f"Basic {base64.b64encode(bytes).decode('ascii')}"
return headers

def _refresh_token(self, refresh_token: str) -> dict:
def refresh_token(self, refresh_token: str) -> dict:
uri = Auth._compose_refresh_token_url()
response = self.do_get(uri, None, None, refresh_token)

resp = response.json()
auth_info = self._generate_auth_info(resp, None)
auth_info = self._generate_auth_info(resp, refresh_token)
return auth_info

def _validate_and_load_tokens(self, session_token: str, refresh_token: str) -> dict:
Expand Down Expand Up @@ -409,7 +409,7 @@ def _validate_and_load_tokens(self, session_token: str, refresh_token: str) -> d
)

# Refresh token is valid now refresh the session token
return self._refresh_token(refresh_token) # return jwt_response dict
return self.refresh_token(refresh_token) # return jwt_response dict

except Exception as e:
raise AuthException(500, ERROR_TYPE_INVALID_TOKEN, f"Invalid token: {e}")
Expand Down
2 changes: 1 addition & 1 deletion samples/otp_sample_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def main():

try:
logging.info("refreshing the session token..")
claims = descope_client._auth._refresh_token(refresh_token)
claims = descope_client._auth.refresh_token(refresh_token)
logging.info(
"going to revalidate the session with the newly refreshed token.."
)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def test_refresh_token(self):
mock_request.return_value.ok = False
self.assertRaises(
AuthException,
auth._refresh_token,
auth.refresh_token,
dummy_refresh_token,
)

Expand Down