auth0 · adamjmcgrath · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ bin/
 *.egg
 .pypirc
 pyvenv.cfg
+.python-version
 
 # Installer logs
 pip-log.txt

diff --git a/EXAMPLES.md b/EXAMPLES.md
@@ -32,7 +32,7 @@ For symmetric algorithms like HS256, use the `SymmetricSignatureVerifier` class,
 The following example demonstrates the verification of an ID token signed with the RS256 signing algorithm:
 
 ```python
-from auth0.v3.authentication.token_verifier import TokenVerifier, AsymmetricSignatureVerifier
+from auth0.authentication import TokenVerifier, AsymmetricSignatureVerifier
 
 domain = 'myaccount.auth0.com'
 client_id = 'exampleid'
@@ -53,7 +53,7 @@ If the token verification fails, a `TokenValidationError` will be raised. In tha
 ### Authenticating with a application configured to use `private_key_jwt` token endpoint auth method
 
 ```python
-from auth0.v3.authentication import GetToken
+from auth0.authentication import GetToken
 
 private_key = """-----BEGIN RSA PRIVATE KEY-----
 MIIJKQIBAAKCAgEAwfUb0nUC0aKB3WiytFhnCIg455BYC+dR3MUGadWpIg7S6lbi
@@ -152,22 +152,22 @@ Then additional methods with the `_async` suffix will be added to modules create
 ```python
 import asyncio
 import aiohttp
-from auth0.v3.asyncify import asyncify
-from auth0.v3.management import Auth0, Users, Connections
-from auth0.v3.authentication import Users as AuthUsers
+from auth0.asyncify import asyncify
+from auth0.management import Auth0, Users, Connections
+from auth0.authentication import Users as AuthUsers
 
 auth0 = Auth0('domain', 'mgmt_api_token')
 
+
 async def main():
     # users = auth0.users.all() <= sync
-    users = await auth0.users.all_async() # <= async
+    users = await auth0.users.all_async()  # <= async
 
     # To share a session amongst multiple calls to the same service
     async with auth0.users as users:
         data = await users.get_async(id)
         users.update_async(id, data)
 
-
     # To share a session amongst multiple calls to multiple services
     async with Auth0('domain', 'mgmt_api_token') as auth0:
         user = await auth0.users.get_async(user_id)

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ The Authentication SDK is organized into components that mirror the structure of
 For example:
 
 ```python
-from auth0.v3.authentication import Social
+from auth0.authentication import Social
 
 social = Social('my-domain.us.auth0.com', 'my-client-id')
 
@@ -42,7 +42,7 @@ social.login(access_token='...', connection='facebook')
 If you need to sign up a user using their email and password, you can use the Database object.
 
 ```python
-from auth0.v3.authentication import Database
+from auth0.authentication import Database
 
 database = Database('my-domain.us.auth0.com', 'my-client-id')
 
@@ -52,7 +52,7 @@ database.signup(email='[email protected]', password='secr3t', connection='Username
 If you need to authenticate a user using their email and password, you can use the `GetToken` object, which enables making requests to the `/oauth/token` endpoint.
 
 ```python
-from auth0.v3.authentication import GetToken
+from auth0.authentication import GetToken
 
 token = GetToken('my-domain.us.auth0.com', 'my-client-id', client_secret='my-client-secret')
 
@@ -63,7 +63,7 @@ token.login(username='[email protected]', password='secr3t', realm='Username-Passw
 To use the management library you will need to instantiate an Auth0 object with a domain and a [Management API v2 token](https://auth0.com/docs/api/management/v2/tokens). Please note that these token last 24 hours, so if you need it constantly you should ask for it programmatically using the client credentials grant with a [non interactive client](https://auth0.com/docs/api/management/v2/tokens#1-create-and-authorize-a-client) authorized to access the API. For example:
 
 ```python
-from auth0.v3.authentication import GetToken
+from auth0.authentication import GetToken
 
 domain = 'myaccount.auth0.com'
 non_interactive_client_id = 'exampleid'
@@ -77,7 +77,7 @@ mgmt_api_token = token['access_token']
 Then use the token you've obtained as follows:
 
 ```python
-from auth0.v3.management import Auth0
+from auth0.management import Auth0
 
 domain = 'myaccount.auth0.com'
 mgmt_api_token = 'MGMT_API_TOKEN'

diff --git a/V4_MIGRATION_GUIDE.md b/V4_MIGRATION_GUIDE.md
@@ -3,6 +3,7 @@
 Guide to migrating from `3.x` to `4.x`
 
 - [Python <3.7 is no longer supported](#python-37-is-no-longer-supported)
+- [The `v3` subfolder has been removed](#the-v3-subfolder-has-been-removed)
 - [Client ID and client secret are now specified in the constructor for authentication clients](#client-id-and-client-secret-are-now-specified-in-the-constructor-for-authentication-clients)
 - [AuthorizeClient and Logout have been removed](#authorizeclient-and-logout-have-been-removed)
 - [Methods that call deprecated endpoints have been removed](#methods-that-call-deprecated-endpoints-have-been-removed)
@@ -11,12 +12,32 @@ Guide to migrating from `3.x` to `4.x`
 
 Python <=3.6 and Python 2 are EOL and are no longer supported. 
 
+## The `v3` subfolder has been removed
+
+Versioning the import paths was not necessary and made major upgrades unnecessarily complex, so this has been removed and all files have been moved up a directory.
+
+### Before
+
+```python
+from auth0.v3.management import Auth0
+
+auth0 = Auth0(domain, mgmt_api_token)
+```
+
+### After
+
+```python
+from auth0.management import Auth0
+
+auth0 = Auth0(domain, mgmt_api_token)
+```
+
 ## Client ID and client secret are now specified in the constructor for authentication clients
 
 ### Before
 
 ```py
-from auth0.v3.authentication import GetToken
+from auth0.authentication import GetToken
 
 get_token = GetToken('my-domain.us.auth0.com')
 
@@ -26,7 +47,7 @@ get_token.client_credentials('my-client-id', 'my-client-secret', 'my-api')
 ### After
 
 ```py
-from auth0.v3.authentication import GetToken
+from auth0.authentication import GetToken
 
 # `client_secret` is optional (you can now use `client_assertion_signing_key` as an alternative) 
 get_token = GetToken('my-domain.us.auth0.com', 'my-client-id', client_secret='my-client-secret')

diff --git a/auth0/__init__.py b/auth0/__init__.py
@@ -1 +1,5 @@
 __version__ = "3.24.0"
+
+from auth0.exceptions import Auth0Error, RateLimitError, TokenValidationError
+
+__all__ = ("Auth0Error", "RateLimitError", "TokenValidationError")
diff --git a/auth0/v3/asyncify.py → auth0/asyncify.py b/auth0/v3/asyncify.py → auth0/asyncify.py
@@ -1,6 +1,6 @@
 import aiohttp
 
-from auth0.v3.rest_async import AsyncRestClient
+from auth0.rest_async import AsyncRestClient
 
 
 def _gen_async(client, method):

diff --git a/auth0/v3/authentication/__init__.py → auth0/authentication/__init__.py b/auth0/v3/authentication/__init__.py → auth0/authentication/__init__.py
diff --git a/...v3/authentication/async_token_verifier.py → auth0/authentication/async_token_verifier.py b/...v3/authentication/async_token_verifier.py → auth0/authentication/async_token_verifier.py
diff --git a/auth0/v3/authentication/base.py → auth0/authentication/base.py b/auth0/v3/authentication/base.py → auth0/authentication/base.py
@@ -1,13 +1,5 @@
-import base64
-import json
-import platform
-import sys
+from auth0.rest import RestClient, RestClientOptions
 
-import requests
-
-from auth0.v3.rest import RestClient, RestClientOptions
-
-from ..exceptions import Auth0Error, RateLimitError
 from .client_authentication import add_client_authentication
 
 UNKNOWN_ERROR = "a0.sdk.internal.unknown"

diff --git a/...3/authentication/client_authentication.py → ...0/authentication/client_authentication.py b/...3/authentication/client_authentication.py → ...0/authentication/client_authentication.py
diff --git a/auth0/v3/authentication/database.py → auth0/authentication/database.py b/auth0/v3/authentication/database.py → auth0/authentication/database.py
diff --git a/auth0/v3/authentication/delegated.py → auth0/authentication/delegated.py b/auth0/v3/authentication/delegated.py → auth0/authentication/delegated.py
diff --git a/auth0/v3/authentication/enterprise.py → auth0/authentication/enterprise.py b/auth0/v3/authentication/enterprise.py → auth0/authentication/enterprise.py
diff --git a/auth0/v3/authentication/get_token.py → auth0/authentication/get_token.py b/auth0/v3/authentication/get_token.py → auth0/authentication/get_token.py
diff --git a/auth0/v3/authentication/passwordless.py → auth0/authentication/passwordless.py b/auth0/v3/authentication/passwordless.py → auth0/authentication/passwordless.py
diff --git a/auth0/v3/authentication/revoke_token.py → auth0/authentication/revoke_token.py b/auth0/v3/authentication/revoke_token.py → auth0/authentication/revoke_token.py
diff --git a/auth0/v3/authentication/social.py → auth0/authentication/social.py b/auth0/v3/authentication/social.py → auth0/authentication/social.py
diff --git a/auth0/v3/authentication/token_verifier.py → auth0/authentication/token_verifier.py b/auth0/v3/authentication/token_verifier.py → auth0/authentication/token_verifier.py
@@ -5,7 +5,7 @@
 import jwt
 import requests
 
-from auth0.v3.exceptions import TokenValidationError
+from auth0.exceptions import TokenValidationError
 
 
 class SignatureVerifier(object):

diff --git a/auth0/v3/authentication/users.py → auth0/authentication/users.py b/auth0/v3/authentication/users.py → auth0/authentication/users.py
@@ -1,6 +1,4 @@
-import warnings
-
-from auth0.v3.rest import RestClient, RestClientOptions
+from auth0.rest import RestClient, RestClientOptions
 
 
 class Users(object):

diff --git a/auth0/v3/exceptions.py → auth0/exceptions.py b/auth0/v3/exceptions.py → auth0/exceptions.py
diff --git a/auth0/v3/management/__init__.py → auth0/management/__init__.py b/auth0/v3/management/__init__.py → auth0/management/__init__.py
diff --git a/auth0/v3/management/actions.py → auth0/management/actions.py b/auth0/v3/management/actions.py → auth0/management/actions.py
diff --git a/auth0/v3/management/async_auth0.py → auth0/management/async_auth0.py b/auth0/v3/management/async_auth0.py → auth0/management/async_auth0.py
diff --git a/auth0/v3/management/attack_protection.py → auth0/management/attack_protection.py b/auth0/v3/management/attack_protection.py → auth0/management/attack_protection.py
diff --git a/auth0/v3/management/auth0.py → auth0/management/auth0.py b/auth0/v3/management/auth0.py → auth0/management/auth0.py
diff --git a/auth0/v3/management/blacklists.py → auth0/management/blacklists.py b/auth0/v3/management/blacklists.py → auth0/management/blacklists.py
diff --git a/auth0/v3/management/branding.py → auth0/management/branding.py b/auth0/v3/management/branding.py → auth0/management/branding.py
diff --git a/auth0/v3/management/client_credentials.py → auth0/management/client_credentials.py b/auth0/v3/management/client_credentials.py → auth0/management/client_credentials.py
diff --git a/auth0/v3/management/client_grants.py → auth0/management/client_grants.py b/auth0/v3/management/client_grants.py → auth0/management/client_grants.py
diff --git a/auth0/v3/management/clients.py → auth0/management/clients.py b/auth0/v3/management/clients.py → auth0/management/clients.py
diff --git a/auth0/v3/management/connections.py → auth0/management/connections.py b/auth0/v3/management/connections.py → auth0/management/connections.py
diff --git a/auth0/v3/management/custom_domains.py → auth0/management/custom_domains.py b/auth0/v3/management/custom_domains.py → auth0/management/custom_domains.py
diff --git a/auth0/v3/management/device_credentials.py → auth0/management/device_credentials.py b/auth0/v3/management/device_credentials.py → auth0/management/device_credentials.py
diff --git a/auth0/v3/management/email_templates.py → auth0/management/email_templates.py b/auth0/v3/management/email_templates.py → auth0/management/email_templates.py
diff --git a/auth0/v3/management/emails.py → auth0/management/emails.py b/auth0/v3/management/emails.py → auth0/management/emails.py
diff --git a/auth0/v3/management/grants.py → auth0/management/grants.py b/auth0/v3/management/grants.py → auth0/management/grants.py
diff --git a/auth0/v3/management/guardian.py → auth0/management/guardian.py b/auth0/v3/management/guardian.py → auth0/management/guardian.py
diff --git a/auth0/v3/management/hooks.py → auth0/management/hooks.py b/auth0/v3/management/hooks.py → auth0/management/hooks.py
diff --git a/auth0/v3/management/jobs.py → auth0/management/jobs.py b/auth0/v3/management/jobs.py → auth0/management/jobs.py
diff --git a/auth0/v3/management/log_streams.py → auth0/management/log_streams.py b/auth0/v3/management/log_streams.py → auth0/management/log_streams.py
diff --git a/auth0/v3/management/logs.py → auth0/management/logs.py b/auth0/v3/management/logs.py → auth0/management/logs.py
diff --git a/auth0/v3/management/organizations.py → auth0/management/organizations.py b/auth0/v3/management/organizations.py → auth0/management/organizations.py
diff --git a/auth0/v3/management/prompts.py → auth0/management/prompts.py b/auth0/v3/management/prompts.py → auth0/management/prompts.py
diff --git a/auth0/v3/management/resource_servers.py → auth0/management/resource_servers.py b/auth0/v3/management/resource_servers.py → auth0/management/resource_servers.py
diff --git a/auth0/v3/management/roles.py → auth0/management/roles.py b/auth0/v3/management/roles.py → auth0/management/roles.py
diff --git a/auth0/v3/management/rules.py → auth0/management/rules.py b/auth0/v3/management/rules.py → auth0/management/rules.py
diff --git a/auth0/v3/management/rules_configs.py → auth0/management/rules_configs.py b/auth0/v3/management/rules_configs.py → auth0/management/rules_configs.py
diff --git a/auth0/v3/management/stats.py → auth0/management/stats.py b/auth0/v3/management/stats.py → auth0/management/stats.py
diff --git a/auth0/v3/management/tenants.py → auth0/management/tenants.py b/auth0/v3/management/tenants.py → auth0/management/tenants.py
diff --git a/auth0/v3/management/tickets.py → auth0/management/tickets.py b/auth0/v3/management/tickets.py → auth0/management/tickets.py
diff --git a/auth0/v3/management/user_blocks.py → auth0/management/user_blocks.py b/auth0/v3/management/user_blocks.py → auth0/management/user_blocks.py
diff --git a/auth0/v3/management/users.py → auth0/management/users.py b/auth0/v3/management/users.py → auth0/management/users.py
diff --git a/auth0/v3/management/users_by_email.py → auth0/management/users_by_email.py b/auth0/v3/management/users_by_email.py → auth0/management/users_by_email.py
diff --git a/auth0/v3/rest.py → auth0/rest.py b/auth0/v3/rest.py → auth0/rest.py
@@ -7,7 +7,7 @@
 
 import requests
 
-from auth0.v3.exceptions import Auth0Error, RateLimitError
+from auth0.exceptions import Auth0Error, RateLimitError
 
 UNKNOWN_ERROR = "a0.sdk.internal.unknown"
 

diff --git a/auth0/v3/rest_async.py → auth0/rest_async.py b/auth0/v3/rest_async.py → auth0/rest_async.py
@@ -2,7 +2,7 @@
 
 import aiohttp
 
-from auth0.v3.exceptions import RateLimitError
+from auth0.exceptions import RateLimitError
 
 from .rest import EmptyResponse, JsonResponse, PlainResponse, RestClient
 

diff --git a/auth0/v3/test/__init__.py → auth0/test/__init__.py b/auth0/v3/test/__init__.py → auth0/test/__init__.py
diff --git a/auth0/v3/test/authentication/__init__.py → auth0/test/authentication/__init__.py b/auth0/v3/test/authentication/__init__.py → auth0/test/authentication/__init__.py
diff --git a/auth0/v3/test/authentication/test_base.py → auth0/test/authentication/test_base.py b/auth0/v3/test/authentication/test_base.py → auth0/test/authentication/test_base.py
diff --git a/...0/v3/test/authentication/test_database.py → auth0/test/authentication/test_database.py b/...0/v3/test/authentication/test_database.py → auth0/test/authentication/test_database.py
@@ -6,7 +6,7 @@
 
 
 class TestDatabase(unittest.TestCase):
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_signup(self, mock_post):
         d = Database("my.domain.com", "cid")
 
@@ -61,7 +61,7 @@ def test_signup(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_change_password(self, mock_post):
         d = Database("my.domain.com", "cid")
 

diff --git a/.../v3/test/authentication/test_delegated.py → auth0/test/authentication/test_delegated.py b/.../v3/test/authentication/test_delegated.py → auth0/test/authentication/test_delegated.py
@@ -6,7 +6,7 @@
 
 
 class TestDelegated(unittest.TestCase):
-    @mock.patch("auth0.v3.authentication.delegated.Delegated.post")
+    @mock.patch("auth0.authentication.delegated.Delegated.post")
     def test_get_token_id_token(self, mock_post):
 
         d = Delegated("my.domain.com", "cid")
@@ -34,7 +34,7 @@ def test_get_token_id_token(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.authentication.delegated.Delegated.post")
+    @mock.patch("auth0.authentication.delegated.Delegated.post")
     def test_get_token_refresh_token(self, mock_post):
 
         d = Delegated("my.domain.com", "cid")
@@ -61,7 +61,7 @@ def test_get_token_refresh_token(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.authentication.delegated.Delegated.post")
+    @mock.patch("auth0.authentication.delegated.Delegated.post")
     def test_get_token_value_error(self, mock_post):
 
         d = Delegated("my.domain.com", "cid")

diff --git a/...v3/test/authentication/test_enterprise.py → auth0/test/authentication/test_enterprise.py b/...v3/test/authentication/test_enterprise.py → auth0/test/authentication/test_enterprise.py
@@ -6,7 +6,7 @@
 
 
 class TestEnterprise(unittest.TestCase):
-    @mock.patch("auth0.v3.authentication.enterprise.Enterprise.get")
+    @mock.patch("auth0.authentication.enterprise.Enterprise.get")
     def test_saml_metadata(self, mock_get):
 
         e = Enterprise("my.domain.com", "cid")
@@ -15,7 +15,7 @@ def test_saml_metadata(self, mock_get):
 
         mock_get.assert_called_with(url="https://my.domain.com/samlp/metadata/cid")
 
-    @mock.patch("auth0.v3.authentication.enterprise.Enterprise.get")
+    @mock.patch("auth0.authentication.enterprise.Enterprise.get")
     def test_wsfed_metadata(self, mock_get):
 
         e = Enterprise("my.domain.com", "cid")

diff --git a/.../v3/test/authentication/test_get_token.py → auth0/test/authentication/test_get_token.py b/.../v3/test/authentication/test_get_token.py → auth0/test/authentication/test_get_token.py
@@ -20,7 +20,7 @@ def get_private_key():
 
 
 class TestGetToken(unittest.TestCase):
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_authorization_code(self, mock_post):
 
         g = GetToken("my.domain.com", "cid", client_secret="clsec")
@@ -45,7 +45,7 @@ def test_authorization_code(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_authorization_code_with_client_assertion(self, mock_post):
 
         g = GetToken(
@@ -69,7 +69,7 @@ def test_authorization_code_with_client_assertion(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_authorization_code_pkce(self, mock_post):
 
         g = GetToken("my.domain.com", "cid")
@@ -95,7 +95,7 @@ def test_authorization_code_pkce(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_client_credentials(self, mock_post):
 
         g = GetToken("my.domain.com", "cid", client_secret="clsec")
@@ -115,7 +115,7 @@ def test_client_credentials(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_client_credentials_with_client_assertion(self, mock_post):
         g = GetToken(
             "my.domain.com", "cid", client_assertion_signing_key=get_private_key()
@@ -137,7 +137,7 @@ def test_client_credentials_with_client_assertion(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_login(self, mock_post):
 
         g = GetToken("my.domain.com", "cid", client_secret="clsec")
@@ -168,7 +168,7 @@ def test_login(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_refresh_token(self, mock_post):
         g = GetToken("my.domain.com", "cid", client_secret="clsec")
 
@@ -192,7 +192,7 @@ def test_refresh_token(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_passwordless_login_with_sms(self, mock_post):
 
         g = GetToken("my.domain.com", "cid", client_secret="csec")
@@ -222,7 +222,7 @@ def test_passwordless_login_with_sms(self, mock_post):
             },
         )
 
-    @mock.patch("auth0.v3.rest.RestClient.post")
+    @mock.patch("auth0.rest.RestClient.post")
     def test_passwordless_login_with_email(self, mock_post):
         g = GetToken("my.domain.com", "cid", client_secret="csec")