brilliance-admin 0.44.15__py3-none-any.whl → 0.44.16__py3-none-any.whl

brilliance_admin/api/views/auth.py

@@ -22,7 +22,7 @@ async def login(request: Request, auth_data: AuthData) -> AuthResult:
 
     auth: AdminAuthentication = schema.auth
     try:
-        result: AuthResult = await auth.login(auth_data)
+        result: AuthResult = await auth.login(auth_data, debug=schema.debug)
     except AdminAPIException as e:
         return JSONResponse(e.get_error().model_dump(mode='json', context=context), status_code=e.status_code)
 

brilliance_admin/auth.py

@@ -25,7 +25,7 @@ class AuthResult(BaseModel):
 
 
 class AdminAuthentication(abc.ABC):
-    async def login(self, data: AuthData) -> AuthResult:
+    async def login(self, data: AuthData, debug: bool = False) -> AuthResult:
         raise NotImplementedError('Login is not implemented')
 
     async def authenticate(self, headers: dict) -> UserABC:

brilliance_admin/integrations/sqlalchemy/auth.py

@@ -1,3 +1,5 @@
+from typing import Callable
+
 from brilliance_admin.auth import AdminAuthentication, AuthData, AuthResult, UserABC, UserResult
 from brilliance_admin.exceptions import AdminAPIException, APIError
 from brilliance_admin.translations import TranslateText as _
@@ -12,11 +14,18 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
     user_model = None
     pk_name = None
 
-    def __init__(self, secret: str, db_async_session, user_model, pk_name='id'):
+    password_validator: Callable[[UserABC, str], bool] | None = None
+
+    def __init__(self, secret: str, db_async_session, user_model, pk_name='id', password_validator=None):
         self.pk_name = pk_name
         self.secret = secret
         self.db_async_session = db_async_session
         self.user_model = user_model
+        self.password_validator = password_validator
+
+        if self.password_validator:
+            if not callable(self.password_validator):
+                raise ValueError("password_validator must be callable")
 
         if not isinstance(secret, str) or not secret:
             raise ValueError("JWT secret must be a non-empty string")
@@ -41,7 +50,7 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
             msg = f"user_model is missing required columns: {', '.join(sorted(missing))}"
             raise ValueError(msg)
 
-    async def login(self, data: AuthData) -> AuthResult:
+    async def login(self, data: AuthData, debug: bool = False) -> AuthResult:
         # pylint: disable=import-outside-toplevel
         from sqlalchemy import select
 
@@ -65,6 +74,19 @@ class SQLAlchemyJWTAdminAuthentication(AdminAuthentication):
         if not user:
             raise AdminAPIException(APIError(code="user_not_found"), status_code=401)
 
+        try:
+            if self.password_validator:
+                if not self.password_validator(user, data.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__,
+            }
+            raise AdminAPIException(APIError(message=msg, code="password_exception"), status_code=500) from e
+
         if not user.is_admin:
             raise AdminAPIException(APIError(code="not_an_admin"), status_code=401)
 

brilliance_admin/locales/ru.yml

@@ -11,6 +11,8 @@ errors:
   db_error_retrieve: 'Ошибка получения записи из базы данных: %(error_type)s'
   db_error_list: 'Ошибка получения данных таблицы из базы данных: %(error_type)s'
 
+  password_exception: 'Произошла неизвестная ошибка при проверке пароля: %(error_type)s'
+
   connection_refused_error: 'Ошибка подключения к базе данных: %(error)s'
   filters_exception: 'Произошла неизвестная техническая ошибка при фильтрации данных: %(error_type)s'
   method_not_allowed: 'Ошибка, данный метод недоступен.'

{brilliance_admin-0.44.15.dist-info → brilliance_admin-0.44.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brilliance-admin
-Version: 0.44.15
+Version: 0.44.16
 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.15.dist-info → brilliance_admin-0.44.16.dist-info}/RECORD

@@ -1,5 +1,5 @@
 brilliance_admin/__init__.py,sha256=qxGzLVhFNm2FKL2lVt7bEFb6pTPqyXEQvUsDfyfv6SM,183
-brilliance_admin/auth.py,sha256=d57XRfLJIbOosLP1-0SCFkePPT8M5WhLcwxu4yW92RA,673
+brilliance_admin/auth.py,sha256=3I844ZF87f-V73LoQf62BY6AqrqoU986_gGJq0X4poo,694
 brilliance_admin/docs.py,sha256=fKeJKuiCCi1jHRmNcmkuDD6_2di7bwc6-w8V1VCTu0s,1231
 brilliance_admin/exceptions.py,sha256=CJGvpo7EiaX3RVAEUDpwgH_Tuw8kY7tMy57pVcnBxak,947
 brilliance_admin/translations.py,sha256=r5xy3Iara_7m2E7rgG8goPFDcKdPLUGAKIWIt6TdulA,3906
@@ -8,7 +8,7 @@ brilliance_admin/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 brilliance_admin/api/routers.py,sha256=S8IV7JxA1wLspYn3qxESMI3Qt6UhQK-Gy0PsZi8hcwQ,819
 brilliance_admin/api/utils.py,sha256=ezvHK49OlpCdT9fLB41Y1nswZDLdzC3zTcQtGtuTYUk,999
 brilliance_admin/api/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-brilliance_admin/api/views/auth.py,sha256=Qmd9KuFqCeNhQukYl0W62kcUYPMtgMekjkaTvz1AArM,1133
+brilliance_admin/api/views/auth.py,sha256=op52EpxxiE7sUoJPFSQXDd-jZc1ff-ZX4g1qoggEbtg,1153
 brilliance_admin/api/views/autocomplete.py,sha256=lpFDq46OCuiPhkUedv4y6GmJQVy3iX4P-di_-GMzabY,1516
 brilliance_admin/api/views/dashboard.py,sha256=tLFdbKrePH-A91HNCN4F_FXdlRQ1tA9D2tGLvzDOoFM,1389
 brilliance_admin/api/views/index.py,sha256=DkMshrs5zmqpbbF9G2RhqeLGFKMrkrAmQ6nnba7aLl8,1400
@@ -17,7 +17,7 @@ brilliance_admin/api/views/settings.py,sha256=2A9suZQONEtW9LkFban29Fe5ipQaaGT0Cz
 brilliance_admin/api/views/table.py,sha256=dLo_ic9LPeAvkeelbkHZs9oC9g9ZlXPPMiQMszlwDIQ,5979
 brilliance_admin/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 brilliance_admin/integrations/sqlalchemy/__init__.py,sha256=AmQHOvegS6_uaE4xYDHzRMdA9PyHn0cCt1s1IWc9G2U,318
-brilliance_admin/integrations/sqlalchemy/auth.py,sha256=N9CjFfnXmKeNbJBxHMDlbPaTQPmYWlYTz_73PYBkaNk,4931
+brilliance_admin/integrations/sqlalchemy/auth.py,sha256=nvTZd1HW-2_vs672ohcbWLP8pA2bHDXd66tuEkD-2f0,5853
 brilliance_admin/integrations/sqlalchemy/autocomplete.py,sha256=IKZwdjb5tM_pA5PBUhwYo4n_8nEfy_WcSu8Yu4ftarI,1572
 brilliance_admin/integrations/sqlalchemy/fields.py,sha256=7D0E4-12rqraqHek2yNuHzRdO7hhxjp0edhJu-mTnWQ,9897
 brilliance_admin/integrations/sqlalchemy/fields_schema.py,sha256=7WkOrt5dVvrsZppNZEZS8QaQPMSrfcWChwOaOFSRVOg,11419
@@ -29,7 +29,7 @@ brilliance_admin/integrations/sqlalchemy/table/list.py,sha256=Y76B5CFqQb2nfV0i0M
 brilliance_admin/integrations/sqlalchemy/table/retrieve.py,sha256=EKwGH8Mz3Jd-uR43WibD3hFiZVGK_ra_5Cu5XeoEf6Y,3508
 brilliance_admin/integrations/sqlalchemy/table/update.py,sha256=NxcYPqRZbm_BM-4QHzEbhgAhYSs3SXzYMMzKCalqahU,3800
 brilliance_admin/locales/en.yml,sha256=YBjkq2Tm0KjXKOMgnIM5etO42Pkm8mDdQlvmpITwsA4,1453
-brilliance_admin/locales/ru.yml,sha256=9MKJaJyx6dALP6CQkLQMJvgZdp8nwgnBxDsRZiYhlnc,2052
+brilliance_admin/locales/ru.yml,sha256=__reAnXeIo3KDqiyAxL4xp4rbsclWcYS002sK8iRAps,2185
 brilliance_admin/schema/__init__.py,sha256=H5UFO5dub_k5id8WdGRVy9G8RnqZuBSjw9XgPafj1VQ,293
 brilliance_admin/schema/admin_schema.py,sha256=SGdNuYUKrwAc6SA4RYh8TgSrod5RuY7lpXKzmY1SHZ4,6812
 brilliance_admin/schema/category.py,sha256=UTnUexbCHe9vfwi3ygX34YkLAH2ixfMWqe4H6xos0fI,6604
@@ -66,8 +66,8 @@ brilliance_admin/static/tinymce/plugins/codesample/css/prism.css,sha256=exAdMtHb
 brilliance_admin/static/tinymce/plugins/customLink/plugin.js,sha256=illBNpnHDkBsLG6wo_jDPF6z7CGnO1MQWUoDwZKy6vQ,5589
 brilliance_admin/static/tinymce/plugins/customLink/css/link.css,sha256=gh5nvY8Z92hJfCEBPnIm4jIPCcKKbJnab-30oIfX7Hc,56
 brilliance_admin/templates/index.html,sha256=RKvUZ386hjV5EV09vneHhFY3BrwmMsTsm9wUpPV7D08,1294
-brilliance_admin-0.44.15.dist-info/licenses/LICENSE,sha256=rgWE5Cxk53W0PhTOVmcQedABEWN1QMG-PRz3fz531sE,1074
-brilliance_admin-0.44.15.dist-info/METADATA,sha256=jISDnNtMIhzWRl1vajRqXeIz7WwhmPy7ZZNZ1YDFrus,7449
-brilliance_admin-0.44.15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-brilliance_admin-0.44.15.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
-brilliance_admin-0.44.15.dist-info/RECORD,,
+brilliance_admin-0.44.16.dist-info/licenses/LICENSE,sha256=rgWE5Cxk53W0PhTOVmcQedABEWN1QMG-PRz3fz531sE,1074
+brilliance_admin-0.44.16.dist-info/METADATA,sha256=dEpRtxx5sqZksbv5YHyZlyTL2SI5Xg9ShTzNK29MvRE,7449
+brilliance_admin-0.44.16.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+brilliance_admin-0.44.16.dist-info/top_level.txt,sha256=almFFSWrVYieI3i54hYL0fMUaeuIYiazS2Kx4wtK-ns,17
+brilliance_admin-0.44.16.dist-info/RECORD,,