globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

fix: SQL backend password scheme loading

Browse source 
Use Backend.instance instead of flask.current_app, so it allows the
backend to be loaded independently from the Flask context.
This commit is contained in:
Éloi Rivard 2025-01-08 16:53:07 +01:00
parent c8f8e9fd06
commit fdf8f1e550
No known key found for this signature in database
GPG key ID: 7EDA204EA57DD184
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
canaille/backends/sql/models.py
View file

@ -20,6 +20,7 @@ from sqlalchemy_utils import force_auto_coercion
import canaille.core.models
import canaille.oidc.models
from canaille.backends import Backend
from canaille.backends.models import BackendModel
from .backend import Base
@ -63,6 +64,13 @@ membership_association_table = Table(
class User(canaille.core.models.User, Base, SqlAlchemyModel):
__tablename__ = "user"
@staticmethod
def default_password_arguments(**kwargs):
return dict(
schemes=Backend.instance.config["CANAILLE_SQL"]["PASSWORD_SCHEMES"],
**kwargs,
)
id: Mapped[str] = mapped_column(
String, primary_key=True, default=lambda: str(uuid.uuid4())
)
@ -75,9 +83,7 @@ class User(canaille.core.models.User, Base, SqlAlchemyModel):
user_name: Mapped[str] = mapped_column(String, unique=True, nullable=False)
password: Mapped[str] = mapped_column(
PasswordType(
onload=lambda **kwargs: dict(
schemes=current_app.config["CANAILLE_SQL"]["PASSWORD_SCHEMES"], **kwargs
),
onload=default_password_arguments,
),
nullable=True,
)