brilliance-admin 0.44.16__tar.gz → 0.44.17__tar.gz

{brilliance_admin-0.44.16 → brilliance_admin-0.44.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.44.16
+Version: 0.44.17
 Summary: Simple and lightweight data managment framework powered by FastAPI and Vue3 Vuetify all-in-one. Some call it heavenly in its brilliance.
 License-Expression: MIT
 Requires-Python: >=3.10

{brilliance_admin-0.44.16 → brilliance_admin-0.44.17}/brilliance_admin/integrations/sqlalchemy/auth.py

@@ -1,3 +1,4 @@
+import inspect
 from typing import Callable
 
 from brilliance_admin.auth import AdminAuthentication, AuthData, AuthResult, UserABC, UserResult
@@ -14,7 +15,7 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
     user_model = None
     pk_name = None
 
-    password_validator: Callable[[UserABC, str], bool] | None = None
+    password_validator = None
 
     def __init__(self, secret: str, db_async_session, user_model, pk_name='id', password_validator=None):
         self.pk_name = pk_name
@@ -76,14 +77,19 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
 
         try:
             if self.password_validator:
-                if not self.password_validator(user, data.password):
+                if inspect.iscoroutinefunction(self.password_validator):
+                    valid_password = await self.password_validator(user, data.password)
+                else:
+                    valid_password = self.password_validator(user, data.password)
+
+                if not valid_password:
                     raise AdminAPIException(APIError(code="user_not_found"), status_code=401)
 
         except AdminAPIException as e:
             raise e
         except Exception as e:
             msg = _('errors.password_exception') % {
-                'error_type': str(e) if schema.debug else type(e).__name__,
+                'error_type': str(e) if debug else type(e).__name__,
             }
             raise AdminAPIException(APIError(message=msg, code="password_exception"), status_code=500) from e
 

{brilliance_admin-0.44.16 → brilliance_admin-0.44.17}/brilliance_admin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.44.16
+Version: 0.44.17
 Summary: Simple and lightweight data managment framework powered by FastAPI and Vue3 Vuetify all-in-one. Some call it heavenly in its brilliance.
 License-Expression: MIT
 Requires-Python: >=3.10

{brilliance_admin-0.44.16 → brilliance_admin-0.44.17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brilliance-admin"
-version = "0.44.16"
+version = "0.44.17"
 description = 'Simple and lightweight data managment framework powered by FastAPI and Vue3 Vuetify all-in-one. Some call it heavenly in its brilliance.'
 readme = "README.md"
 requires-python = ">=3.10"

{brilliance_admin-0.44.16 → brilliance_admin-0.44.17}/tests/test_sqlalcmeny_auth.py

@@ -99,23 +99,69 @@ async def test_authenticate_not_admin(sqlite_sessionmaker):
 
 
 @pytest.mark.asyncio
-async def test_login_valid_password(sqlite_sessionmaker):
+async def test_login_valid_password_sync(sqlite_sessionmaker, language_context):
+    def async_password_validator(user, password):
+        return password == 'correct_password'
+
     auth = sqlalchemy.SQLAlchemyJWTAdminAuthentication(
         secret='123',
         db_async_session=sqlite_sessionmaker,
         user_model=User,
-        password_validator=lambda user, password: password == 'correct_password',
+        password_validator=async_password_validator,
+    )
+    await UserFactory(username='admin', password='correct_password', is_admin=True)
+
+    result = await auth.login(data=AuthData(username='admin', password='correct_password'))
+
+    assert result.token is not None
+    assert result.user.username == 'admin'
+
+
+@pytest.mark.asyncio
+async def test_login_valid_password_async(sqlite_sessionmaker, language_context):
+    async def async_password_validator(user, password):
+        return password == 'correct_password'
+
+    auth = sqlalchemy.SQLAlchemyJWTAdminAuthentication(
+        secret='123',
+        db_async_session=sqlite_sessionmaker,
+        user_model=User,
+        password_validator=async_password_validator,
     )
     await UserFactory(username='admin', password='correct_password', is_admin=True)
 
-    result = await auth.login(data=AuthData(username='admin', password='correct_password'), debug=True)
+    result = await auth.login(data=AuthData(username='admin', password='correct_password'))
 
     assert result.token is not None
     assert result.user.username == 'admin'
 
 
 @pytest.mark.asyncio
-async def test_login_invalid_password(sqlite_sessionmaker):
+async def test_login_invalid_password_async(sqlite_sessionmaker, language_context):
+    async def async_password_validator(user, password):
+        return password == 'correct_password'
+
+    auth = sqlalchemy.SQLAlchemyJWTAdminAuthentication(
+        secret='123',
+        db_async_session=sqlite_sessionmaker,
+        user_model=User,
+        password_validator=async_password_validator,
+    )
+    await UserFactory(username='admin', password='correct_password', is_admin=True)
+
+    with pytest.raises(AdminAPIException) as e:
+        await auth.login(data=AuthData(username='admin', password='wrong_password'), debug=False)
+
+    context = {'language_context': language_context}
+    assert e.value.get_error().model_dump(context=context) == {
+        'code': 'user_not_found',
+        'field_errors': None,
+        'message': None,
+    }
+
+
+@pytest.mark.asyncio
+async def test_login_invalid_password(sqlite_sessionmaker, language_context):
     auth = sqlalchemy.SQLAlchemyJWTAdminAuthentication(
         secret='123',
         db_async_session=sqlite_sessionmaker,
@@ -127,4 +173,9 @@ async def test_login_invalid_password(sqlite_sessionmaker):
     with pytest.raises(AdminAPIException) as e:
         await auth.login(data=AuthData(username='admin', password='wrong_password'), debug=True)
 
-    assert e.value.get_error().code == 'user_not_found'
+    context = {'language_context': language_context}
+    assert e.value.get_error().model_dump(context=context) == {
+        'code': 'user_not_found',
+        'field_errors': None,
+        'message': None,
+    }