'app' submodule

canaille/__init__.py

@@ -17,7 +17,7 @@ csrf = CSRFProtect()
 
 
 def setup_config(app, config=None, validate=True):
-    import canaille.configuration
+    import canaille.app.configuration
 
     app.config.from_mapping(
         {
@@ -42,7 +42,7 @@ def setup_config(app, config=None, validate=True):
         canaille.oidc.installation.setup_keypair(app.config)
 
     if validate:
-        canaille.configuration.validate(app.config)
+        canaille.app.configuration.validate(app.config)
 
 
 def setup_sentry(app):  # pragma: no cover
@@ -138,7 +138,7 @@ def setup_flask(app):
 
     @app.context_processor
     def global_processor():
-        from .utils.flask import current_user
+        from canaille.app.flask import current_user
 
         return {
             "has_smtp": "SMTP" in app.config,
@@ -174,7 +174,7 @@ def create_app(config=None, validate=True):
     try:
         from .oidc.oauth import setup_oauth
         from .ldap_backend.backend import init_backend
-        from .utils.i18n import setup_i18n
+        from .app.i18n import setup_i18n
 
         setup_logging(app)
         init_backend(app)

canaille/app/commands.py

@@ -63,7 +63,7 @@ def check():
     """
     Check the configuration file.
     """
-    from canaille.configuration import validate, ConfigurationException
+    from canaille.app.configuration import validate, ConfigurationException
 
     try:
         validate(current_app.config, validate_remote=True)
@@ -78,8 +78,8 @@ def install():
     """
     Installs canaille elements from the configuration.
     """
-    from canaille.installation import install
+    from canaille.app.installation import install
-    from canaille.configuration import ConfigurationException
+    from canaille.app.configuration import ConfigurationException
 
     try:
         install(current_app.config)

canaille/app/configuration.py

@@ -16,7 +16,7 @@ def validate(config, validate_remote=False):
     if not validate_remote:
         return
 
-    from .ldap_backend.backend import validate_configuration
+    from canaille.ldap_backend.backend import validate_configuration
 
     validate_configuration(config)
     validate_smtp_configuration(config)

canaille/app/forms.py

@@ -1,8 +1,8 @@
 import math
 
 import wtforms
-from canaille.utils.i18n import DEFAULT_LANGUAGE_CODE
+from canaille.app.i18n import DEFAULT_LANGUAGE_CODE
-from canaille.utils.i18n import locale_selector
+from canaille.app.i18n import locale_selector
 from flask import abort
 from flask import current_app
 from flask import make_response

canaille/app/mails.py

@@ -4,8 +4,8 @@ import smtplib
 import urllib.request
 from email.utils import make_msgid
 
-from canaille.utils import get_current_domain
+from canaille.app import get_current_domain
-from canaille.utils import get_current_mail_domain
+from canaille.app import get_current_mail_domain
 from flask import current_app
 from flask import request
 

canaille/core/account.py

@@ -6,18 +6,18 @@ from typing import List
 
 import pkg_resources
 import wtforms
-from canaille.utils import b64_to_obj
+from canaille.app import b64_to_obj
-from canaille.utils import default_fields
+from canaille.app import default_fields
-from canaille.utils import login_placeholder
+from canaille.app import login_placeholder
-from canaille.utils import obj_to_b64
+from canaille.app import obj_to_b64
-from canaille.utils import profile_hash
+from canaille.app import profile_hash
-from canaille.utils.flask import current_user
+from canaille.app.flask import current_user
-from canaille.utils.flask import permissions_needed
+from canaille.app.flask import permissions_needed
-from canaille.utils.flask import render_htmx_template
+from canaille.app.flask import render_htmx_template
-from canaille.utils.flask import request_is_htmx
+from canaille.app.flask import request_is_htmx
-from canaille.utils.flask import smtp_needed
+from canaille.app.flask import smtp_needed
-from canaille.utils.flask import user_needed
+from canaille.app.flask import user_needed
-from canaille.utils.forms import TableForm
+from canaille.app.forms import TableForm
 from flask import abort
 from flask import Blueprint
 from flask import current_app

canaille/core/admin.py

@@ -1,8 +1,8 @@
+from canaille.app import obj_to_b64
+from canaille.app.flask import permissions_needed
+from canaille.app.forms import HTMXForm
 from canaille.core.mails import profile_hash
 from canaille.core.mails import send_test_mail
-from canaille.utils import obj_to_b64
-from canaille.utils.flask import permissions_needed
-from canaille.utils.forms import HTMXForm
 from flask import Blueprint
 from flask import current_app
 from flask import flash

canaille/core/forms.py

@@ -1,8 +1,8 @@
 import wtforms.form
-from canaille.utils.forms import HTMXBaseForm
+from canaille.app.forms import HTMXBaseForm
-from canaille.utils.forms import HTMXForm
+from canaille.app.forms import HTMXForm
-from canaille.utils.forms import is_uri
+from canaille.app.forms import is_uri
-from canaille.utils.i18n import native_language_name_from_code
+from canaille.app.i18n import native_language_name_from_code
 from flask import current_app
 from flask import g
 from flask_babel import lazy_gettext as _

canaille/core/groups.py

@@ -1,6 +1,6 @@
-from canaille.utils.flask import permissions_needed
+from canaille.app.flask import permissions_needed
-from canaille.utils.flask import render_htmx_template
+from canaille.app.flask import render_htmx_template
-from canaille.utils.forms import TableForm
+from canaille.app.forms import TableForm
 from flask import abort
 from flask import Blueprint
 from flask import flash

canaille/core/mails.py

@@ -1,6 +1,6 @@
-from canaille.utils import profile_hash
+from canaille.app import profile_hash
-from canaille.utils.mails import logo
+from canaille.app.mails import logo
-from canaille.utils.mails import send_email
+from canaille.app.mails import send_email
 from flask import current_app
 from flask import url_for
 from flask_babel import gettext as _

canaille/core/populate.py

@@ -2,9 +2,9 @@ import random
 
 import faker
 import ldap
+from canaille.app.i18n import available_language_codes
 from canaille.core.models import Group
 from canaille.core.models import User
-from canaille.utils.i18n import available_language_codes
 from faker.config import AVAILABLE_LOCALES
 
 

canaille/ldap_backend/backend.py

@@ -2,7 +2,7 @@ import logging
 import uuid
 
 import ldap
-from canaille.configuration import ConfigurationException
+from canaille.app.configuration import ConfigurationException
 from flask import g
 from flask import render_template
 from flask import request

canaille/ldap_backend/installation.py

@@ -17,7 +17,7 @@ def ldap_connection(config):
 
 
 def install_schema(config, schema_path):
-    from canaille.installation import InstallationException
+    from canaille.app.installation import InstallationException
 
     with open(schema_path) as fd:
         parser = ldif.LDIFRecordList(fd)

canaille/oidc/authorizations.py

@@ -1,7 +1,7 @@
+from canaille.app.flask import permissions_needed
+from canaille.app.flask import render_htmx_template
+from canaille.app.forms import TableForm
 from canaille.oidc.models import AuthorizationCode
-from canaille.utils.flask import permissions_needed
-from canaille.utils.flask import render_htmx_template
-from canaille.utils.forms import TableForm
 from flask import abort
 from flask import Blueprint
 from flask import request

canaille/oidc/clients.py

@@ -1,11 +1,11 @@
 import datetime
 
+from canaille.app.flask import permissions_needed
+from canaille.app.flask import render_htmx_template
+from canaille.app.flask import request_is_htmx
+from canaille.app.forms import TableForm
 from canaille.oidc.forms import ClientAddForm
 from canaille.oidc.models import Client
-from canaille.utils.flask import permissions_needed
-from canaille.utils.flask import render_htmx_template
-from canaille.utils.flask import request_is_htmx
-from canaille.utils.forms import TableForm
 from flask import abort
 from flask import Blueprint
 from flask import flash

canaille/oidc/consents.py

@@ -1,9 +1,9 @@
 import datetime
 import uuid
 
+from canaille.app.flask import user_needed
 from canaille.oidc.models import Client
 from canaille.oidc.models import Consent
-from canaille.utils.flask import user_needed
 from flask import Blueprint
 from flask import flash
 from flask import redirect

canaille/oidc/endpoints.py

@@ -6,6 +6,8 @@ from authlib.jose import JsonWebKey
 from authlib.jose import jwt
 from authlib.oauth2 import OAuth2Error
 from canaille import csrf
+from canaille.app.flask import current_user
+from canaille.app.flask import set_parameter_in_url_query
 from canaille.core.forms import FullLoginForm
 from canaille.core.models import User
 from flask import abort
@@ -21,8 +23,6 @@ from flask_babel import gettext as _
 from flask_themer import render_template
 from werkzeug.datastructures import CombinedMultiDict
 
-from ..utils.flask import current_user
-from ..utils.flask import set_parameter_in_url_query
 from .forms import AuthorizeForm
 from .forms import LogoutForm
 from .models import Client

canaille/oidc/forms.py

@@ -1,7 +1,7 @@
 import wtforms
+from canaille.app.forms import HTMXForm
+from canaille.app.forms import is_uri
 from canaille.oidc.models import Client
-from canaille.utils.forms import HTMXForm
-from canaille.utils.forms import is_uri
 from flask_babel import lazy_gettext as _
 
 

canaille/oidc/tokens.py

@@ -1,9 +1,9 @@
 import datetime
 
+from canaille.app.flask import permissions_needed
+from canaille.app.flask import render_htmx_template
+from canaille.app.forms import TableForm
 from canaille.oidc.models import Token
-from canaille.utils.flask import permissions_needed
-from canaille.utils.flask import render_htmx_template
-from canaille.utils.forms import TableForm
 from flask import abort
 from flask import Blueprint
 from flask import flash

tests/app/commands/test_check.py

@@ -1,4 +1,4 @@
-from canaille.commands import cli
+from canaille.app.commands import cli
 
 
 def test_check_command(testclient):

tests/app/test_apputils.py

@@ -1,4 +1,4 @@
-from canaille.utils import validate_uri
+from canaille.app import validate_uri
 
 
 def test_validate_uri():

tests/app/test_configuration.py

@@ -4,8 +4,8 @@ from unittest import mock
 import ldap
 import pytest
 from canaille import create_app
-from canaille.configuration import ConfigurationException
+from canaille.app.configuration import ConfigurationException
-from canaille.configuration import validate
+from canaille.app.configuration import validate
 from flask_webtest import TestApp
 
 

tests/app/test_flaskutils.py

@@ -4,7 +4,7 @@ import ldap
 import pytest
 import toml
 from canaille import create_app
-from canaille.utils.flask import set_parameter_in_url_query
+from canaille.app.flask import set_parameter_in_url_query
 from flask import g
 from flask_webtest import TestApp
 

tests/core/commands/test_populate.py

@@ -1,4 +1,4 @@
-from canaille.commands import cli
+from canaille.app.commands import cli
 from canaille.core.models import Group
 from canaille.core.models import User
 from canaille.core.populate import fake_users

tests/oidc/commands/test_clean.py

@@ -1,6 +1,6 @@
 import datetime
 
-from canaille.commands import cli
+from canaille.app.commands import cli
 from canaille.oidc.models import AuthorizationCode
 from canaille.oidc.models import Token
 from werkzeug.security import gen_salt

tests/oidc/commands/test_install.py

@@ -3,8 +3,8 @@ import os
 import ldap
 import pytest
 from canaille import create_app
-from canaille.commands import cli
+from canaille.app.commands import cli
-from canaille.installation import InstallationException
+from canaille.app.installation import InstallationException
 from canaille.ldap_backend.ldapobject import LDAPObject
 from canaille.oidc.installation import setup_schemas
 from flask_webtest import TestApp

tests/oidc/test_configuration.py

@@ -1,8 +1,8 @@
 import warnings
 
 import pytest
-from canaille.configuration import ConfigurationException
+from canaille.app.configuration import ConfigurationException
-from canaille.configuration import validate
+from canaille.app.configuration import validate
 from canaille.oidc.oauth import get_issuer