plain.oauth 0.21.0__tar.gz → 0.22.0__tar.gz

{plain_oauth-0.21.0 → plain_oauth-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.oauth
-Version: 0.21.0
+Version: 0.22.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.22.0/plain/oauth/CHANGELOG.md

@@ -0,0 +1,11 @@
+# plain-oauth changelog
+
+## [0.22.0](https://github.com/dropseed/plain/releases/plain-oauth@0.22.0) (2025-06-23)
+
+### What's changed
+
+- Updated `OAuthConnection.check()` to accept a single `database` argument instead of the older `databases` list, matching the new single `DATABASE` setting used across the Plain stack ([d346d81](https://github.com/dropseed/plain/commit/d346d81))
+
+### Upgrade instructions
+
+- No changes required.

{plain_oauth-0.21.0 → plain_oauth-0.22.0}/plain/oauth/models.py

@@ -164,34 +164,31 @@ class OAuthConnection(models.Model):
         """
         errors = super().check(**kwargs)
 
-        databases = kwargs.get("databases", None)
-        if not databases:
+        database = kwargs.get("database", False)
+        if not database:
             return errors
 
         from .providers import get_provider_keys
 
-        for database in databases:
-            try:
-                keys_in_db = set(
-                    cls.objects.using(database)
-                    .values_list("provider_key", flat=True)
-                    .distinct()
-                )
-            except (OperationalError, ProgrammingError):
-                # Check runs on manage.py migrate, and the table may not exist yet
-                # or it may not be installed on the particular database intentionally
-                continue
-
-            keys_in_settings = set(get_provider_keys())
-
-            if keys_in_db - keys_in_settings:
-                errors.append(
-                    Error(
-                        "The following OAuth providers are in the database but not in the settings: {}".format(
-                            ", ".join(keys_in_db - keys_in_settings)
-                        ),
-                        id="plain.oauth.E001",
-                    )
+        try:
+            keys_in_db = set(
+                cls.objects.values_list("provider_key", flat=True).distinct()
+            )
+        except (OperationalError, ProgrammingError):
+            # Check runs on manage.py migrate, and the table may not exist yet
+            # or it may not be installed on the particular database intentionally
+            return errors
+
+        keys_in_settings = set(get_provider_keys())
+
+        if keys_in_db - keys_in_settings:
+            errors.append(
+                Error(
+                    "The following OAuth providers are in the database but not in the settings: {}".format(
+                        ", ".join(keys_in_db - keys_in_settings)
+                    ),
+                    id="plain.oauth.E001",
                 )
+            )
 
         return errors

{plain_oauth-0.21.0 → plain_oauth-0.22.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.oauth"
-version = "0.21.0"
+version = "0.22.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.21.0 → plain_oauth-0.22.0}/tests/app/settings.py

@@ -9,11 +9,9 @@ INSTALLED_PACKAGES = [
     "plain.oauth",
     "app.users",
 ]
-DATABASES = {
-    "default": {
-        "ENGINE": "plain.models.backends.sqlite3",
-        "NAME": ":memory:",
-    }
+DATABASE = {
+    "ENGINE": "plain.models.backends.sqlite3",
+    "NAME": ":memory:",
 }
 MIDDLEWARE = [
     "plain.sessions.middleware.SessionMiddleware",

{plain_oauth-0.21.0 → plain_oauth-0.22.0}/tests/test_checks.py

@@ -25,7 +25,7 @@ def test_oauth_provider_keys_check_pass(db, settings):
         access_token="test",
     )
 
-    errors = OAuthConnection.check(databases=["default"])
+    errors = OAuthConnection.check(database=True)
     assert len(errors) == 0
 
 
@@ -58,7 +58,7 @@ def test_oauth_provider_keys_check_fail(db, settings):
         access_token="test",
     )
 
-    errors = OAuthConnection.check(databases=["default"])
+    errors = OAuthConnection.check(database=True)
     assert len(errors) == 1
     assert (
         errors[0].msg