fastapi-startkit-auth 0.6.1__tar.gz → 0.6.2__tar.gz

{fastapi_startkit_auth-0.6.1 → fastapi_startkit_auth-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-startkit-auth
-Version: 0.6.1
+Version: 0.6.2
 Summary: Laravel-style authentication for FastAPI: OAuth2/JWT authorization server, cookie/session guard, SPA + CSRF protection, and Sanctum-style API tokens.
 Keywords: fastapi,oauth2,jwt,auth,passport,sanctum,authentication,authorization,security,tokens,session,cookie,csrf,spa,starter-kit
 Author: Bedram Tamang

{fastapi_startkit_auth-0.6.1 → fastapi_startkit_auth-0.6.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-startkit-auth"
-version = "0.6.1"
+version = "0.6.2"
 description = "Laravel-style authentication for FastAPI: OAuth2/JWT authorization server, cookie/session guard, SPA + CSRF protection, and Sanctum-style API tokens."
 readme = "README.md"
 license = "MIT"

{fastapi_startkit_auth-0.6.1 → fastapi_startkit_auth-0.6.2}/src/fastapi_startkit_auth/__init__.py

@@ -43,7 +43,7 @@ from .sessions.models import SessionRecord
 from .sessions.store import InMemorySessionStore, SessionStore
 from .tokens.service import AsyncTokenService, TokenService
 
-__version__ = "0.6.1"
+__version__ = "0.6.2"
 
 __all__ = (
     "AuthConfig",

{fastapi_startkit_auth-0.6.1 → fastapi_startkit_auth-0.6.2}/src/fastapi_startkit_auth/providers/model.py

@@ -2,13 +2,25 @@ from __future__ import annotations
 
 import asyncio
 import secrets
-from typing import Any
+from typing import Any, get_type_hints
 
 from ..concurrency import call, is_coroutine_callable, resolve
 from ..security.hashing import BcryptHasher, Hasher
 from .fields import ActiveCheck, active_check, read_attribute, write_attribute
 
 
+def _identifier_for_model(model: Any, identifier: Any, id_field: str) -> Any:
+    if not isinstance(identifier, str) or not identifier.isdecimal():
+        return identifier
+    try:
+        key_type = get_type_hints(model).get(id_field)
+    except (NameError, TypeError):
+        key_type = getattr(model, "__annotations__", {}).get(id_field)
+    if key_type is int or key_type == "int":
+        return int(identifier)
+    return identifier
+
+
 class ModelUserProvider:
     """User provider backed by an active-record-style model class.
 
@@ -41,7 +53,7 @@ class ModelUserProvider:
         self._hasher.verify("invalid", self._dummy_hash)
 
     def retrieve_by_id(self, identifier: Any) -> Any | None:
-        return self._model.find(identifier)
+        return self._model.find(_identifier_for_model(self._model, identifier, self._id_field))
 
     def retrieve_by_credentials(self, credentials: dict[str, Any]) -> Any | None:
         username = credentials.get(self._username_field)
@@ -103,7 +115,7 @@ class AsyncModelUserProvider:
         await asyncio.to_thread(self._hasher.verify, "invalid", self._dummy_hash)
 
     async def retrieve_by_id(self, identifier: Any) -> Any | None:
-        return await resolve(self._model.find(identifier))
+        return await resolve(self._model.find(_identifier_for_model(self._model, identifier, self._id_field)))
 
     async def retrieve_by_credentials(self, credentials: dict[str, Any]) -> Any | None:
         username = credentials.get(self._username_field)

{fastapi_startkit_auth-0.6.1 → fastapi_startkit_auth-0.6.2}/tests/conftest.py

@@ -148,6 +148,7 @@ def _orm_config(backend, tmp_path):
 @pytest.fixture(params=["sqlite", "postgres"])
 async def orm_database(request, tmp_path):
     """Name of a migrated ORM connection: SQLite, or the throwaway Postgres in TEST_ASYNCPG_DSN."""
+    pytest.importorskip("fastapi_startkit.masoniteorm.models")
     from fastapi_startkit.application import Application as StartkitApplication
     from fastapi_startkit.masoniteorm import Migrator, Model
     from fastapi_startkit.masoniteorm.connections.factory import ConnectionFactory

{fastapi_startkit_auth-0.6.1 → fastapi_startkit_auth-0.6.2}/tests/test_async_stores.py

@@ -3,6 +3,8 @@ import time
 
 import pytest
 
+pytest.importorskip("fastapi_startkit.masoniteorm.models")
+
 from fastapi_startkit_auth import orm
 from fastapi_startkit_auth.apitokens.orm import OrmApiTokenRepository
 from fastapi_startkit_auth.sessions.orm import OrmSessionStore

fastapi_startkit_auth-0.6.2/tests/test_model_provider_postgres.py

@@ -0,0 +1,74 @@
+import asyncio
+import os
+from uuid import UUID
+
+import asyncpg
+import pytest
+
+from fastapi_startkit_auth.providers.model import AsyncModelUserProvider, ModelUserProvider
+
+POSTGRES_DSN = os.environ.get("TEST_ASYNCPG_DSN")
+
+
+@pytest.fixture
+async def postgres_users():
+    if not POSTGRES_DSN:
+        pytest.skip("TEST_ASYNCPG_DSN is not set")
+    connection = await asyncpg.connect(POSTGRES_DSN)
+    await connection.execute("DROP TABLE IF EXISTS auth_provider_int_users, auth_provider_uuid_users")
+    await connection.execute("CREATE TABLE auth_provider_int_users (id integer PRIMARY KEY)")
+    await connection.execute("INSERT INTO auth_provider_int_users (id) VALUES (7)")
+    await connection.execute("CREATE TABLE auth_provider_uuid_users (id uuid PRIMARY KEY)")
+    await connection.execute("INSERT INTO auth_provider_uuid_users (id) VALUES ($1)", UUID("d8ea1aa2-47e5-4fef-a3e8-dcd5fd68d217"))
+
+    class IntegerUser:
+        id: int
+
+        @classmethod
+        async def find(cls, identifier):
+            return await connection.fetchrow("SELECT id FROM auth_provider_int_users WHERE id = $1", identifier)
+
+    class UUIDUser:
+        id: UUID
+
+        @classmethod
+        async def find(cls, identifier):
+            return await connection.fetchrow("SELECT id FROM auth_provider_uuid_users WHERE id = $1", identifier)
+
+    yield connection, IntegerUser, UUIDUser
+    await connection.execute("DROP TABLE auth_provider_int_users, auth_provider_uuid_users")
+    await connection.close()
+
+
+@pytest.mark.asyncio
+async def test_async_provider_coerces_numeric_subject_for_integer_key(postgres_users):
+    _, integer_user, _ = postgres_users
+    user = await AsyncModelUserProvider(integer_user).retrieve_by_id("7")
+    assert user["id"] == 7
+
+
+def test_sync_provider_coerces_numeric_subject_for_integer_key(postgres_users):
+    class SyncIntegerUser:
+        id: int
+
+        @classmethod
+        def find(cls, identifier):
+            async def fetch():
+                connection = await asyncpg.connect(POSTGRES_DSN)
+                try:
+                    return await connection.fetchrow("SELECT id FROM auth_provider_int_users WHERE id = $1", identifier)
+                finally:
+                    await connection.close()
+
+            return asyncio.run(fetch())
+
+    user = ModelUserProvider(SyncIntegerUser()).retrieve_by_id("7")
+    assert user["id"] == 7
+
+
+@pytest.mark.asyncio
+async def test_async_provider_preserves_uuid_subject(postgres_users):
+    _, _, uuid_user = postgres_users
+    identifier = "d8ea1aa2-47e5-4fef-a3e8-dcd5fd68d217"
+    user = await AsyncModelUserProvider(uuid_user).retrieve_by_id(identifier)
+    assert user["id"] == UUID(identifier)