refactor(socialaccount): Provider.oauth2_adapter_class

allauth/socialaccount/providers/agave/provider.py

@@ -1,3 +1,4 @@
+from allauth.socialaccount.providers.agave.views import AgaveAdapter
 from allauth.socialaccount.providers.base import ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -18,6 +19,7 @@ class AgaveProvider(OAuth2Provider):
     id = "agave"
     name = "Agave"
     account_class = AgaveAccount
+    oauth2_adapter_class = AgaveAdapter
 
     def extract_uid(self, data):
         return str(data.get("create_time"))

allauth/socialaccount/providers/agave/views.py

@@ -1,6 +1,5 @@
 from allauth.socialaccount import app_settings
 from allauth.socialaccount.adapter import get_adapter
-from allauth.socialaccount.providers.agave.provider import AgaveProvider
 from allauth.socialaccount.providers.oauth2.views import (
     OAuth2Adapter,
     OAuth2CallbackView,
@@ -9,7 +8,7 @@
 
 
 class AgaveAdapter(OAuth2Adapter):
-    provider_id = AgaveProvider.id
+    provider_id = "agave"
 
     settings = app_settings.PROVIDERS.get(provider_id, {})
     provider_base_url = settings.get("API_URL", "https://public.agaveapi.co")

allauth/socialaccount/providers/amazon/provider.py

@@ -1,3 +1,4 @@
+from allauth.socialaccount.providers.amazon.views import AmazonOAuth2Adapter
 from allauth.socialaccount.providers.base import ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -11,6 +12,7 @@ class AmazonProvider(OAuth2Provider):
     id = "amazon"
     name = "Amazon"
     account_class = AmazonAccount
+    oauth2_adapter_class = AmazonOAuth2Adapter
 
     def get_default_scope(self):
         return ["profile"]

allauth/socialaccount/providers/amazon/views.py

@@ -5,11 +5,9 @@
     OAuth2LoginView,
 )
 
-from .provider import AmazonProvider
-
 
 class AmazonOAuth2Adapter(OAuth2Adapter):
-    provider_id = AmazonProvider.id
+    provider_id = "amazon"
     access_token_url = "https://api.amazon.com/auth/o2/token"
     authorize_url = "http://www.amazon.com/ap/oa"
     profile_url = "https://api.amazon.com/user/profile"

allauth/socialaccount/providers/amazon_cognito/provider.py

@@ -2,6 +2,9 @@
 from allauth.socialaccount.providers.amazon_cognito.utils import (
     convert_to_python_bool_if_value_is_json_string_bool,
 )
+from allauth.socialaccount.providers.amazon_cognito.views import (
+    AmazonCognitoOAuth2Adapter,
+)
 from allauth.socialaccount.providers.base import ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -23,6 +26,7 @@ class AmazonCognitoProvider(OAuth2Provider):
     id = "amazon_cognito"
     name = "Amazon Cognito"
     account_class = AmazonCognitoAccount
+    oauth2_adapter_class = AmazonCognitoOAuth2Adapter
 
     def extract_uid(self, data):
         return str(data["sub"])

allauth/socialaccount/providers/amazon_cognito/views.py

@@ -1,8 +1,5 @@
 from allauth.socialaccount import app_settings
 from allauth.socialaccount.adapter import get_adapter
-from allauth.socialaccount.providers.amazon_cognito.provider import (
-    AmazonCognitoProvider,
-)
 from allauth.socialaccount.providers.oauth2.views import (
     OAuth2Adapter,
     OAuth2CallbackView,
@@ -11,7 +8,7 @@
 
 
 class AmazonCognitoOAuth2Adapter(OAuth2Adapter):
-    provider_id = AmazonCognitoProvider.id
+    provider_id = "amazon_cognito"
 
     DOMAIN_KEY_MISSING_ERROR = (
         '"DOMAIN" key is missing in Amazon Cognito configuration.'

allauth/socialaccount/providers/angellist/provider.py

@@ -1,3 +1,6 @@
+from allauth.socialaccount.providers.angellist.views import (
+    AngelListOAuth2Adapter,
+)
 from allauth.socialaccount.providers.base import ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -18,6 +21,7 @@ class AngelListProvider(OAuth2Provider):
     id = "angellist"
     name = "AngelList"
     account_class = AngelListAccount
+    oauth2_adapter_class = AngelListOAuth2Adapter
 
     def extract_uid(self, data):
         return str(data["id"])

allauth/socialaccount/providers/angellist/views.py

@@ -5,11 +5,9 @@
     OAuth2LoginView,
 )
 
-from .provider import AngelListProvider
-
 
 class AngelListOAuth2Adapter(OAuth2Adapter):
-    provider_id = AngelListProvider.id
+    provider_id = "angellist"
     access_token_url = "https://angel.co/api/oauth/token/"
     authorize_url = "https://angel.co/api/oauth/authorize/"
     profile_url = "https://api.angel.co/1/me/"

allauth/socialaccount/providers/apple/provider.py

@@ -1,5 +1,6 @@
 from allauth.account.models import EmailAddress
 from allauth.socialaccount.app_settings import QUERY_EMAIL
+from allauth.socialaccount.providers.apple.views import AppleOAuth2Adapter
 from allauth.socialaccount.providers.base import ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -8,6 +9,7 @@ class AppleProvider(OAuth2Provider):
     id = "apple"
     name = "Apple"
     account_class = ProviderAccount
+    oauth2_adapter_class = AppleOAuth2Adapter
 
     def extract_uid(self, data):
         return str(data["sub"])

allauth/socialaccount/providers/apple/views.py

@@ -19,12 +19,11 @@
 
 from .apple_session import get_apple_session
 from .client import AppleOAuth2Client
-from .provider import AppleProvider
 
 
 class AppleOAuth2Adapter(OAuth2Adapter):
     client_class = AppleOAuth2Client
-    provider_id = AppleProvider.id
+    provider_id = "apple"
     access_token_url = "https://appleid.apple.com/auth/token"
     authorize_url = "https://appleid.apple.com/auth/authorize"
     public_key_url = "https://appleid.apple.com/auth/keys"

allauth/socialaccount/providers/asana/provider.py

@@ -1,3 +1,4 @@
+from allauth.socialaccount.providers.asana.views import AsanaOAuth2Adapter
 from allauth.socialaccount.providers.base import ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -10,6 +11,7 @@ class AsanaProvider(OAuth2Provider):
     id = "asana"
     name = "Asana"
     account_class = AsanaAccount
+    oauth2_adapter_class = AsanaOAuth2Adapter
 
     def extract_uid(self, data):
         return str(data["id"])

allauth/socialaccount/providers/asana/views.py

@@ -5,11 +5,9 @@
     OAuth2LoginView,
 )
 
-from .provider import AsanaProvider
-
 
 class AsanaOAuth2Adapter(OAuth2Adapter):
-    provider_id = AsanaProvider.id
+    provider_id = "asana"
     access_token_url = "https://app.asana.com/-/oauth_token"
     authorize_url = "https://app.asana.com/-/oauth_authorize"
     profile_url = "https://app.asana.com/api/1.0/users/me"

allauth/socialaccount/providers/auth0/provider.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+from allauth.socialaccount.providers.auth0.views import Auth0OAuth2Adapter
 from allauth.socialaccount.providers.base import ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -16,6 +16,7 @@ class Auth0Provider(OAuth2Provider):
     id = "auth0"
     name = "Auth0"
     account_class = Auth0Account
+    oauth2_adapter_class = Auth0OAuth2Adapter
 
     def get_default_scope(self):
         return ["openid", "profile", "email"]

allauth/socialaccount/providers/auth0/views.py

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
 from allauth.socialaccount import app_settings
 from allauth.socialaccount.adapter import get_adapter
-from allauth.socialaccount.providers.auth0.provider import Auth0Provider
 from allauth.socialaccount.providers.oauth2.views import (
     OAuth2Adapter,
     OAuth2CallbackView,
@@ -10,7 +8,7 @@
 
 
 class Auth0OAuth2Adapter(OAuth2Adapter):
-    provider_id = Auth0Provider.id
+    provider_id = "auth0"
     supports_state = True
 
     settings = app_settings.PROVIDERS.get(provider_id, {})

allauth/socialaccount/providers/authentiq/provider.py

@@ -1,5 +1,8 @@
 from allauth.account.models import EmailAddress
 from allauth.socialaccount import app_settings
+from allauth.socialaccount.providers.authentiq.views import (
+    AuthentiqOAuth2Adapter,
+)
 from allauth.socialaccount.providers.base import AuthAction, ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -56,6 +59,7 @@ class AuthentiqProvider(OAuth2Provider):
     id = "authentiq"
     name = "Authentiq"
     account_class = AuthentiqAccount
+    oauth2_adapter_class = AuthentiqOAuth2Adapter
 
     def get_scope(self, request):
         scope = set(super(AuthentiqProvider, self).get_scope(request))

allauth/socialaccount/providers/authentiq/views.py

@@ -8,11 +8,9 @@
     OAuth2LoginView,
 )
 
-from .provider import AuthentiqProvider
-
 
 class AuthentiqOAuth2Adapter(OAuth2Adapter):
-    provider_id = AuthentiqProvider.id
+    provider_id = "authentiq"
 
     settings = app_settings.PROVIDERS.get(provider_id, {})
 

allauth/socialaccount/providers/baidu/provider.py

@@ -1,3 +1,4 @@
+from allauth.socialaccount.providers.baidu.views import BaiduOAuth2Adapter
 from allauth.socialaccount.providers.base import ProviderAccount
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
@@ -21,6 +22,7 @@ class BaiduProvider(OAuth2Provider):
     id = "baidu"
     name = "Baidu"
     account_class = BaiduAccount
+    oauth2_adapter_class = BaiduOAuth2Adapter
 
     def extract_uid(self, data):
         return data["uid"]

allauth/socialaccount/providers/baidu/views.py

@@ -5,11 +5,9 @@
     OAuth2LoginView,
 )
 
-from .provider import BaiduProvider
-
 
 class BaiduOAuth2Adapter(OAuth2Adapter):
-    provider_id = BaiduProvider.id
+    provider_id = "baidu"
     access_token_url = "https://openapi.baidu.com/oauth/2.0/token"
     authorize_url = "https://openapi.baidu.com/oauth/2.0/authorize"
     profile_url = (

allauth/socialaccount/providers/basecamp/provider.py

@@ -1,4 +1,7 @@
 from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.basecamp.views import (
+    BasecampOAuth2Adapter,
+)
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
 
@@ -15,6 +18,7 @@ class BasecampProvider(OAuth2Provider):
     id = "basecamp"
     name = "Basecamp"
     account_class = BasecampAccount
+    oauth2_adapter_class = BasecampOAuth2Adapter
 
     def get_auth_params(self, request, action):
         data = super(BasecampProvider, self).get_auth_params(request, action)

allauth/socialaccount/providers/basecamp/views.py

@@ -5,11 +5,9 @@
     OAuth2LoginView,
 )
 
-from .provider import BasecampProvider
-
 
 class BasecampOAuth2Adapter(OAuth2Adapter):
-    provider_id = BasecampProvider.id
+    provider_id = "basecamp"
     access_token_url = (
         "https://launchpad.37signals.com/authorization/token?type=web_server"  # noqa
     )

allauth/socialaccount/providers/battlenet/provider.py

@@ -1,4 +1,7 @@
 from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.battlenet.views import (
+    BattleNetOAuth2Adapter,
+)
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
 
@@ -12,6 +15,7 @@ class BattleNetProvider(OAuth2Provider):
     id = "battlenet"
     name = "Battle.net"
     account_class = BattleNetAccount
+    oauth2_adapter_class = BattleNetOAuth2Adapter
 
     def extract_uid(self, data):
         uid = str(data["id"])

allauth/socialaccount/providers/battlenet/views.py

@@ -22,8 +22,6 @@
     OAuth2LoginView,
 )
 
-from .provider import BattleNetProvider
-
 
 class Region:
     APAC = "apac"
@@ -76,7 +74,8 @@ class BattleNetOAuth2Adapter(OAuth2Adapter):
     Can be any of eu, us, kr, sea, tw or cn
     """
 
-    provider_id = BattleNetProvider.id
+    provider_id = "battlenet"
+
     valid_regions = (
         Region.APAC,
         Region.CN,

allauth/socialaccount/providers/bitbucket_oauth2/provider.py

@@ -1,4 +1,7 @@
 from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.bitbucket_oauth2.views import (
+    BitbucketOAuth2Adapter,
+)
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
 
@@ -18,6 +21,7 @@ class BitbucketOAuth2Provider(OAuth2Provider):
     id = "bitbucket_oauth2"
     name = "Bitbucket"
     account_class = BitbucketOAuth2Account
+    oauth2_adapter_class = BitbucketOAuth2Adapter
 
     def extract_uid(self, data):
         return data["username"]

allauth/socialaccount/providers/bitbucket_oauth2/views.py

@@ -6,11 +6,9 @@
     OAuth2LoginView,
 )
 
-from .provider import BitbucketOAuth2Provider
-
 
 class BitbucketOAuth2Adapter(OAuth2Adapter):
-    provider_id = BitbucketOAuth2Provider.id
+    provider_id = "bitbucket_oauth2"
     access_token_url = "https://bitbucket.org/site/oauth2/access_token"
     authorize_url = "https://bitbucket.org/site/oauth2/authorize"
     profile_url = "https://api.bitbucket.org/2.0/user"

allauth/socialaccount/providers/bitly/provider.py

@@ -1,4 +1,5 @@
 from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.bitly.views import BitlyOAuth2Adapter
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
 
@@ -21,6 +22,7 @@ class BitlyProvider(OAuth2Provider):
     id = "bitly"
     name = "Bitly"
     account_class = BitlyAccount
+    oauth2_adapter_class = BitlyOAuth2Adapter
 
     def extract_uid(self, data):
         return str(data["login"])

allauth/socialaccount/providers/bitly/views.py

@@ -5,11 +5,9 @@
     OAuth2LoginView,
 )
 
-from .provider import BitlyProvider
-
 
 class BitlyOAuth2Adapter(OAuth2Adapter):
-    provider_id = BitlyProvider.id
+    provider_id = "bitly"
     access_token_url = "https://api-ssl.bitly.com/oauth/access_token"
     authorize_url = "https://bitly.com/oauth/authorize"
     profile_url = "https://api-ssl.bitly.com/v3/user/info"

allauth/socialaccount/providers/box/provider.py

@@ -1,4 +1,5 @@
 from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.box.views import BoxOAuth2Adapter
 from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
 
 
@@ -10,6 +11,7 @@ class BoxOAuth2Provider(OAuth2Provider):
     id = "box"
     name = "Box"
     account_class = BoxOAuth2Account
+    oauth2_adapter_class = BoxOAuth2Adapter
 
     def extract_uid(self, data):
         return data["id"]