Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2e1aee4

Browse files
evansimsevansims
authored
Merge branch 'master' into sdk-3173/fix-get_actions
2 parents a2c8201 + a0395a9 commit 2e1aee4

File tree

7 files changed

+66
-29
lines changed

7 files changed

+66
-29
lines changed

‎auth0/v3/authentication/base.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@ def __init__(self, status_code, content, headers):
7474
self._headers = headers
7575

7676
def content(self):
77-
if self._is_error():
78-
if self._status_code == 429:
79-
reset_at = int(self._headers.get('x-ratelimit-reset', '-1'))
80-
raise RateLimitError(error_code=self._error_code(),
81-
message=self._error_message(),
82-
reset_at=reset_at)
83-
84-
raise Auth0Error(status_code=self._status_code,
85-
error_code=self._error_code(),
86-
message=self._error_message())
87-
else:
77+
if not self._is_error():
8878
return self._content
8979

80+
if self._status_code == 429:
81+
reset_at = int(self._headers.get('x-ratelimit-reset', '-1'))
82+
raise RateLimitError(error_code=self._error_code(),
83+
message=self._error_message(),
84+
reset_at=reset_at)
85+
86+
raise Auth0Error(status_code=self._status_code,
87+
error_code=self._error_code(),
88+
message=self._error_message())
89+
9090
def _is_error(self):
9191
return self._status_code is None or self._status_code >= 400
9292

‎auth0/v3/authentication/token_verifier.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,9 @@ def verify(self, token, nonce=None, max_age=None, organization=None):
229229
organization (str, optional): The expected organization ID (org_id) claim value. This should be specified
230230
when logging in to an organization.
231231
232+
Returns:
233+
the decoded payload from the token
234+
232235
Raises:
233236
TokenValidationError: when the token cannot be decoded, the token signing algorithm is not the expected one,
234237
the token signature is invalid or the token has a claim missing or with unexpected value.
@@ -244,6 +247,8 @@ def verify(self, token, nonce=None, max_age=None, organization=None):
244247
# Verify claims
245248
self._verify_payload(payload, nonce, max_age, organization)
246249

250+
return payload
251+
247252
def _verify_payload(self, payload, nonce=None, max_age=None, organization=None):
248253
try:
249254
# on Python 2.7, 'str' keys as parsed as 'unicode'
@@ -266,11 +271,13 @@ def _verify_payload(self, payload, nonce=None, max_age=None, organization=None):
266271
raise TokenValidationError('Subject (sub) claim must be a string present in the ID token')
267272

268273
# Audience
269-
if 'aud' not in payload or not (isinstance(payload['aud'], (str, ustr)) or isinstance(payload['aud'], list)):
274+
if 'aud' not in payload or not isinstance(
275+
payload['aud'], (str, ustr, list)
276+
):
270277
raise TokenValidationError(
271278
'Audience (aud) claim must be a string or array of strings present in the ID token')
272279

273-
if isinstance(payload['aud'], list) and not self.aud in payload['aud']:
280+
if isinstance(payload['aud'], list) and self.aud not in payload['aud']:
274281
payload_audiences = ", ".join(payload['aud'])
275282
raise TokenValidationError(
276283
'Audience (aud) claim mismatch in the ID token; expected "{}" but was '

‎auth0/v3/management/organizations.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,7 @@ def all_organization_connections(self, id, page=None, per_page=None):
143143
144144
See: https://auth0.com/docs/api/management/v2#!/Organizations/get_enabled_connections
145145
"""
146-
params = {}
147-
params['page'] = page
148-
params['per_page'] = per_page
149-
146+
params = {'page': page, 'per_page': per_page}
150147
return self.client.get(self._url(id, 'enabled_connections'), params=params)
151148

152149
def get_organization_connection(self, id, connection_id):
@@ -282,10 +279,7 @@ def all_organization_member_roles(self, id, user_id, page=None, per_page=None):
282279
283280
See: https://auth0.com/docs/api/management/v2#!/Organizations/get_organization_member_roles
284281
"""
285-
params = {}
286-
params['page'] = page
287-
params['per_page'] = per_page
288-
282+
params = {'page': page, 'per_page': per_page}
289283
return self.client.get(self._url(id, 'members', user_id, 'roles'), params=params)
290284

291285
def create_organization_member_roles(self, id, user_id, body):
@@ -334,10 +328,7 @@ def all_organization_invitations(self, id, page=None, per_page=None):
334328
335329
See: https://auth0.com/docs/api/management/v2#!/Organizations/get_invitations
336330
"""
337-
params = {}
338-
params['page'] = page
339-
params['per_page'] = per_page
340-
331+
params = {'page': page, 'per_page': per_page}
341332
return self.client.get(self._url(id, 'invitations'), params=params)
342333

343334
def get_organization_invitation(self, id, invitaton_id):

‎auth0/v3/management/users.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,17 @@ def delete_multifactor(self, id, provider):
298298
url = self._url('{}/multifactor/{}'.format(id, provider))
299299
return self.client.delete(url)
300300

301+
def delete_authenticators(self, id):
302+
"""Delete a user's MFA enrollments.
303+
304+
Args:
305+
id (str): The user's id.
306+
307+
See: https://auth0.com/docs/api/management/v2#!/Users/delete_authenticators
308+
"""
309+
url = self._url('{}/authenticators'.format(id))
310+
return self.client.delete(url)
311+
301312
def unlink_user_account(self, id, provider, user_id):
302313
"""Unlink a user account
303314

‎auth0/v3/management/users_by_email.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ def __init__(self, domain, token, telemetry=True, timeout=5.0, protocol="https",
2929
self.client = RestClient(jwt=token, telemetry=telemetry, timeout=timeout, options=rest_options)
3030

3131
def _url(self):
32-
url = '{}://{}/api/v2/users-by-email'.format(self.protocol, self.domain)
33-
return url
32+
return '{}://{}/api/v2/users-by-email'.format(self.protocol, self.domain)
3433

3534
def search_users_by_email(self, email, fields=None, include_fields=True):
3635
"""List or search users.

‎auth0/v3/test/authentication/test_token_verifier.py

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ def test_passes_when_org_present_and_matches(self):
390390
audience=expectations['audience']
391391
)
392392
tv._clock = MOCKED_CLOCK
393-
tv.verify(token, organization='org_123')
393+
tv.verify(token, organization='org_123')
394394

395395
def test_fails_when_org_specified_but_not_present(self):
396396
token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhdXRoMHxzZGs0NThma3MiLCJhdWQiOiJ0b2tlbnMtdGVzdC0xMjMiLCJpc3MiOiJodHRwczovL3Rva2Vucy10ZXN0LmF1dGgwLmNvbS8iLCJleHAiOjE1ODc3NjUzNjEsImlhdCI6MTU4NzU5MjU2MX0.wotJnUdD5IfdZMewF_-BnHc0pI56uwzwr5qaSXvSu9w"
@@ -402,4 +402,22 @@ def test_fails_when_org_specified_but_not_(self):
402402

403403
def test_fails_when_org_specified_but_does_not_match(self):
404404
token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhdXRoMHxzZGs0NThma3MiLCJhdWQiOiJ0b2tlbnMtdGVzdC0xMjMiLCJvcmdfaWQiOiJvcmdfMTIzIiwiaXNzIjoiaHR0cHM6Ly90b2tlbnMtdGVzdC5hdXRoMC5jb20vIiwiZXhwIjoxNTg3NzY1MzYxLCJpYXQiOjE1ODc1OTI1NjF9.hjSPgJpg0Dn2z0giCdGqVLD5Kmqy_yMYlSkgwKD7ahQ"
405-
self.assert_fails_with_error(token, 'Organization (org_id) claim mismatch in the ID token; expected "org_abc", found "org_123"', signature_verifier=SymmetricSignatureVerifier(HMAC_SHARED_SECRET), organization='org_abc')
405+
self.assert_fails_with_error(token, 'Organization (org_id) claim mismatch in the ID token; expected "org_abc", found "org_123"', signature_verifier=SymmetricSignatureVerifier(HMAC_SHARED_SECRET), organization='org_abc')
406+
407+
def test_verify_returns_payload(self):
408+
token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhdXRoMHxzZGs0NThma3MiLCJhdWQiOiJ0b2tlbnMtdGVzdC0xMjMiLCJvcmdfaWQiOiJvcmdfMTIzIiwiaXNzIjoiaHR0cHM6Ly90b2tlbnMtdGVzdC5hdXRoMC5jb20vIiwiZXhwIjoxNTg3NzY1MzYxLCJpYXQiOjE1ODc1OTI1NjF9.hjSPgJpg0Dn2z0giCdGqVLD5Kmqy_yMYlSkgwKD7ahQ"
409+
sv = SymmetricSignatureVerifier(HMAC_SHARED_SECRET)
410+
tv = TokenVerifier(
411+
signature_verifier=sv,
412+
issuer=expectations['issuer'],
413+
audience=expectations['audience']
414+
)
415+
tv._clock = MOCKED_CLOCK
416+
response = tv.verify(token)
417+
self.assertIn('sub', response);
418+
self.assertIn('aud', response);
419+
self.assertIn('org_id', response);
420+
self.assertIn('iss', response);
421+
self.assertIn('exp', response);
422+
self.assertIn('iat', response);
423+
self.assertEqual('org_123', response['org_id'])

‎auth0/v3/test/management/test_users.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,17 @@ def test_delete_multifactor(self, mock_rc):
260260
'https://domain/api/v2/users/an-id/multifactor/provider'
261261
)
262262

263+
@mock.patch('auth0.v3.management.users.RestClient')
264+
def test_delete_authenticators(self, mock_rc):
265+
mock_instance = mock_rc.return_value
266+
267+
u = Users(domain='domain', token='jwttoken')
268+
u.delete_authenticators('an-id')
269+
270+
mock_instance.delete.assert_called_with(
271+
'https://domain/api/v2/users/an-id/authenticators'
272+
)
273+
263274
@mock.patch('auth0.v3.management.users.RestClient')
264275
def test_unlink_user_account(self, mock_rc):
265276
mock_instance = mock_rc.return_value

0 commit comments

Comments
 (0)