plain.oauth 0.8.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

plain/oauth/{staff.py → admin.py}

@@ -1,11 +1,11 @@
-from plain.models import Count
-from plain.staff.cards import ChartCard
-from plain.staff.views import (
-    StaffModelDetailView,
-    StaffModelListView,
-    StaffViewset,
+from plain.admin.cards import ChartCard
+from plain.admin.views import (
+    AdminModelDetailView,
+    AdminModelListView,
+    AdminViewset,
     register_viewset,
 )
+from plain.models import Count
 
 from .models import OAuthConnection
 
@@ -34,14 +34,14 @@ class ProvidersChartCard(ChartCard):
 
 
 @register_viewset
-class OAuthConnectionViewset(StaffViewset):
-    class ListView(StaffModelListView):
+class OAuthConnectionViewset(AdminViewset):
+    class ListView(AdminModelListView):
         nav_section = "OAuth"
         model = OAuthConnection
         title = "Connections"
         fields = ["id", "user", "provider_key", "provider_user_id"]
         cards = [ProvidersChartCard]
 
-    class DetailView(StaffModelDetailView):
+    class DetailView(AdminModelDetailView):
         model = OAuthConnection
         title = "OAuth connection"

plain/oauth/models.py

@@ -18,6 +18,7 @@ if TYPE_CHECKING:
 # TODO preflight check for deploy that ensures all provider keys in db are also in settings?
 
 
+@models.register_model
 class OAuthConnection(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

plain/oauth/providers.py

@@ -95,7 +95,7 @@ class OAuthProvider:
         return self.scope
 
     def get_callback_url(self, *, request: HttpRequest) -> str:
-        url = reverse("oauth:callback", kwargs={"provider": self.provider_key})
+        url = reverse("oauth:callback", provider=self.provider_key)
         return request.build_absolute_uri(url)
 
     def generate_state(self) -> str:

plain/oauth/urls.py

@@ -1,13 +1,14 @@
-from plain.urls import include, path
+from plain.urls import RouterBase, include, path, register_router
 
 from . import views
 
-default_namespace = "oauth"
 
-urlpatterns = [
-    path(
-        "<str:provider>/",
+@register_router
+class Router(RouterBase):
+    namespace = "oauth"
+    urls = [
         include(
+            "<str:provider>/",
             [
                 # Login and Signup are both handled here, because the intent is the same
                 path("login/", views.OAuthLoginView, name="login"),
@@ -18,7 +19,6 @@ urlpatterns = [
                     name="disconnect",
                 ),
                 path("callback/", views.OAuthCallbackView, name="callback"),
-            ]
+            ],
         ),
-    ),
-]
+    ]

{plain_oauth-0.8.0.dist-info → plain_oauth-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.oauth
-Version: 0.8.0
+Version: 0.9.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.8.0.dist-info → plain_oauth-0.9.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 plain/oauth/README.md,sha256=RWGb-KlcYm6etIKAgypE7qqzmgRWskAaVdKxfrXybV8,9901
 plain/oauth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plain/oauth/admin.py,sha256=rqrGRRUVxOlG9wiuXtndIyQxd1VT67cvFy6qWo7LF-Q,1278
 plain/oauth/config.py,sha256=jk5l59taT_3Kh7EFrJuuubtrCHLfNBVkD2sWQ_M5_JQ,160
 plain/oauth/default_settings.py,sha256=dlN1J9vSOjjxPNLp-0qe-cLTqwM4E69ZAx_8lpxMhaM,28
 plain/oauth/exceptions.py,sha256=TMGtIGkK3_J4rsEy1oPCmia7BnRSK8N8RMZm4_pNelA,189
-plain/oauth/models.py,sha256=JKST_orOFzywvtoQbrTO9cn7lKLJgjaBUJTN9RqXw7c,6843
-plain/oauth/providers.py,sha256=CqZg5pkB7yLK2Fkbc3dpY9ioYeh5tVoEuiJf1qn1qDM,7150
-plain/oauth/staff.py,sha256=3RvJEFGVQ9gbVDi0d_EphrQg0NpwuS4YKOqIMMmj9q4,1278
-plain/oauth/urls.py,sha256=NyP_yDKayJYrCdw4oNVHUmtjbLNfzdnpdWc-eOsMlDM,676
+plain/oauth/models.py,sha256=wWmxjQaaDAsLoZyNardKr0V27VbGB4L7zAUIFZQRCi4,6866
+plain/oauth/providers.py,sha256=WMLr9g3S84lfIRFslO0VBCmthMBDQ3GCDLSIquTA_Y0,7138
+plain/oauth/urls.py,sha256=OBnn73lu0c9cUMunW9AtkgeSExrksI33MoSuFpBuIlc,733
 plain/oauth/views.py,sha256=G6icfdKkOOOKB00JVN4SCeZmBcGOGUvAgueyvOd9bLI,3042
 plain/oauth/migrations/0001_initial.py,sha256=8-JR2McXDUNRhMRUrrZPqzRNpdROfCsIo5Qkndkn-pg,1756
 plain/oauth/migrations/0002_alter_oauthconnection_options_and_more.py,sha256=3Mb0IU9KDRQfog0PjVbzuNv_AxCs7UVHnA0F263AKNo,581
@@ -15,7 +15,7 @@ plain/oauth/migrations/0004_alter_oauthconnection_access_token_and_more.py,sha25
 plain/oauth/migrations/0005_alter_oauthconnection_unique_together_and_more.py,sha256=3hmuSvIZhn-haEKOGN3lQzcXD7b_Hy0P8Wa7LOAvJ1k,576
 plain/oauth/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plain/oauth/templates/oauth/error.html,sha256=xkkWw57sZ3fz4dDfH30SVtq3okJNnJmrSRPfGxrxjh8,108
-plain_oauth-0.8.0.dist-info/METADATA,sha256=Ls2iNx-EEM0bpRkTXC0ZM6swQtHQ-n7tj1D5wZwj5tU,10304
-plain_oauth-0.8.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_oauth-0.8.0.dist-info/licenses/LICENSE,sha256=cvKM3OlqHx3ijD6e34zsSUkPvzl-ya3Dd63A6EHL94U,1500
-plain_oauth-0.8.0.dist-info/RECORD,,
+plain_oauth-0.9.0.dist-info/METADATA,sha256=uRhh9qZZyhe712Dn_BW1DswApKAjoCjZeoFbhxzFkhQ,10304
+plain_oauth-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_oauth-0.9.0.dist-info/licenses/LICENSE,sha256=cvKM3OlqHx3ijD6e34zsSUkPvzl-ya3Dd63A6EHL94U,1500
+plain_oauth-0.9.0.dist-info/RECORD,,