plain.oauth 0.10.0__tar.gz → 0.12.0__tar.gz

{plain_oauth-0.10.0 → plain_oauth-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.oauth
-Version: 0.10.0
+Version: 0.12.0
 Summary: OAuth login and API access for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_oauth-0.10.0 → plain_oauth-0.12.0}/plain/oauth/migrations/0001_initial.py

@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        migrations.settings_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [

{plain_oauth-0.10.0 → plain_oauth-0.12.0}/plain/oauth/models.py

@@ -6,7 +6,7 @@ from plain.exceptions import ValidationError
 from plain.models import transaction
 from plain.models.db import IntegrityError, OperationalError, ProgrammingError
 from plain.preflight import Error
-from plain.runtime import settings
+from plain.runtime import SettingsReference
 from plain.utils import timezone
 
 from .exceptions import OAuthUserAlreadyExistsError
@@ -24,7 +24,7 @@ class OAuthConnection(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
 
     user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
+        SettingsReference("AUTH_USER_MODEL"),
         on_delete=models.CASCADE,
         related_name="oauth_connections",
     )
@@ -125,7 +125,7 @@ class OAuthConnection(models.Model):
     def connect(
         cls,
         *,
-        user: settings.AUTH_USER_MODEL,
+        user,
         provider_key: str,
         oauth_token: "OAuthToken",
         oauth_user: "OAuthUser",

{plain_oauth-0.10.0 → plain_oauth-0.12.0}/plain/oauth/urls.py

@@ -1,10 +1,9 @@
-from plain.urls import RouterBase, include, path, register_router
+from plain.urls import Router, include, path
 
 from . import views
 
 
-@register_router
-class Router(RouterBase):
+class OAuthRouter(Router):
     namespace = "oauth"
     urls = [
         include(

{plain_oauth-0.10.0 → plain_oauth-0.12.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.oauth"
-version = "0.10.0"
+version = "0.12.0"
 description = "OAuth login and API access for Plain."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 license = "BSD-3-Clause"

{plain_oauth-0.10.0 → plain_oauth-0.12.0}/tests/app/settings.py

@@ -1,6 +1,7 @@
 from os import environ
 
 SECRET_KEY = "test"
+URLS_ROUTER = "app.urls.AppRouter"
 INSTALLED_PACKAGES = [
     "plain.auth",
     "plain.sessions",

{plain_oauth-0.10.0 → plain_oauth-0.12.0}/tests/app/urls.py

@@ -1,7 +1,7 @@
-import plain.oauth.urls
 from plain.auth.views import AuthViewMixin, LogoutView
 from plain.oauth.providers import get_provider_keys
-from plain.urls import RouterBase, include, path, register_router
+from plain.oauth.urls import OAuthRouter
+from plain.urls import Router, include, path
 from plain.views import TemplateView
 
 
@@ -18,11 +18,10 @@ class LoginView(TemplateView):
     template_name = "login.html"
 
 
-@register_router
-class Router(RouterBase):
+class AppRouter(Router):
     namespace = ""
     urls = [
-        include("oauth/", plain.oauth.urls),
+        include("oauth/", OAuthRouter),
         path("login/", LoginView, name="login"),
         path("logout/", LogoutView, name="logout"),
         path("", LoggedInView),