feat: refactor base

ccrvlh · Nov 3, 2024 · 5fbce08 · 5fbce08
1 parent cf5fadf
commit 5fbce08
Show file tree

Hide file tree

Showing 25 changed files with 27 additions and 27 deletions.
diff --git a/docs/how-to-guides/use-with-fastapi-security.md b/docs/how-to-guides/use-with-fastapi-security.md
@@ -37,7 +37,7 @@ from litestar import Litestar, Depends, HTTPException, Security, Request
 from litestar.responses import RedirectResponse
 from litestar.security import APIKeyCookie  # this is the part that puts the lock icon to the docs
 from litestar_sso.sso.google import GoogleSSO  # pip install litestar-sso
-from litestar_sso.sso.base import OpenID
+from litestar_sso.base import OpenID
 
 from jose import jwt  # pip install python-jose[cryptography]
 

diff --git a/examples/generic.py b/examples/generic.py
@@ -7,7 +7,7 @@
 from litestar import Litestar, Request, get
 from litestar.exceptions import HTTPException
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID
+from litestar_sso.base import DiscoveryDocument, OpenID
 from litestar_sso.sso.generic import create_provider
 
 app = Litestar()

diff --git a/litestar_sso/__init__.py b/litestar_sso/__init__.py
@@ -3,7 +3,7 @@
 (such as Facebook login, Google login and login via Microsoft Office 365 account)
 """
 
-from .sso.base import OpenID, SSOBase, SSOLoginError
+from .base import OpenID, SSOBase, SSOLoginError
 from .sso.facebook import FacebookSSO
 from .sso.fitbit import FitbitSSO
 from .sso.generic import create_provider

diff --git a/litestar_sso/sso/base.py → litestar_sso/base.py b/litestar_sso/sso/base.py → litestar_sso/base.py
diff --git a/litestar_sso/sso/facebook.py b/litestar_sso/sso/facebook.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/fitbit.py b/litestar_sso/sso/fitbit.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase, SSOLoginError
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase, SSOLoginError
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/generic.py b/litestar_sso/sso/generic.py
@@ -5,7 +5,7 @@
 import logging
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Type, Union
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/github.py b/litestar_sso/sso/github.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/gitlab.py b/litestar_sso/sso/gitlab.py
@@ -5,7 +5,7 @@
 
 import pydantic
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/google.py b/litestar_sso/sso/google.py
@@ -4,7 +4,7 @@
 
 import httpx
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase, SSOLoginError
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase, SSOLoginError
 
 
 class GoogleSSO(SSOBase):

diff --git a/litestar_sso/sso/kakao.py b/litestar_sso/sso/kakao.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/line.py b/litestar_sso/sso/line.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/linkedin.py b/litestar_sso/sso/linkedin.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Dict, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/microsoft.py b/litestar_sso/sso/microsoft.py
@@ -4,7 +4,7 @@
 
 import pydantic
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/naver.py b/litestar_sso/sso/naver.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, List, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/notion.py b/litestar_sso/sso/notion.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase, SSOLoginError
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase, SSOLoginError
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/seznam.py b/litestar_sso/sso/seznam.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/spotify.py b/litestar_sso/sso/spotify.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/twitter.py b/litestar_sso/sso/twitter.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/litestar_sso/sso/yandex.py b/litestar_sso/sso/yandex.py
@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, ClassVar, Optional
 
-from litestar_sso.sso.base import DiscoveryDocument, OpenID, SSOBase
+from litestar_sso.base import DiscoveryDocument, OpenID, SSOBase
 
 if TYPE_CHECKING:
     import httpx  # pragma: no cover

diff --git a/tests/test_base.py b/tests/test_base.py
@@ -5,7 +5,7 @@
 import pytest
 from utils import Request
 
-from litestar_sso.sso.base import SecurityWarning, SSOBase, SSOLoginError, UnsetStateWarning
+from litestar_sso.base import SecurityWarning, SSOBase, SSOLoginError, UnsetStateWarning
 
 
 class TestSSOBase:

diff --git a/tests/test_generic_provider.py b/tests/test_generic_provider.py
@@ -1,4 +1,4 @@
-from litestar_sso.sso.base import OpenID
+from litestar_sso.base import OpenID
 from litestar_sso.sso.generic import create_provider
 
 DISCOVERY = {

diff --git a/tests/test_openid_responses.py b/tests/test_openid_responses.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from litestar_sso.sso.base import OpenID, SSOBase
+from litestar_sso.base import OpenID, SSOBase
 from litestar_sso.sso.facebook import FacebookSSO
 from litestar_sso.sso.fitbit import FitbitSSO
 from litestar_sso.sso.github import GithubSSO

diff --git a/tests/test_providers.py b/tests/test_providers.py
@@ -7,10 +7,10 @@
 from litestar.response import Redirect
 from utils import AnythingDict, Request, Response, make_fake_async_client
 
-from litestar_sso.sso.base import OpenID, SSOBase
-from litestar_sso.sso.base import OpenID
-from litestar_sso.sso.base import SSOBase
-from litestar_sso.sso.base import SecurityWarning
+from litestar_sso.base import OpenID, SSOBase
+from litestar_sso.base import OpenID
+from litestar_sso.base import SSOBase
+from litestar_sso.base import SecurityWarning
 from litestar_sso.sso.facebook import FacebookSSO
 from litestar_sso.sso.fitbit import FitbitSSO
 from litestar_sso.sso.generic import create_provider

diff --git a/tests/test_race_condition.py b/tests/test_race_condition.py
@@ -54,7 +54,7 @@ async def get(self, *args, **kwargs):
             await asyncio.sleep(0)
             return Response(token="")
 
-    with patch("litestar_sso.sso.base.httpx") as httpx:
+    with patch("litestar_sso.base.httpx") as httpx:
         httpx.AsyncClient = AsyncClient
 
         first_response = Response(token="first_token")  # noqa: S106