wip

🔧(helm) add pdbs to deployments
In order to avoid a service interruption during a Kubernetes (k8s)upgrade, we add a Pod Disruption Budget (PDB) to deployments.
2025-02-10 12:06:47 +01:00 · 2025-02-10 11:24:23 +01:00
532 changed files with 16616 additions and 45366 deletions
@@ -1,24 +0,0 @@
-# Set the default behavior for all files
-* text=auto eol=lf
-
-# Binary files (should not be modified)
-*.png binary
-*.jpg binary
-*.jpeg binary
-*.gif binary
-*.ico binary
-*.mov binary
-*.mp4 binary
-*.mp3 binary
-*.flv binary
-*.fla binary
-*.swf binary
-*.gz binary
-*.zip binary
-*.7z binary
-*.ttf binary
-*.woff binary
-*.woff2 binary
-*.eot binary
-*.pdf binary
-
@@ -1,77 +0,0 @@
-name: Download translations from Crowdin
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - 'release/**'
-
-jobs:
-  install-dependencies:
-    uses: ./.github/workflows/dependencies.yml
-    with:
-      node_version: '22.x'
-      with-front-dependencies-installation: true
-
-  synchronize-with-crowdin:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Create empty source files
-        run: |
-          touch src/backend/locale/django.pot
-          mkdir -p src/frontend/packages/i18n/locales/desk/
-          touch src/frontend/packages/i18n/locales/desk/translations-crowdin.json
-      # crowdin workflow
-      - name: crowdin action
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin/config.yml
-          upload_sources: false
-          upload_translations: false
-          download_translations: true
-          create_pull_request: false
-          push_translations: false
-          push_sources: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-
-          # Visit https://crowdin.com/settings#api-key to create this token
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-          CROWDIN_BASE_PATH: "../src/"
-      # frontend i18n
-      - name: Restore the frontend cache
-        uses: actions/cache@v5
-        with:
-          path: "src/frontend/**/node_modules"
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-          fail-on-cache-miss: true
-      - name: generate translations files
-        working-directory: src/frontend
-        run: yarn i18n:deploy
-      # Create a new PR
-      - name: Create a new Pull Request with new translated strings
-        uses: peter-evans/create-pull-request@v7
-        with:
-          commit-message: |
-            🌐(i18n) update translated strings
-
-            Update translated files with new translations
-          title: 🌐(i18n) update translated strings
-          body: |
-            ## Purpose
-
-            update translated strings
-
-            ## Proposal
-
-            - [x]  update translated strings
-          branch: i18n/update-translations
-          labels: i18n
@@ -1,76 +0,0 @@
-name: Update crowdin sources
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-
-jobs:
-  install-dependencies:
-    uses: ./.github/workflows/dependencies.yml
-    with:
-      node_version: '22.x'
-      with-front-dependencies-installation: true
-      with-build_mails: true
-
-  synchronize-with-crowdin:
-    needs: install-dependencies
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-      # Backend i18n
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version-file: "src/backend/pyproject.toml"
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-      - name: Install the project
-        run: uv sync --locked --all-extras
-        working-directory: src/backend
-      - name: Restore the mail templates
-        uses: actions/cache@v5
-        id: mail-templates
-        with:
-          path: "src/backend/core/templates/mail"
-          key: mail-templates-${{ hashFiles('src/mail/mjml') }}
-          fail-on-cache-miss: true
-      - name: Install gettext
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gettext pandoc
-      - name: generate pot files
-        working-directory: src/backend
-        run: |
-          DJANGO_CONFIGURATION=Build uv run python manage.py makemessages -a --keep-pot
-      # frontend i18n
-      - name: Restore the frontend cache
-        uses: actions/cache@v5
-        with:
-          path: "src/frontend/**/node_modules"
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-          fail-on-cache-miss: true
-      - name: generate source translation file
-        working-directory: src/frontend
-        run: yarn i18n:extract
-      # crowdin workflow
-      - name: crowdin action
-        uses: crowdin/github-action@v2
-        with:
-          config: crowdin/config.yml
-          upload_sources: true
-          upload_translations: false
-          download_translations: false
-          create_pull_request: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-
-          # Visit https://crowdin.com/settings#api-key to create this token
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-
-          CROWDIN_BASE_PATH: "../src/"
@@ -1,85 +0,0 @@
-name: Dependency reusable workflow
-
-on:
-  workflow_call:
-    inputs:
-      node_version:
-        required: false
-        default: '22.x'
-        type: string
-      with-front-dependencies-installation:
-        type: boolean
-        default: false
-      with-build_mails:
-        type: boolean
-        default: false
-
-jobs:
-  front-dependencies-installation:
-    if: ${{ inputs.with-front-dependencies-installation == true }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-      - name: Restore the frontend cache
-        uses: actions/cache@v5
-        id: front-node_modules
-        with:
-          path: "src/frontend/**/node_modules"
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-      - name: Setup Node.js
-        if: steps.front-node_modules.outputs.cache-hit != 'true'
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{ inputs.node_version }}
-      - name: Install dependencies
-        if: steps.front-node_modules.outputs.cache-hit != 'true'
-        run: cd src/frontend/ && yarn install --frozen-lockfile
-      - name: Cache install frontend
-        if: steps.front-node_modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v5
-        with:
-          path: "src/frontend/**/node_modules"
-          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-
-  build-mails:
-    if: ${{ inputs.with-build_mails == true }}
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: src/mail
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Restore the mail templates
-        uses: actions/cache@v5
-        id: mail-templates
-        with:
-          path: "src/backend/core/templates/mail"
-          key: mail-templates-${{ hashFiles('src/mail/mjml') }}
-
-      - name: Setup Node.js
-        if: steps.mail-templates.outputs.cache-hit != 'true'
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{ inputs.node_version }}
-
-      - name: Install yarn
-        if: steps.mail-templates.outputs.cache-hit != 'true'
-        run: npm install -g yarn
-
-      - name: Install node dependencies
-        if: steps.mail-templates.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile
-
-      - name: Build mails
-        if: steps.mail-templates.outputs.cache-hit != 'true'
-        run: yarn build
-
-      - name: Cache mail templates
-        if: steps.mail-templates.outputs.cache-hit != 'true'
-        uses: actions/cache@v5
-        with:
-          path: "src/backend/core/templates/mail"
-          key: mail-templates-${{ hashFiles('src/mail/mjml') }}
@@ -13,7 +13,7 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      -
        name: Call argocd github webhook
        run: |
@@ -21,7 +21,7 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      -
        name: Docker meta
        id: meta
@@ -40,7 +40,7 @@ jobs:
        name: Run trivy scan (frontend)
        uses: numerique-gouv/action-trivy-cache@main
        with:
-          docker-build-args: '--target frontend-production -f src/frontend/Dockerfile'
+          docker-build-args: '--target frontend-production -f Dockerfile'
          docker-image-name: 'docker.io/lasuite/people-frontend:${{ github.sha }}'

  build-and-push-backend:
@@ -48,7 +48,7 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      -
        name: Docker meta
        id: meta
@@ -58,10 +58,7 @@ jobs:
      -
        name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USER }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USER }}" --password-stdin
      - name: create-version-json
        id: create-version-json
        uses: jsdaniell/create-json@v1.2.3
@@ -85,7 +82,7 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      -
        name: Docker meta
        id: meta
@@ -102,16 +99,12 @@ jobs:
      -
        name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USER }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USER }}" --password-stdin
      -
        name: Build and push
        uses: docker/build-push-action@v6
        with:
          context: .
-          file: ./src/frontend/Dockerfile
          target: frontend-production
          build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000
          push: ${{ github.event_name != 'pull_request' }}
@@ -125,9 +118,12 @@ jobs:
    runs-on: ubuntu-latest
    if: github.event_name != 'pull_request'
    steps:
-      - uses: numerique-gouv/action-argocd-webhook-notification@main
-        id: notify
-        with:
-          deployment_repo_path: "${{ secrets.DEPLOYMENT_REPO_URL }}"
-          argocd_webhook_secret: "${{ secrets.ARGOCD_PREPROD_WEBHOOK_SECRET }}"
-          argocd_url: "${{ vars.ARGOCD_PREPROD_WEBHOOK_URL }}"
+      -
+        name: Checkout repository
+        uses: actions/checkout@v4
+      -
+        name: Call argocd github webhook
+        run: |
+          data='{"ref": "'$GITHUB_REF'","repository": {"html_url":"'$GITHUB_SERVER_URL'/numerique-gouv/lasuite-deploiement"}}'
+          sig=$(echo -n ${data} | openssl dgst -sha1 -hmac "${{ secrets.ARGOCD_PREPROD_WEBHOOK_SECRET }}" | awk '{print "X-Hub-Signature: sha1="$2}')
+          curl -X POST -H 'X-GitHub-Event:push' -H "Content-Type: application/json" -H "${sig}" --data "${data}" ${{ vars.ARGOCD_PREPROD_WEBHOOK_URL }}
@@ -9,37 +9,25 @@ on:
      - '*'

 jobs:
-  # Call the reusable workflow to install dependencies
-  dependencies:
-    uses: ./.github/workflows/dependencies.yml
-    with:
-      node_version: '22.x'
-      with-front-dependencies-installation: true
-      with-build_mails: true
-
  lint-git:
    runs-on: ubuntu-latest
    if: github.event_name == 'pull_request' # Makes sense only for pull requests
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: show
        run: git log
      - name: Enforce absence of print statements in code
-        if: always()
        run: |
-          ! git diff origin/${{ github.event.pull_request.base.ref }}..HEAD -- . ':(exclude)**/people.yml' | grep -E "(\bprint\(|\bpprint\()"
+          ! git diff origin/${{ github.event.pull_request.base.ref }}..HEAD -- . ':(exclude)**/people.yml' | grep "print("
      - name: Check absence of fixup commits
-        if: always()
        run: |
          ! git log | grep 'fixup!'
      - name: Install gitlint
-        if: always()
        run: pip install --user requests gitlint
      - name: Lint commit messages added to main
-        if: always()
        run: ~/.local/bin/gitlint --commits origin/${{ github.event.pull_request.base.ref }}..HEAD

  check-changelog:
@@ -49,17 +37,17 @@ jobs:
      github.event_name == 'pull_request'
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Check that the CHANGELOG has been modified in the current branch
-        run: git log --name-only --pretty="" origin/${{ github.event.pull_request.base.ref }}..HEAD | grep CHANGELOG
+        run: git whatchanged --name-only --pretty="" origin/${{ github.event.pull_request.base.ref }}..HEAD | grep CHANGELOG

  lint-changelog:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Check CHANGELOG max line length
        run: |
          max_line_length=$(cat CHANGELOG.md | grep -Ev "^\[.*\]: https://github.com" | wc -L)
@@ -68,15 +56,45 @@ jobs:
            exit 1
          fi

-  build-front:
+  install-front:
    runs-on: ubuntu-latest
-    needs: dependencies
+
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'

      - name: Restore the frontend cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
+        id: front-node_modules
+        with:
+          path: 'src/frontend/**/node_modules'
+          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
+
+      - name: Install dependencies
+        if: steps.front-node_modules.outputs.cache-hit != 'true'
+        run: cd src/frontend/ && yarn install --frozen-lockfile
+
+      - name: Cache install frontend
+        if: steps.front-node_modules.outputs.cache-hit != 'true'
+        uses: actions/cache@v4
+        with:
+          path: 'src/frontend/**/node_modules'
+          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
+
+  build-front:
+    runs-on: ubuntu-latest
+    needs: install-front
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Restore the frontend cache
+        uses: actions/cache@v4
        id: front-node_modules
        with:
          path: 'src/frontend/**/node_modules'
@@ -86,20 +104,20 @@ jobs:
        run: cd src/frontend/ && yarn ci:build

      - name: Cache build frontend
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        with:
          path: src/frontend/apps/desk/out/
          key: build-front-${{ github.run_id }}

  test-front:
    runs-on: ubuntu-latest
-    needs: dependencies
+    needs: install-front
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Restore the frontend cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        id: front-node_modules
        with:
          path: 'src/frontend/**/node_modules'
@@ -110,13 +128,13 @@ jobs:

  lint-front:
    runs-on: ubuntu-latest
-    needs: dependencies
+    needs: install-front
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Restore the frontend cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        id: front-node_modules
        with:
          path: 'src/frontend/**/node_modules'
@@ -127,7 +145,7 @@ jobs:

  test-e2e:
    runs-on: ubuntu-latest
-    needs: [dependencies, build-front]
+    needs: [build-mails, build-front]
    timeout-minutes: 10
    strategy:
      fail-fast: false
@@ -136,30 +154,28 @@ jobs:
        shardTotal: [4]
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Set services env variables
        run: |
          make create-env-files
          cat env.d/development/common.e2e.dist >> env.d/development/common

-      - name: Restore the mail templates
-        uses: actions/cache@v5
-        id: mail-templates
+      - name: Download mails' templates
+        uses: actions/download-artifact@v4
        with:
-          path: "src/backend/core/templates/mail"
-          key: mail-templates-${{ hashFiles('src/mail/mjml') }}
-          fail-on-cache-miss: true  
+          name: mails-templates
+          path: src/backend/core/templates/mail

      - name: Restore the frontend cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        id: front-node_modules
        with:
          path: 'src/frontend/**/node_modules'
          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}

      - name: Restore the build cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
        id: cache-build
        with:
          path: src/frontend/apps/desk/out/
@@ -171,8 +187,6 @@ jobs:
          COMPOSE_DOCKER_CLI_BUILD: 1
        run: |
          docker compose build --pull --build-arg BUILDKIT_INLINE_CACHE=1
-          make update-keycloak-realm-app
-          make add-dev-rsa-private-key-to-env
          make run

      - name: Apply DRF migrations
@@ -183,6 +197,13 @@ jobs:
        run: |
          make demo FLUSH_ARGS='--no-input'

+      - name: Setup Dimail DB
+        run: |
+          make dimail-setup-db
+
+      - name: Install Playwright Browsers
+        run: cd src/frontend/apps/e2e && yarn install
+
      - name: Run e2e tests
        run: cd src/frontend/ && yarn e2e:test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}

@@ -213,6 +234,30 @@ jobs:
        if: ${{ contains(needs.*.result, 'failure') }}
        run: exit 1

+  build-mails:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: src/mail
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+      - name: Install yarn
+        run: npm install -g yarn
+      - name: Install node dependencies
+        run: yarn install --frozen-lockfile
+      - name: Build mails
+        run: yarn build
+      - name: Persist mails' templates
+        uses: actions/upload-artifact@v4
+        with:
+          name: mails-templates
+          path: src/backend/core/templates/mail
+
  lint-back:
    runs-on: ubuntu-latest
    defaults:
@@ -220,26 +265,23 @@ jobs:
        working-directory: src/backend
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
-      - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/checkout@v4
+      - name: Install Python
+        uses: actions/setup-python@v5
        with:
-          python-version-file: "src/backend/pyproject.toml"
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-      - name: Install the project
-        run: uv sync --locked --all-extras
-
+          python-version: '3.10'
+      - name: Install development dependencies
+        run: pip install --user .[dev]
      - name: Check code formatting with ruff
-        run: uv run ruff format . --diff
+        run: ~/.local/bin/ruff format . --diff
      - name: Lint code with ruff
-        run: uv run ruff check .
+        run: ~/.local/bin/ruff check .
      - name: Lint code with pylint
-        run: uv run pylint .
+        run: ~/.local/bin/pylint .

  test-back:
    runs-on: ubuntu-latest
-    needs: dependencies
+    needs: build-mails
    defaults:
      run:
        working-directory: src/backend
@@ -269,35 +311,27 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
      - name: Create writable /data
        run: |
          sudo mkdir -p /data/media && \
          sudo mkdir -p /data/static
-      - name: Restore the mail templates
-        uses: actions/cache@v5
-        id: mail-templates
+      - name: Download mails' templates
+        uses: actions/download-artifact@v4
        with:
-          path: "src/backend/core/templates/mail"
-          key: mail-templates-${{ hashFiles('src/mail/mjml') }}
-          fail-on-cache-miss: true  
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
+          name: mails-templates
+          path: src/backend/core/templates/mail
+      - name: Install Python
+        uses: actions/setup-python@v5
        with:
-          python-version-file: "src/backend/pyproject.toml"
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-      - name: Install the dependencies
-        run: uv sync --locked --all-extras
-
+          python-version: '3.10'
+      - name: Install development dependencies
+        run: pip install --user .[dev]
      - name: Install gettext (required to compile messages)
        run: |
          sudo apt-get update
          sudo apt-get install -y gettext
-
      - name: Generate a MO file from strings extracted from the project
-        run: uv run python manage.py compilemessages
-
+        run: python manage.py compilemessages
      - name: Run tests
-        run: uv run pytest -n 2
+        run: ~/.local/bin/pytest -n 2
@@ -3,8 +3,6 @@ run-name: Release Chart

 on:
  push:
-    branches:
-      - 'main'

 jobs:
  release:
@@ -13,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

@@ -21,7 +19,8 @@ jobs:
        run: |
          rm -rf ./src/helm/extra
          rm -rf ./src/helm/dimail
-          rm -rf ./src/helm/maildev
+          rm -rf ./src/helm/mailcatcher
+

      - name: Install Helm
        uses: azure/setup-helm@v4
@@ -58,9 +58,6 @@ src/frontend/tsclient
 # Logs
 *.log

-# Celery beat
-src/backend/celerybeat-schedule
-
 # Test & lint
 .coverage
 coverage.json
@@ -0,0 +1,3 @@
+[submodule "secrets"]
+	path = secrets
+	url = ../secrets
@@ -0,0 +1,11 @@
+creation_rules:
+  - path_regex: ./*
+    key_groups:
+    - age:
+      - age15fyxdwmg5mvldtqqus87xspuws2u0cpvwheehrtvkexj4tnsqqysw6re2x # jacques
+      - age16hnlml8yv4ynwy0seer57g8qww075crd0g7nsundz3pj4wk7m3vqftszg7 # github-repo
+      - age1plkp8td6zzfcavjusmsfrlk54t9vn8jjxm8zaz7cmnr7kzl2nfnsd54hwg # Anthony Le-Courric
+      - age12g6f5fse25tgrwweleh4jls3qs52hey2edh759smulwmk5lnzadslu2cp3 # Antoine Lebaud
+      - age1hnhuzj96ktkhpyygvmz0x9h8mfvssz7ss6emmukags644mdhf4msajk93r # Samuel Paccoud
+      - age1tl80n23wq6zxegupwn70ew0yp225ua5v4dk800x7g2w6pvlxz46qk592pa # Marie Pupo Jeammet
+      - age1rjchule5sncn8r8gfph07muee6vzx4wqfrtldt5jjzke4vlfxy2qqplfvc # Quentin Bey
@@ -8,250 +8,6 @@ and this project adheres to

 ## [Unreleased]

-### Fixed
-
- ✨(mailboxes) enforce lowercase on mailboxes
- 🐛(i18n) fix missing translations for status tag labels
- 🚚(route) prioritize mail domains as default landing page
-
-### Changed
-
- 🍱(static) update logo in invitation email template #1085
- ✨(uiV2) use Lasuite UI kit, new layout
-
-## [1.23.1] - 2026-02-16
-
- ✨(invitations) refresh expired invitations
-
-## [1.23.0] - 2026-02-12
-
-### Added
-
- ✨(demo) add aliases to demo #1050
- ✨(front) add icon to button to configure a domain
- ✨(datagrid) add sort to mailboxes list + mail domain list
- ✨(invitations) allow delete invitations mails domains access by an admin
- ✨(front) delete invitations mails domains access
- ✨(front) add show invitations mails domains access #1040
- ✨(invitations) can delete domain invitations
-
-### Fixed
-
- 🐛(domains) fix attemps to send invitations to existing users #953
-
-### Changed
-
- 🚸(email) we should ignore case when looking for existing emails #1056
- 🏗️(core) migrate from pip to uv
- ✨(front) add show invitations mails domains access #1040
-
-## [1.22.2] - 2026-01-26
-
-### Fixed
-
- 🐛(aliases) authorize special domain devnull in alias destinations #1029 
-
-## [1.22.1] - 2026-01-21
-
- 🔒️(organization) the first user is not admin #776
- 🐛(admin) fix broken alias import #1021
-
-## [1.22.0] - 2026-01-19
-
-### Added
- ✨(front) create, manage & delete aliases
- ✨(domains) alias sorting and admin
- ✨(aliases) delete all aliases in one call #1002
-
-### Fixed
- 🔒️(security) upgrade python version to fix vulnerability #1010
- 🐛(dimail) ignore oxadmin when importing mailboxes from dimail #986
- ✨(aliases) fix deleting single aliases #1002
-
-### Changed
- 🐛(dimail) allow mailboxes and aliases to have the same local part #986
-
-### Removed
- 🔥(plugins) remove CommuneCreation plugin
-
-## [1.21.0] - 2025-12-05
-
- ✨(aliases) import existing aliases from dimail
- 🛂(permissions) return 404 to users with no access to domain #985 
- ✨(aliases) can create, list and delete aliases #974
-
-## [1.20.0] - 2025-10-22
-
- ✨(models) impose uniqueness on display name, to match ox's constraint
- 🐛(dimail) catch duplicate displayname error
- ✨(mailbox) synchronize password of newly created mailbox with Dimail's
-
-## [1.19.1] - 2025-09-19
-
- 🐛(fix) add enabled update your mailbox
-
-## [1.19.0] - 2025-09-03
-
- ✨(front) add modal update mailboxes #954
-
-### Added
-
- ✨(api) update mailboxes #934
- ✨(api) give update rights to domain viewer on own mailbox #934
-
-### Fixed
-
- 🐛(dimail) grab duplicate displayname error #961
-
-### Changed
-
- 💥(sentry) remove `DJANGO_` before Sentry DSN env variable #957
-
-## [1.18.2] - 2025-07-03
-
-### Fixed
-
- 🐛(front) fix missing pagination mail domains #950
-
-## [1.18.1] - 2025-07-02
-
-### Fixed
-
- 🐛(front) fix missing pagination on mail domains #946
-
-## [1.18.0] - 2025-06-30
-
-### Added
-
- 🐛(front) fix missing pagination mail domains
- 🐛(front) fix button add mail domain
- ✨(teams) add matrix webhook for teams #904
- ✨(resource-server) add SCIM /Me endpoint #895
- 🔧(git) set LF line endings for all text files #928
-
-### Changed
-
- 🧑‍💻(docker) split frontend to another file #924
-
-### Fixed 
-
- 🐛(webhook) handle user on different home server than room server
-
-## [1.17.0] - 2025-06-11
-
-### Added
-
- ✨(frontend) add crisp script #914
- ⚡️(fix) add error when mailbox create failed
- ✨(mailbox) allow to reset password on mailboxes #834
-
-## [1.16.0] - 2025-05-05
-
-### Added
-
- 🔧(sentry) add Celery beat task integration #892
-
-### Changed
-
- ✨(uiv2) change mail domains
- 🛂(dimail) simplify interop with dimail
- ✨(mailbox) remove secondary email as required field
-
-### Fixed
-
- 🔒️(drf) disable browsable HTML API renderer #897
-
-## [1.15.0] - 2025-04-04
-
-### Added
-
- 🧱(helm) add la-suite ingress path
- ➕(backend) add django-lasuite dependency #858
- ✨(plugins) add endpoint to list siret of active organizations #771
- ✨(core) create AccountServiceAuthentication backend #771
- ✨(core) create AccountService model #771
- 🧱(helm) disable createsuperuser job by setting #863
- 🔒️(passwords) add validators for production #850
- ✨(domains) allow to re-run check on domain if status is failed
- ✨(organization) add `is_active` field
- ✨(domains) notify support when domain status changes #668
- ✨(domains) define domain check interval as a settings
- ✨(oidc) add simple introspection backend #832
- 🧑‍💻(tasks) run management commands #814
-
-### Changed
-
- ♻️(plugins) rewrite plugin system as django app #844
- 🔒️(users) restrict listable users to same organization #846 
-
-### Fixed
-
- 🐛(dimail) enhance sentry log
- 🐛(oauth2) force JWT signed for /userinfo #804
- 🐛(front) disable retries in useQuery and useInfiniteQuery #818
-
-## [1.14.1] - 2025-03-17
-
-## [1.14.0] - 2025-03-17
-
-### Added
-
- ✨(domains) enhance required action modal content
- ✨(domains) add periodic tasks to fetch domain status
- 🧑‍💻(docker) add celery beat to manage periodic tasks
- ✨(organization) add metadata field #790
- ⬆️(nginx) bump nginx-unprivileged to 1.27 #797
- ✨(teams) allow broadly available teams #796
- ✨(teams) update and enhance team invitation email
- ✨(api) define dimail timeout as a setting
- ✨(frontend) feature modal add new access role to domain 
- ✨(api) allow invitations for domain management #708
-
-### Fixed
-
- 🐛(oauth2) force JWT signed for /userinfo #804
- 🐛(oauth2) add ProConnect scopes #802
- 🐛(domains) use a dedicated mail to invite user to manage domain
- 🐛(mailbox) fix mailbox creation email language
-
-## [1.13.1] - 2025-03-04
-
-### Fixed
-
- 🐛(mailbox) fix migration to fill dn_email field
-
-## [1.13.0] - 2025-03-04
-
-### Added
-
- ✨(oidc) people as an identity provider #638
-
-### Fixed
-
- 💄(domains) improve user experience and avoid repeat fix_domain operations
- 👽️(dimail) increase timeout value for check domain API call
- 🧱(helm) add resource-server ingress path #743
- 🌐(backend) synchronize translations with crowdin again
-
-## [1.12.1] - 2025-02-20
-
-### Fixed
-
- 👽️(dimail) increase timeout value for API calls
-
-## [1.12.0] - 2025-02-18
-
-### Added
-
- ✨(domains) allow user to re-run all fetch domain data from dimail
- ✨(domains) display DNS config expected for domain with required actions
- ✨(domains) check status after creation
- ✨(domains) display required actions to do on domain
- ✨(plugin) add CommuneCreation plugin with domain provisioning #658
- ✨(frontend) display action required status on domain
- ✨(domains) store last health check details on MailDomain
- ✨(domains) add support email field on domain
-
 ## [1.11.0] - 2025-02-07

 ### Added
@@ -263,7 +19,6 @@ and this project adheres to

 ### Fixed

- ✨(auth) fix empty names from ProConnect #687
 - 🚑️(teams) do not display add button when disallowed #676
 - 🚑️(plugins) fix name from SIRET specific case #674
 - 🐛(api) restrict mailbox sync to enabled domains
@@ -523,28 +278,7 @@ and this project adheres to
 - ✨(domains) create and manage domains on admin + API
 - ✨(domains) mailbox creation + link to email provisioning API

-[unreleased]: https://github.com/suitenumerique/people/compare/v1.23.1...main
-[1.23.1]: https://github.com/suitenumerique/people/releases/v1.23.1
-[1.23.0]: https://github.com/suitenumerique/people/releases/v1.23.0
-[1.22.2]: https://github.com/suitenumerique/people/releases/v1.22.2
-[1.22.1]: https://github.com/suitenumerique/people/releases/v1.22.1
-[1.22.0]: https://github.com/suitenumerique/people/releases/v1.22.0
-[1.21.0]: https://github.com/suitenumerique/people/releases/v1.21.0
-[1.20.0]: https://github.com/suitenumerique/people/releases/v1.20.0
-[1.19.1]: https://github.com/suitenumerique/people/releases/v1.19.1
-[1.19.0]: https://github.com/suitenumerique/people/releases/v1.19.0
-[1.18.2]: https://github.com/suitenumerique/people/releases/v1.18.2
-[1.18.1]: https://github.com/suitenumerique/people/releases/v1.18.1
-[1.18.0]: https://github.com/suitenumerique/people/releases/v1.18.0
-[1.17.0]: https://github.com/suitenumerique/people/releases/v1.17.0
-[1.16.0]: https://github.com/suitenumerique/people/releases/v1.16.0
-[1.15.0]: https://github.com/suitenumerique/people/releases/v1.15.0
-[1.14.1]: https://github.com/suitenumerique/people/releases/v1.14.1
-[1.14.0]: https://github.com/suitenumerique/people/releases/v1.14.0
-[1.13.1]: https://github.com/suitenumerique/people/releases/v1.13.1
-[1.13.0]: https://github.com/suitenumerique/people/releases/v1.13.0
-[1.12.1]: https://github.com/suitenumerique/people/releases/v1.12.1
-[1.12.0]: https://github.com/suitenumerique/people/releases/v1.12.0
+[unreleased]: https://github.com/suitenumerique/people/compare/v1.11.0...main
 [1.11.0]: https://github.com/suitenumerique/people/releases/v1.11.0
 [1.10.1]: https://github.com/suitenumerique/people/releases/v1.10.1
 [1.10.0]: https://github.com/suitenumerique/people/releases/v1.10.0
@@ -1,109 +0,0 @@
-# Contributing to the Project
-
-Thank you for taking the time to contribute! Please follow these guidelines to ensure a smooth and productive workflow. 🚀🚀🚀
-
-To get started with the project, please refer to the [README.md](https://github.com/suitenumerique/docs/blob/main/README.md) for detailed instructions.
-
-Please also check out our [dev handbook](https://suitenumerique.gitbook.io/handbook) to learn our best practices.
-
-## Help us with translations
-
-You can help us with translations on [Crowdin](https://crowdin.com/project/lasuite-people).
-Your language is not there? Request it on our Crowdin page 😊.
-
-## Creating an Issue
-
-When creating an issue, please provide the following details:
-
-1.  **Title**: A concise and descriptive title for the issue.
-2.  **Description**: A detailed explanation of the issue, including relevant context or screenshots if applicable.
-3.  **Steps to Reproduce**: If the issue is a bug, include the steps needed to reproduce the problem.
-4.  **Expected vs. Actual Behavior**: Describe what you expected to happen and what actually happened.
-5.  **Labels**: Add appropriate labels to categorize the issue (e.g., bug, feature request, documentation).
-
-## Selecting an issue
-
-We use a [GitHub Project](https://github.com/orgs/suitenumerique/projects/1) in order to prioritize our workload. 
-
-Please check in priority the issues that are in the **TODO cette semaine** column. 
-
-## Commit Message Format
-
-All commit messages must adhere to the following format:
-
-`<gitmoji>(type) title description`
-
-*   <**gitmoji**>: Use a gitmoji to represent the purpose of the commit. For example, ✨ for adding a new feature or 🔥 for removing something, see the list here: <https://gitmoji.dev/>.
-*   **(type)**: Describe the type of change. Common types include `backend`, `frontend`, `CI`, `docker` etc...
-*   **title**: A short, descriptive title for the change, starting with a lowercase character.
-*   **description**: Include additional details about what was changed and why.
-
-### Example Commit Message
-
-```
-✨(frontend) add user authentication logic 
-
-Implemented login and signup features, and integrated OAuth2 for social login.
-```
-
-## Changelog Update
-
-Please add a line to the changelog describing your development. The changelog entry should include a brief summary of the changes, this helps in tracking changes effectively and keeping everyone informed. We usually include the title of the pull request, followed by the pull request ID to finish the log entry. The changelog line should be less than 80 characters in total.
-
-### Example Changelog Message
-```
-## [Unreleased]
-
-## Added
-
- ✨(frontend) add AI to the project #321
-```
-
-## Pull Requests
-
-It is nice to add information about the purpose of the pull request to help reviewers understand the context and intent of the changes. If you can, add some pictures or a small video to show the changes.
-
-### Don't forget to: 
- check your commits
- check the linting: `make lint && make frontend-lint`
- check the tests: `make test`
- add a changelog entry
- squash your commits
- rebase your branch on the latest `main` branch before pushing your changes `git pull --rebase origin main`
-
-### Process to have a nice commit history
-
-In the life time of your PR, you may need to add commits to fix things or add new features.
-Commit after commit, your PR will be full of commits but you have to clean it up with the following commands before merging on `main`:
-
-Gradually you can use `--fixup` to add commits to some of previous commit ( for example 1234567890).
-```
-git commit --fixup=1234567890
-```
-Then, you can squash your commits with the following command:
-```
-git rebase --autosquash -i -r  HEAD~<number-of-commits>
-```
-
-Or you can use:
-```
-git rebase -i HEAD~<number-of-commits>
-```
-and move, squash and/or rename your commits manually. You can squash them with previous commit replacing the `pick` by `f`. You can rename them with replacing the `pick` by `r`.
-Tada! You have a clean commit history.
-
-Once all the required tests have passed, you can request a review from the project maintainers.
-
-## Code Style
-
-Please maintain consistency in code style. Run any linting tools available to make sure the code is clean and follows the project's conventions.
-
-## Tests
-
-Make sure that all new features or fixes have corresponding tests. Run the test suite before pushing your changes to ensure that nothing is broken.
-
-## Asking for Help
-
-If you need any help while contributing, feel free to open a discussion or ask for guidance in the issue tracker. We are more than happy to assist!
-
-Thank you for your contributions! 👍
@@ -1,39 +1,78 @@
 # Django People

 # ---- base image to inherit from ----
-FROM python:3.14.2-alpine AS base
+FROM python:3.12.6-alpine3.20 AS base
+
+# Upgrade pip to its latest release to speed up dependencies installation
+RUN python -m pip install --upgrade pip setuptools

 # Upgrade system packages to install security updates
 RUN apk update && \
  apk upgrade

+### ---- Front-end dependencies image ----
+FROM node:20 AS frontend-deps
+
+WORKDIR /deps
+
+COPY ./src/frontend/package.json ./package.json
+COPY ./src/frontend/yarn.lock ./yarn.lock
+COPY ./src/frontend/apps/desk/package.json ./apps/desk/package.json
+COPY ./src/frontend/packages/i18n/package.json ./packages/i18n/package.json
+COPY ./src/frontend/packages/eslint-config-people/package.json ./packages/eslint-config-people/package.json
+
+RUN yarn --frozen-lockfile
+
+### ---- Front-end builder dev image ----
+FROM node:20 AS frontend-builder-dev
+
+WORKDIR /builder
+
+COPY --from=frontend-deps /deps/node_modules ./node_modules
+COPY ./src/frontend .
+
+WORKDIR ./apps/desk
+
+### ---- Front-end builder image ----
+FROM frontend-builder-dev AS frontend-builder
+
+RUN yarn build
+
+# ---- Front-end image ----
+FROM nginxinc/nginx-unprivileged:1.26-alpine AS frontend-production
+
+# Un-privileged user running the application
+ARG DOCKER_USER
+USER ${DOCKER_USER}
+
+COPY --from=frontend-builder \
+    /builder/apps/desk/out \
+    /usr/share/nginx/html
+
+COPY ./src/frontend/apps/desk/conf/default.conf /etc/nginx/conf.d
+
+# Copy entrypoint
+COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
+
+ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
+
+CMD ["nginx", "-g", "daemon off;"]
+
+
 # ---- Back-end builder image ----
 FROM base AS back-builder

-ENV UV_COMPILE_BYTECODE=1
-ENV UV_LINK_MODE=copy
+WORKDIR /builder

-# Disable Python downloads, because we want to use the system interpreter
-# across both images. If using a managed Python version, it needs to be
-# copied from the build image into the final image;
-ENV UV_PYTHON_DOWNLOADS=0
+# Copy required python dependencies
+COPY ./src/backend /builder

-# install uv
-COPY --from=ghcr.io/astral-sh/uv:0.9.10 /uv /uvx /bin/
-
-WORKDIR /app
-
-RUN --mount=type=cache,target=/root/.cache/uv \
-    --mount=type=bind,source=src/backend/uv.lock,target=uv.lock \
-    --mount=type=bind,source=src/backend/pyproject.toml,target=pyproject.toml \
-    uv sync --locked --no-install-project --no-dev
-COPY src/backend /app
-RUN --mount=type=cache,target=/root/.cache/uv \
-    uv sync --locked --no-dev
+RUN mkdir /install && \
+  pip install --prefix=/install .


 # ---- mails ----
-FROM node:22 AS mail-builder
+FROM node:20 AS mail-builder

 COPY ./src/mail /mail/app

@@ -52,13 +91,14 @@ RUN apk add \
  pango \
  rdfind

+# Copy installed python dependencies
+COPY --from=back-builder /install /usr/local
+
+# Copy people application (see .dockerignore)
+COPY ./src/backend /app/
+
 WORKDIR /app

-# Copy the application from the builder
-COPY --from=back-builder /app /app
-
-ENV PATH="/app/.venv/bin:$PATH"
-
 # collectstatic
 RUN DJANGO_CONFIGURATION=Build DJANGO_JWT_PRIVATE_SIGNING_KEY=Dummy \
    python manage.py collectstatic --noinput
@@ -89,18 +129,14 @@ COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
 # docker user (see entrypoint).
 RUN chmod g=u /etc/passwd

-# Copy the application from the builder
-COPY --from=back-builder /app /app
+# Copy installed python dependencies
+COPY --from=back-builder /install /usr/local
+
+# Copy people application (see .dockerignore)
+COPY ./src/backend /app/

 WORKDIR /app

-# Ensure the uv venv is used at runtime
-ENV PATH="/app/.venv/bin:$PATH"
-
-# Generate compiled translation messages
-RUN DJANGO_CONFIGURATION=Build \
-    python manage.py compilemessages --ignore=".venv/**/*"
-
 # We wrap commands run in this container by the following entrypoint that
 # creates a user on-the-fly with the container user ID (see USER) and root group
 # ID.
@@ -115,9 +151,10 @@ USER root:root
 # Install psql
 RUN apk add postgresql-client

-# Install development dependencies
-RUN --mount=from=ghcr.io/astral-sh/uv:0.9.10,source=/uv,target=/bin/uv \
-    uv sync --all-extras --locked
+# Uninstall people and re-install it in editable mode along with development
+# dependencies
+RUN pip uninstall -y people
+RUN pip install -e .[dev]

 # Restore the un-privileged user running the application
 ARG DOCKER_USER
@@ -41,9 +41,11 @@ DOCKER_USER         = $(DOCKER_UID):$(DOCKER_GID)
 COMPOSE             = DOCKER_USER=$(DOCKER_USER) docker compose
 COMPOSE_EXEC        = $(COMPOSE) exec
 COMPOSE_EXEC_APP    = $(COMPOSE_EXEC) app-dev
-COMPOSE_RUN         = $(COMPOSE) run --rm --no-deps
+COMPOSE_RUN         = $(COMPOSE) run --rm
 COMPOSE_RUN_APP     = $(COMPOSE_RUN) app-dev
 COMPOSE_RUN_CROWDIN = $(COMPOSE_RUN) crowdin crowdin
+WAIT_DB             = @$(COMPOSE_RUN) dockerize -wait tcp://$(DB_HOST):$(DB_PORT) -timeout 60s
+WAIT_KC_DB          = $(COMPOSE_RUN) dockerize -wait tcp://kc_postgresql:5432 -timeout 60s

 # -- Backend
 MANAGE              = $(COMPOSE_RUN_APP) python manage.py
@@ -70,45 +72,29 @@ data/static:
 create-env-files: ## Copy the dist env files to env files
 create-env-files: \
 	env.d/development/common \
-	env.d/development/france \
 	env.d/development/crowdin \
 	env.d/development/postgresql \
 	env.d/development/kc_postgresql
 .PHONY: create-env-files

-add-dev-rsa-private-key-to-env: ## Add a generated RSA private key to the env file
-	@echo "Generating RSA private key PEM for development..."
-	@mkdir -p env.d/development/rsa
-	@openssl genrsa -out env.d/development/rsa/private.pem 2048
-	@echo -n "\nOAUTH2_PROVIDER_OIDC_RSA_PRIVATE_KEY=\"" >> env.d/development/common
-	@openssl rsa -in env.d/development/rsa/private.pem -outform PEM >> env.d/development/common
-	@echo "\"" >> env.d/development/common
-	@rm -rf env.d/development/rsa
-.PHONY: add-dev-rsa-private-key-to-env
-
-update-keycloak-realm-app: ## Create the Keycloak realm for the project
-	@echo "$(BOLD)Creating Keycloak realm for 'app'$(RESET)"
-	@sed -i 's|http://app-dev:8000|http://app:8000|g' ./docker/auth/realm.json
-.PHONY: update-keycloak-realm-app
-
 bootstrap: ## Prepare Docker images for the project and install frontend dependencies
 bootstrap: \
 	data/media \
 	data/static \
 	create-env-files \
 	build \
-	run-dev \
+	run \
 	migrate \
 	back-i18n-compile \
 	mails-install \
 	mails-build \
-	dimail-setup-db
+	dimail-setup-db \
+	install-front-desk
 .PHONY: bootstrap

 # -- Docker/compose
 build: ## build the app-dev container
-	@$(COMPOSE) build app-dev frontend-dev
-	@$(COMPOSE) build dimail
+	@$(COMPOSE) build app-dev
 .PHONY: build

 down: ## stop and remove containers, networks, images, and volumes
@@ -119,14 +105,17 @@ logs: ## display app-dev logs (follow mode)
 	@$(COMPOSE) logs -f app-dev
 .PHONY: logs

-run: ## start the wsgi (production) and servers with production Docker images
-	@$(COMPOSE) up --force-recreate --detach app frontend celery celery-beat nginx maildev
+run: ## start the wsgi (production) and development server
+	@$(COMPOSE) up --force-recreate -d nginx
+	@$(COMPOSE) up --force-recreate -d app-dev
+	@$(COMPOSE) up --force-recreate -d celery-dev
+	@$(COMPOSE) up --force-recreate -d keycloak
+	@$(COMPOSE) up -d dimail
+	@echo "Wait for postgresql to be up..."
+	@$(WAIT_KC_DB)
+	@$(WAIT_DB)
 .PHONY: run

-run-dev: ## start the servers in development mode (watch) Docker images
-	@$(COMPOSE) up --force-recreate --detach app-dev dimail frontend-dev celery-dev celery-beat-dev nginx maildev
-.PHONY: run-dev
-
 status: ## an alias for "docker compose ps"
 	@$(COMPOSE) ps
 .PHONY: status
@@ -140,7 +129,6 @@ stop: ## stop the development server using Docker
 demo: ## flush db then create a demo for load testing purpose
 	@$(MAKE) resetdb
 	@$(MANAGE) create_demo
-	@$(MAKE) dimail-setup-db
 .PHONY: demo


@@ -167,14 +155,6 @@ lint-pylint: ## lint back-end python sources with pylint only on changed files f
 	bin/pylint --diff-only=origin/main
 .PHONY: lint-pylint

-lint-front: ## lint front-end sources with eslint
-	cd $(PATH_FRONT) && yarn lint
-.PHONY: lint-front
-
-lint-front-fix: ## fix front-end sources with eslint
-	cd $(PATH_FRONT) && yarn lint-fix
-.PHONY: lint-front-fix
-
 test: ## run project tests
 	@$(MAKE) test-back-parallel
 .PHONY: test
@@ -195,16 +175,22 @@ test-coverage: ## compute, display and save test coverage

 makemigrations:  ## run django makemigrations for the people project.
 	@echo "$(BOLD)Running makemigrations$(RESET)"
+	@$(COMPOSE) up -d postgresql
+	@$(WAIT_DB)
 	@$(MANAGE) makemigrations $(ARGS)
 .PHONY: makemigrations

 migrate:  ## run django migrations for the people project.
 	@echo "$(BOLD)Running migrations$(RESET)"
+	@$(COMPOSE) up -d postgresql
+	@$(WAIT_DB)
 	@$(MANAGE) migrate $(ARGS)
 .PHONY: migrate

 showmigrations:  ## run django showmigrations for the people project.
 	@echo "$(BOLD)Running showmigrations$(RESET)"
+	@$(COMPOSE) up -d postgresql
+	@$(WAIT_DB)
 	@$(MANAGE) showmigrations $(ARGS)
 .PHONY: showmigrations

@@ -215,11 +201,10 @@ superuser: ## Create an admin superuser with password "admin"
 .PHONY: superuser

 back-i18n-compile: ## compile the gettext files
-	@$(MANAGE) compilemessages --ignore=".venv/**/*"
+	@$(MANAGE) compilemessages --ignore="venv/**/*"
 .PHONY: back-i18n-compile

 back-i18n-generate: ## create the .pot files used for i18n
-back-i18n-generate: mails-build crowdin-download-sources
 	@$(MANAGE) makemessages -a --keep-pot
 .PHONY: back-i18n-generate

@@ -241,21 +226,18 @@ resetdb: ## flush database and create a superuser "admin"
 .PHONY: resetdb

 env.d/development/common:
-	cp --update=none env.d/development/common.dist env.d/development/common
-
-env.d/development/france:
-	cp --update=none env.d/development/france.dist env.d/development/france
+	cp -n env.d/development/common.dist env.d/development/common

 env.d/development/postgresql:
-	cp --update=none env.d/development/postgresql.dist env.d/development/postgresql
+	cp -n env.d/development/postgresql.dist env.d/development/postgresql

 env.d/development/kc_postgresql:
-	cp --update=none env.d/development/kc_postgresql.dist env.d/development/kc_postgresql
+	cp -n env.d/development/kc_postgresql.dist env.d/development/kc_postgresql

 # -- Internationalization

 env.d/development/crowdin:
-	cp --update=none env.d/development/crowdin.dist env.d/development/crowdin
+	cp -n env.d/development/crowdin.dist env.d/development/crowdin

 crowdin-download: ## Download translated message from Crowdin
 	@$(COMPOSE_RUN_CROWDIN) download -c crowdin/config.yml
@@ -277,7 +259,6 @@ i18n-compile: \

 i18n-generate: ## create the .pot files and extract frontend messages
 i18n-generate: \
-	crowdin-download-sources \
 	back-i18n-generate \
 	frontend-i18n-generate
 .PHONY: i18n-generate
@@ -296,21 +277,19 @@ i18n-generate-and-upload: \

 # -- INTEROPERABILTY
 # -- Dimail configuration
-dimail-setup-db:
+
+recreate-dimail-container:
 	@$(COMPOSE) up --force-recreate -d dimail
+.PHONY: recreate-dimail-container
+
+dimail-setup-db:
 	@echo "$(BOLD)Populating database of local dimail API container$(RESET)"
-	@$(MANAGE) setup_dimail_db --populate-from-people
+	@$(MANAGE) setup_dimail_db
 .PHONY: dimail-setup-db

 # -- Mail generator

-mails-clean-templates: ## Clean the generated mail templates directory
-	@echo "$(BOLD)Cleaning mail templates directory$(RESET)"
-	@rm -rf ./src/backend/core/templates/mail
-	@mkdir -p ./src/backend/core/templates/mail
-.PHONY: mails-clean-templates
-
-mails-build: mails-clean-templates ## Convert mjml files to html and text
+mails-build: ## Convert mjml files to html and text
 	@$(MAIL_YARN) build
 .PHONY: mails-build

@@ -349,7 +328,7 @@ help:

 # Front 
 install-front-desk: ## Install the frontend dependencies of app Desk  
-	cd $(PATH_FRONT_DESK) && yarn && yarn playwright install chromium
+	cd $(PATH_FRONT_DESK) && yarn
 .PHONY: install-front-desk

 run-front-desk: ## Start app Desk  
@@ -428,13 +407,3 @@ install-secret: ## install the kubernetes secrets from Vaultwarden
 fetch-domain-status:
 	@$(MANAGE) fetch_domain_status
 .PHONY: fetch-domain-status
-
-# -- Keycloak related
-create-new-client:  ## run the add-keycloak-client.sh script for keycloak.
-	@echo "$(BOLD)Running add-keycloak-client.sh$(RESET)"
-	@$(COMPOSE_RUN) \
-		-v ./scripts/keycloak/add-keycloak-client.sh:/tmp/add-keycloak-client.sh \
-		--entrypoint="/tmp/add-keycloak-client.sh" \
-		keycloak \
-		$(filter-out $@,$(MAKECMDGOALS))
-.PHONY: create-new-client
@@ -1,6 +1,6 @@
 # People

-People is an application to handle users and teams, and distribute permissions across [La Suite](https://lasuite.numerique.gouv.fr/).
+People is an application to handle users and teams, and distribute permissions accross [La Suite](https://lasuite.numerique.gouv.fr/).

 It is built on top of [Django Rest
 Framework](https://www.django-rest-framework.org/).
@@ -33,7 +33,7 @@ The easiest way to start working on the project is to use GNU Make:
 $ make bootstrap
 ```

-This command builds the `app-dev` container, installs dependencies, performs
+This command builds the `app` container, installs dependencies, performs
 database migrations and compile translations. It's a good idea to use this
 command each time you are pulling code from the project repository to avoid
 dependency-related or migration-related issues.
@@ -46,12 +46,6 @@ Note that if you need to run them afterward, you can use the eponym Make rule:
 $ make run
 ```

-or if you want to run them in development mode (with live reloading):
-
-```bash
-$ make run-dev
-```
-
 You can check all available Make rules using:

 ```bash
@@ -1,23 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Security is very important to us.
-
-If you have any issue regarding security, please disclose the information responsibly submiting [this form](https://vdp.numerique.gouv.fr/p/Send-a-report?lang=en) and not by creating an issue on the repository. You can also email us at support-regie@numerique.gouv.fr
-
-We appreciate your effort to make People more secure.
-
-## Vulnerability disclosure policy
-
-Working with security issues in an open source project can be challenging, as we are required to disclose potential problems that could be exploited by attackers. With this in mind, our security fix policy is as follows:
-
-1. The Maintainers team will handle the fix as usual (Pull Request,
-release).
-2. In the release notes, we will include the identification numbers from the
-GitHub Advisory Database (GHSA) and, if applicable, the Common Vulnerabilities
-and Exposures (CVE) identifier for the vulnerability.
-3. Once this grace period has passed, we will publish the vulnerability.
-
-By adhering to this security policy, we aim to address security concerns
-effectively and responsibly in our open source software project.
@@ -59,35 +59,6 @@ cmd_button('Migrate db',
           text='Run database migration',
 )

-# Command to reset DB
-reset_db = '''
-set -eu
-# get k8s pod name from tilt resource name
-POD_NAME="$(tilt get kubernetesdiscovery desk-backend -ojsonpath='{.status.pods[0].name}')"
-kubectl -n desk exec "$POD_NAME" -- python manage.py flush --no-input
-kubectl -n desk exec "$POD_NAME" -- python manage.py createsuperuser --username admin@example.com --password admin
-'''
-cmd_button('Reset DB',
-           argv=['sh', '-c', reset_db],
-           resource='desk-backend',
-           icon_name='developer_board',
-           text='Reset DB',
-)
-
-# Command to create demo data
-populate_people_with_demo_data = '''
-set -eu
-# get k8s pod name from tilt resource name
-POD_NAME="$(tilt get kubernetesdiscovery desk-backend -ojsonpath='{.status.pods[0].name}')"
-kubectl -n desk exec "$POD_NAME" -- python manage.py create_demo --force
-'''
-cmd_button('Populate with demo data',
-           argv=['sh', '-c', populate_people_with_demo_data],
-           resource='desk-backend',
-           icon_name='developer_board',
-           text='Populate with demo data',
-)
-
 # Command to created domain/users/access from people to dimail
 populate_dimail_from_people = '''
 set -eu
@@ -64,23 +64,6 @@ function _dc_run() {
    _docker_compose run --rm $user_args "$@"
 }

-# _dc_run_no_deps: wrap docker compose run command without dependencies
-#
-# usage: _dc_run_no_deps [options] [ARGS...]
-#
-# options: docker compose run command options
-# ARGS   : docker compose run command arguments
-function _dc_run_no_deps() {
-    _set_user
-
-    user_args="--user=$USER_ID"
-    if [ -z $USER_ID ]; then
-        user_args=""
-    fi
-
-    _docker_compose run --no-deps --rm $user_args "$@"
-}
-
 # _dc_exec: wrap docker compose exec command
 #
 # usage: _dc_exec [options] [ARGS...]
@@ -35,4 +35,4 @@ fi

 # Fix docker vs local path when project sources are mounted as a volume
 read -ra paths <<< "$(echo "${paths[@]}" | sed "s|src/backend/||g")"
-_dc_run_no_deps app-dev pylint "${paths[@]}" "${args[@]}"
+_dc_run app-dev pylint "${paths[@]}" "${args[@]}"
@@ -1,22 +1,16 @@
 services:
  postgresql:
    image: postgres:16
-    platform: linux/amd64
    env_file:
      - env.d/development/postgresql
    ports:
      - "15432:5432"
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}" ]
-      interval: 1s
-      timeout: 2s
-      retries: 300

  redis:
    image: redis:5

-  maildev:
-    image: maildev/maildev:latest
+  mailcatcher:
+    image: sj26/mailcatcher:latest
    ports:
      - "1081:1080"

@@ -28,13 +22,11 @@ services:
        DOCKER_USER: ${DOCKER_USER:-1000}
    user: ${DOCKER_USER:-1000}
    image: people:backend-development
-    pull_policy: never
    environment:
      - PYLINTHOME=/app/.pylint.d
      - DJANGO_CONFIGURATION=Development
    env_file:
      - env.d/development/common
-      - env.d/development/france
      - env.d/development/postgresql
    ports:
      - "8071:8000"
@@ -42,69 +34,12 @@ services:
      - ./src/backend:/app
      - ./data/media:/data/media
      - ./data/static:/data/static
-      - /app/.venv
    depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
-      maildev:
-        condition: service_started
-      redis:
-        condition: service_started
-
-  frontend-dev:
-    user: "${DOCKER_USER:-1000}"
-    build:
-      context: .
-      dockerfile: ./src/frontend/Dockerfile
-      target: frontend-dev
-    image: people:frontend-development
-    pull_policy: never
-    volumes:
-      - ./src/frontend:/home/frontend
-      - /home/frontend/node_modules
-      - /home/frontend/apps/desk/node_modules
-    ports:
-      - "3000:3000"
-
-  app:
-    build:
-      context: .
-      target: backend-production
-      args:
-        DOCKER_USER: ${DOCKER_USER:-1000}
-    user: ${DOCKER_USER:-1000}
-    image: people:backend-production
-    environment:
-      - DJANGO_CONFIGURATION=Development
-    env_file:
-      - env.d/development/common
-      - env.d/development/france
-      - env.d/development/postgresql
-    ports:
-      - "8071:8000"
-    volumes:
-      - ./data/media:/data/media
-    depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
-      redis:
-        condition: service_started
-
-  frontend:
-    user: "${DOCKER_USER:-1000}"
-    build:
-      context: .
-      dockerfile: ./src/frontend/Dockerfile
-      target: frontend-production
-      args:
-        API_ORIGIN: "http://localhost:8071"
-    image: people:frontend-production
-    pull_policy: build
-    ports:
-      - "3000:3000"
-
+        - dimail
+        - postgresql
+        - mailcatcher
+        - redis
+  
  celery-dev:
    user: ${DOCKER_USER:-1000}
    image: people:backend-development
@@ -118,31 +53,27 @@ services:
      - ./src/backend:/app
      - ./data/media:/data/media
      - ./data/static:/data/static
-      - /app/.venv
    depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
-      app-dev:
-        condition: service_started
+      - app-dev

-  celery-beat-dev:
+  app:
+    build:
+      context: .
+      target: backend-production
+      args:
+        DOCKER_USER: ${DOCKER_USER:-1000}
    user: ${DOCKER_USER:-1000}
-    image: people:backend-development
-    command: ["celery", "-A", "people.celery_app", "beat", "-l", "DEBUG"]
+    image: people:backend-production
    environment:
-      - DJANGO_CONFIGURATION=Development
+      - DJANGO_CONFIGURATION=Demo
    env_file:
      - env.d/development/common
      - env.d/development/postgresql
    volumes:
-      - ./src/backend:/app
      - ./data/media:/data/media
-      - ./data/static:/data/static
    depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
+      - postgresql
+      - redis

  celery:
    user: ${DOCKER_USER:-1000}
@@ -154,29 +85,7 @@ services:
      - env.d/development/common
      - env.d/development/postgresql
    depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
-      app:
-        condition: service_started
-
-  celery-beat:
-    user: ${DOCKER_USER:-1000}
-    image: people:backend-production
-    command: ["celery", "-A", "people.celery_app", "beat", "-l", "INFO"]
-    environment:
-      - DJANGO_CONFIGURATION=Demo
-    env_file:
-      - env.d/development/common
-      - env.d/development/postgresql
-    volumes:
-      - ./src/backend:/app
-      - ./data/media:/data/media
-      - ./data/static:/data/static
-    depends_on:
-      postgresql:
-        condition: service_healthy
-        restart: true
+      - app

  nginx:
    image: nginx:1.25
@@ -185,12 +94,14 @@ services:
    volumes:
      - ./docker/files/etc/nginx/conf.d:/etc/nginx/conf.d:ro
    depends_on:
-      keycloak:
-        condition: service_healthy
-        restart: true
+      - app
+      - keycloak
+
+  dockerize:
+    image: jwilder/dockerize

  crowdin:
-    image: crowdin/cli:4.6.1
+    image: crowdin/cli:3.16.0
    volumes:
      - ".:/app"
    env_file:
@@ -199,7 +110,7 @@ services:
    working_dir: /app

  node:
-    image: node:22
+    image: node:18
    user: "${DOCKER_USER:-1000}"
    environment:
      HOME: /tmp
@@ -207,23 +118,16 @@ services:
      - ".:/app"

  kc_postgresql:
-    image: postgres:14.3
-    ports:
-      - "5433:5432"
-    env_file:
-      - env.d/development/kc_postgresql
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}" ]
-      interval: 1s
-      timeout: 2s
-      retries: 300
+      image: postgres:14.3
+      ports:
+        - "5433:5432"
+      env_file:
+        - env.d/development/kc_postgresql

  keycloak:
    image: quay.io/keycloak/keycloak:20.0.1
    volumes:
      - ./docker/auth/realm.json:/opt/keycloak/data/import/realm.json
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
    command:
      - start-dev
      - --features=preview
@@ -233,8 +137,6 @@ services:
      - --hostname-admin-url=http://localhost:8083/
      - --hostname-strict=false
      - --hostname-strict-https=false
-      - --health-enabled=true
-      - --metrics-enabled=true
    environment:
      KEYCLOAK_ADMIN: admin
      KEYCLOAK_ADMIN_PASSWORD: admin
@@ -245,41 +147,17 @@ services:
      KC_DB_USERNAME: people
      KC_DB_SCHEMA: public
      PROXY_ADDRESS_FORWARDING: 'true'
-    healthcheck:
-      test: [ "CMD", "curl", "--head", "-fsS", "http://localhost:8080/health/ready" ]
-      interval: 1s
-      timeout: 2s
-      retries: 300
    ports:
      - "8080:8080"
    depends_on:
-      kc_postgresql:
-        condition: service_healthy
-        restart: true
+      - kc_postgresql

  dimail: 
    entrypoint: /opt/dimail-api/start-dev.sh
-    image: registry.mim-libre.fr/dimail/dimail-api:v0.5.2
+    image: registry.mim-libre.fr/dimail/dimail-api:v0.1.1
    pull_policy: always
    environment:
      DIMAIL_MODE: FAKE
      DIMAIL_JWT_SECRET: fake_jwt_secret
    ports:
      - "8001:8000"
-
-  flower-dev:
-    user: ${DOCKER_USER:-1000}
-    image: people:backend-development
-    command: ["celery", "-A", "people.celery_app", "flower", "--port=5555"]
-    environment:
-      - DJANGO_CONFIGURATION=Development
-    env_file:
-      - env.d/development/common
-      - env.d/development/postgresql
-    ports:
-      - "5555:5555"
-    volumes:
-      - ./src/backend:/app
-    depends_on:
-      - celery-dev
-      - redis
@@ -26,7 +26,7 @@
  "oauth2DeviceCodeLifespan": 600,
  "oauth2DevicePollingInterval": 5,
  "enabled": true,
-  "sslRequired": "none",
+  "sslRequired": "external",
  "registrationAllowed": true,
  "registrationEmailAsUsername": false,
  "rememberMe": true,
@@ -50,9 +50,6 @@
      "firstName": "John",
      "lastName": "Doe",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -68,7 +65,7 @@
      "lastName": "Delamairie",
      "enabled": true,
      "attributes": {
-          "siret": "21510339100011"
+          "siret": "21580304000017"
      },
      "credentials": [
        {
@@ -80,13 +77,10 @@
    },
    {
      "username": "user-e2e-chromium",
-      "email": "user-e2e-chromium@example.org",
+      "email": "user@chromium.e2e",
      "firstName": "E2E",
      "lastName": "Chromium",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -97,13 +91,10 @@
    },
    {
      "username": "user-e2e-webkit",
-      "email": "user-e2e-webkit@example.org",
+      "email": "user@webkit.e2e",
      "firstName": "E2E",
      "lastName": "Webkit",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -114,13 +105,10 @@
    },
    {
      "username": "user-e2e-firefox",
-      "email": "user-e2e-firefox@example.org",
+      "email": "user@firefox.e2e",
      "firstName": "E2E",
      "lastName": "Firefox",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -135,9 +123,6 @@
      "firstName": "E2E",
      "lastName": "Group Member",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -152,9 +137,6 @@
      "firstName": "E2E",
      "lastName": "Group Administrator",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -169,9 +151,6 @@
      "firstName": "E2E",
      "lastName": "Group Owner",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -186,9 +165,6 @@
      "firstName": "E2E",
      "lastName": "Mailbox Member",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -203,9 +179,6 @@
      "firstName": "E2E",
      "lastName": "Mailbox Administrator",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -220,9 +193,6 @@
      "firstName": "E2E",
      "lastName": "Mailbox Owner",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -237,9 +207,6 @@
      "firstName": "E2E",
      "lastName": "Group Member Mailbox Member",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -254,9 +221,6 @@
      "firstName": "E2E",
      "lastName": "Group Member Mailbox Administrator",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -271,9 +235,6 @@
      "firstName": "E2E",
      "lastName": "Group Member Mailbox Owner",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -288,9 +249,6 @@
      "firstName": "E2E",
      "lastName": "Group Administrator Mailbox Member",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -305,9 +263,6 @@
      "firstName": "E2E",
      "lastName": "Group Administrator Mailbox Administrator",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -322,9 +277,6 @@
      "firstName": "E2E",
      "lastName": "Group Administrator Mailbox Owner",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -339,9 +291,6 @@
      "firstName": "E2E",
      "lastName": "Group Owner Mailbox Member",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -356,9 +305,6 @@
      "firstName": "E2E",
      "lastName": "Group Owner Mailbox Administrator",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -373,9 +319,6 @@
      "firstName": "E2E",
      "lastName": "Mailbox Owner",
      "enabled": true,
-      "attributes": {
-          "siret": "13002526500013"
-      },
      "credentials": [
        {
          "type": "password",
@@ -1709,130 +1652,8 @@
  "enabledEventTypes": [],
  "adminEventsEnabled": false,
  "adminEventsDetailsEnabled": false,
-  "identityProviders": [
-    {
-      "alias": "oidc-people-local",
-      "displayName": "People OIDC (local)",
-      "internalId": "47aa6d7c-8ac5-4178-934e-66f78e510ee4",
-      "providerId": "oidc",
-      "enabled": true,
-      "updateProfileFirstLoginMode": "on",
-      "trustEmail": false,
-      "storeToken": false,
-      "addReadTokenRoleOnCreate": false,
-      "authenticateByDefault": false,
-      "linkOnly": false,
-      "firstBrokerLoginFlowAlias": "first broker login",
-      "config": {
-        "hideOnLoginPage": "false",
-        "userInfoUrl": "http://app-dev:8000/o/userinfo/",
-        "validateSignature": "true",
-        "acceptsPromptNoneForwardFromClient": "false",
-        "clientId": "people-idp",
-        "tokenUrl": "http://app-dev:8000/o/token/",
-        "uiLocales": "false",
-        "jwksUrl": "http://app-dev:8000/o/.well-known/jwks.json",
-        "backchannelSupported": "false",
-        "issuer": "http://app-dev:8000/o",
-        "useJwksUrl": "true",
-        "loginHint": "true",
-        "pkceEnabled": "true",
-        "pkceMethod": "S256",
-        "authorizationUrl": "http://localhost:8071/o/authorize/",
-        "clientAuthMethod": "client_secret_post",
-        "disableUserInfo": "false",
-        "syncMode": "IMPORT",
-        "clientSecret": "local-tests-only",
-        "passMaxAge": "false",
-        "defaultScope": "openid given_name usual_name email siret",
-        "allowedClockSkew": "0"
-      }
-    }
-  ],
-  "identityProviderMappers": [
-    {
-      "id": "e55dc88c-7bb5-46fb-95ad-1df701a96282",
-      "name": "Sub",
-      "identityProviderAlias": "oidc-people-local",
-      "identityProviderMapper": "oidc-username-idp-mapper",
-      "config": {
-        "template": "${CLAIM.sub}",
-        "are.claim.values.regex": "false",
-        "claims": "[{\"key\":\"\",\"value\":\"\"}]",
-        "syncMode": "FORCE",
-        "attributes": "[]",
-        "target": "BROKER_ID"
-      }
-    },
-    {
-      "id": "7e489676-8cba-49e4-aa1e-dcd1462d33f7",
-      "name": "given_name",
-      "identityProviderAlias": "oidc-people-local",
-      "identityProviderMapper": "hardcoded-attribute-idp-mapper",
-      "config": {
-        "claims": "[{\"key\":\"\",\"value\":\"\"}]",
-        "syncMode": "FORCE",
-        "are.claim.values.regex": "false",
-        "attributes": "[]",
-        "attribute": "firstName"
-      }
-    },
-    {
-      "id": "30b6b3bc-5738-4936-bf88-c540b8805998",
-      "name": "usual_name",
-      "identityProviderAlias": "oidc-people-local",
-      "identityProviderMapper": "oidc-user-attribute-idp-mapper",
-      "config": {
-        "template": "${ALIAS}.${CLAIM.preferred_username}",
-        "are.claim.values.regex": "false",
-        "claims": "[{\"key\":\"profile\",\"value\":\"lastName\"}]",
-        "syncMode": "FORCE",
-        "claim": "profile",
-        "user.attribute": "lastName",
-        "attributes": "[]",
-        "target": "LOCAL"
-      }
-    },
-    {
-      "id": "b67caa26-4571-4cfe-9c15-68e022645fc5",
-      "name": "Username",
-      "identityProviderAlias": "oidc-people-local",
-      "identityProviderMapper": "oidc-username-idp-mapper",
-      "config": {
-        "template": "${CLAIM.email | lowercase}",
-        "are.claim.values.regex": "false",
-        "claims": "[{\"key\":\"\",\"value\":\"\"}]",
-        "syncMode": "FORCE",
-        "attributes": "[]",
-        "target": "BROKER_USERNAME"
-      }
-    },
-    {
-      "id": "4eef21ce-b5f7-4753-bd58-4e50eb2b5f31",
-      "name": "Email",
-      "identityProviderAlias": "oidc-people-local",
-      "identityProviderMapper": "oidc-user-attribute-idp-mapper",
-      "config": {
-        "are.claim.values.regex": "false",
-        "claims": "[{\"key\":\"\",\"value\":\"\"}]",
-        "syncMode": "FORCE",
-        "claim": "email",
-        "user.attribute": "email",
-        "attributes": "[]"
-      }
-    },
-    {
-      "id": "084cdd0e-0794-4388-8474-84c9a7c1b9c8",
-      "name": "siret",
-      "identityProviderAlias": "oidc-people-local",
-      "identityProviderMapper": "oidc-user-attribute-idp-mapper",
-      "config": {
-        "syncMode": "FORCE",
-        "claim": "siret",
-        "user.attribute": "siret"
-      }
-    }
-  ],
+  "identityProviders": [],
+  "identityProviderMappers": [],
  "components": {
    "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
      {
@@ -2374,7 +2195,7 @@
          "authenticatorConfig": "review profile config",
          "authenticator": "idp-review-profile",
          "authenticatorFlow": false,
-          "requirement": "DISABLED",
+          "requirement": "REQUIRED",
          "priority": 10,
          "autheticatorFlow": false,
          "userSetupAllowed": false
@@ -1,63 +0,0 @@
-# Internationalization (i18n)
-
-The backend and the frontend of the application are internationalized.
-This means that the application can be translated into different languages. 
-The application is currently available in English and French.
-
-## Local setup
-
-To be able to upload/retrieve translation files to/from Crowdin you need to
-setup your local environment with the following environment variables:
-
-```bash
-cp ./env.d/development/crowdin.dist ./env.d/development/crowdin
-```
-
-Then fill "CROWDIN_API_TOKEN" with your token and "CROWDIN_PROJECT_ID" with the project id
-in the `./env.d/development/crowdin` file.
-
-NB: If you don't have a personal Crowdin API token, go to Crowdin interface to generate it: 
-Settings -> API -> Personal Access Tokens -> New token
-
-This configuration file will be loaded by the crowdin docker instance.
-
-
-## How to update the translations
-
-### First way (safe way)
-
-1/ Generate the translation files for both frontend and backend
-  ```bash
-  make i18n-generate
-  ```
-  Check locally everything is ok before uploading the files to the translation platform.
-
-2/ Upload the files to the translation platform (crowdin):
-  ```bash
-  make crowdin-upload
-  ```
-
-3/ Fill the missing translations on the translation platform:
-
-  => [https://crowdin.com/project/lasuite-people](https://crowdin.com/project/lasuite-people)  
-
-4/ Download the translated files from the translation platform and compile them:
-  ```bash
-  make i18n-download-and-compile
-  ```
-
-### Second way (faster way)
-
-1/ Generate the translation files for both frontend and backend and upload them to the translation platform (crowdin):
-  ```bash
-  make i18n-generate-and-upload
-  ```
-
-2/ Fill the missing translations on the translation platform:
-  
-  => [https://crowdin.com/project/lasuite-people](https://crowdin.com/project/lasuite-people)  
-
-3/ Download the translated files from the translation platform and compile them:
-  ```bash
-  make i18n-download-and-compile
-  ```
@@ -1,100 +0,0 @@
-# People as an Identity Provider
-
-The people project can be configured to act as an Identity Provider for an OIDC federation.
-
-The model containing the "identity" in `people` is the `Mailbox` model.
-
-The connection workflow looks like:
-
- - The user tries to reach a service provider.
- - The service provider redirects the user to OIDC federation (in dev we use Keycloak).
- - The user asks (or is redirected) to the Identity Provider (people).
- - The user enter their email and password.
- - If successful, the user is redirected to the OIDC federation with a token.
- - The federation make the same Authorization Flow as usual to authenticate on the Service Provider.
-
-
-## Technical aspects
-
-### The `Mailbox` model
-
-The `Mailbox` model can behave like a usual Django user:
-
- - It has a `password` field (and `last_login`)
- - It is considered as `authenticated`.
- - To be `active` it must have an `enabled` status.
- - To be able to log in, it must also have a `MailboxDomain` with an `enabled` status and an associated `Organization`.
-
-### The `MailboxModelBackend` authentication backend
-
-This authentication backend only allow authentication with `email` and `password` with a `Mailbox` user.
-This backend is combined with the `one_time_email_authenticated_session` middleware to restrict
-the session to the OIDC login process.
-A user connecting with this backend will only be able to access the `/o/authorize/` URL.
-
-### The OIDC validators
-
-There are two validators available:
-
- - `BaseValidator`: This validator retrieves simple claims
- - `ProConnectValidator`: This validator is a custom validator to allow ProConnect specific requirements.
-
-
-## Configuration
-
-The keycloak configuration is not described here, but you may find information in the code base.
-
-### Django settings
-
-The following settings are required to enable the OIDC Identity Provider feature:
-
- - OAUTH2_PROVIDER_OIDC_ENABLED: True
- - OAUTH2_PROVIDER_OIDC_RSA_PRIVATE_KEY: ...
-
-Optional:
-
- - OAUTH2_PROVIDER_VALIDATOR_CLASS: "mailbox_oauth2.validators.ProConnectValidator"
-
-If the `OAUTH2_PROVIDER_VALIDATOR_CLASS` is set to the `ProConnectValidator`, the claims will be
-automatically defined to match the ProConnect requirements.
-
-### Django OIDC application
-
-To enable an OIDC client to use people, you must declare it.
-
-```python
-from oauth2_provider.models import Application
-
-application = Application(
-    client_id="people-idp",
-    client_secret="local-tests-only",
-    client_type=Application.CLIENT_CONFIDENTIAL,
-    authorization_grant_type=Application.GRANT_AUTHORIZATION_CODE,
-    name="People Identity Provider",
-    algorithm=Application.RS256_ALGORITHM,
-    redirect_uris="http://localhost:8083/realms/people/broker/oidc-people-local/endpoint",
-    skip_authorization=True,
-)
-application.clean()
-application.save()
-```
-
-## Security concerns
-
-### Failed login cooldown
-
-To prevent brute force attacks, 5 failed login will trigger a cooldown of 5 minutes before being able to log in again.
-
-### Password strength
-
-There is currently no constraint on the password strength as it can only be defined by Django administrators,
-and later we will generate it.
-If at some point the user is allowed to set their password, we will need to enforce a password strength policy.
-
-
-## What is missing (next steps)
-
- `Mailbox` password can only be set through Django Admin panel (or shell), the next step will be to generate 
-  a secure password and send it or display it to the end user.
- `MailboxDomain` organization can only be set through Django Admin panel (or shell), we need to provide a
-  way to auto-select it or allow an administrator to do so.
@@ -2,49 +2,44 @@

 ## What is dimail ? 

-The mailing solution provided in La Suite is [La Messagerie](https://webmail.numerique.gouv.fr/), using [Open-XChange](https://www.open-xchange.com/) (OX). OX not having a provisioning API, 'dimail-api' or 'dimail' was created to allow mail-provisioning through People.
+The mailing solution provided in La Suite is [Open-XChange](https://www.open-xchange.com/) (OX). 
+OX not having a provisioning API, 'dimail-api' or 'dimail' was created to allow mail-provisioning through People.

 API and its documentation can be found [here](https://api.dev.ox.numerique.gouv.fr/docs#/).

-## Use of dimail container
+## Architectural links of dimail

-To ease local development, dimail provides a container that we embark in our docker-compose. In "FAKE" mode, it simulates all responses from Open Exchange.
-
-Bootstraping with command `make bootstrap` creates a container and initializes its database.
-
-Additional commands : 
- Reset and populate the database with all the content of your People database with `dimail-setup-db`
-
-## Architecture
+As dimail's primary goal is to act as an interface between People and OX, its architecture is similar to that of People. A series of requests are sent from People to dimail upon creating domains, users, permissions and mailboxes.

 ### Domains

 Upon creating a domain on People, the same domain is created on dimail and will undergo a series of checks. When all checks have passed, the domain is considered enabled. 

-Domains in OX have a field called "context". "Contexts" are shared spaces between domains, allowing users to discover users not only on their domain but on their entire context.
-> [!NOTE]   
-> Contexts are only implemented in La Messagerie and are not currently in use in People. Domains created via People are in their own context.
-
-People users can have 3 levels of permissions on a domain:
- Viewers can
-    - see the domain's information
-    - list its mailboxes and managers
- Administrators can
-    - create mailboxes
-    - invite collaborators to manage domain
-    - change role of a viewer to administrators
-    - all of viewers permissions
- Owners can
-    - promote administrators owners and demote owners
-    - all of viewers and administrators' permissions
-> [!NOTE]   
-> Contexts are only implemented in La Messagerie and are not currently in use in People. Domains created via People are in their own context.
-
+Domains in OX have a field called "context". Context is a shared space between domains, allowing users to discover users not only on their domain but on their entire context.

 ### Mailboxes 

 Mailboxes can be created by a domain owners or administrators in People's domain tab.

 On enabled domains, mailboxes are created at the same time on dimail (and a confirmation email is sent to the secondary email).
-On pending/failed domains, mailboxes are only created locally with "pending" status and are sent to dimail upon domain's (re)activation.
+On pending/failed domains, mailboxes are only created locally with "pending" status and are sent to dimail upon domain's activation.
 On disabled domains, mailboxes creation is not allowed.
+
+### Users
+
+The ones issuing requests. Dimail users will reflect domains owners and administrators on People, for logging purposes and to allow direct use of dimail, if desired. User reconciliation is made on user uuid provided by ProConnect.
+
+### Permissions
+
+As for People, an access - a permissions (or an "allow" in dimail) - grants an user permission to create objects on a domain.
+
+Permissions requests are sent automatically upon : 
+- dimail database initialisation: 
+    + permission for dimail user People to create users and domains
+- domain creation : 
+    + permission for dimail user People to manage domain
+    + permission for new owner on new domain
+- user creation:
+    + permission for People to manage user
+- access creation, if owner or admin:
+    + permission for this user to manage domain
@@ -5,8 +5,6 @@ Tilt is a tool that helps you develop applications for Kubernetes.
 It watches your files for changes, rebuilds your containers, and restarts your pods. 
 It's like having a conversation with your cluster.

-This is particularly useful when working on integrations or to test your helm charts.
-Otherwise, you can use your good old docker configuration as described in README.md. 

 ## Prerequisites

@@ -15,55 +13,113 @@ This guide assumes you have the following tools installed:
 - [Docker](https://docs.docker.com/get-docker/)
 - [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
 - [Kind](https://kind.sigs.k8s.io/docs/user/quick-start/)
-  * [mkcert](https://github.com/FiloSottile/mkcert)
+  * [mkcert](https://github.com/FiloSottile/mkcert) 
 - [ctlptl](https://github.com/tilt-dev/ctlptl)
 - [Tilt](https://docs.tilt.dev/install.html)
  * [helm](https://helm.sh/docs/intro/install/)
  * [helmfile](https://github.com/helmfile/helmfile)
  * [secrets](https://github.com/jkroepke/helm-secrets/wiki/Installation)
+  * [sops](https://github.com/getsops/sops)
+
+
+### SOPS configuration
+
+**Generate a SOPS key**
+
+For this specific step you need to have the `age-keygen` tool installed.
+See https://github.com/FiloSottile/age.
+Then generate a key:
+
+```bash
+age-keygen -o my-age.key
+```
+
+**Install the SOPS key**
+
+Read the SOPS documentation on how to install the key in your environment.
+https://github.com/getsops/sops?tab=readme-ov-file#22encrypting-using-age
+
+On Ubuntu it's like:
+
+```bash
+mkdir -p ~/.config/sops/age/
+cp my-age.key ~/.config/sops/age/keys.txt
+chmod 400 ~/.config/sops/age/keys.txt
+```
+
+**Add the SOPS key to the repository**
+
+Update the [.sops.yaml](../.sops.yaml) file with the **public** key id you generated.

-[Install_prereq script](https://github.com/numerique-gouv/dk8s/blob/main/scripts/install-prereq.sh) (not tested).

 ### Helmfile in Docker

+If you use helmfile in Docker, you may need an additional configuration to make 
+it work with you age key.
+
+You need to mount `-v "${HOME}/.config/sops/age/:/helm/.config/sops/age/"`
+
 ```bash
 #!/bin/sh

 docker run --rm --net=host \
   -v "${HOME}/.kube:/root/.kube" \
   -v "${HOME}/.config/helm:/root/.config/helm" \
+   -v "${HOME}/.config/sops/age/:/helm/.config/sops/age/" \
   -v "${HOME}/.minikube:/${HOME}/.minikube" \
   -v "${PWD}:/wd" \
   -e KUBECONFIG=/root/.kube/config \
   --workdir /wd ghcr.io/helmfile/helmfile:v0.150.0 helmfile "$@"
 ```

-## Create the kubernetes cluster
+
+## Getting started
+
+### Create the kubernetes cluster

 Run the following command to create a kubernetes cluster using kind:

 ```bash
-make start-kind
+./bin/start-kind.sh
+```

-# import your secrets from credentials manager
-# ! don't forget "https" before your url
+**or** run the equivalent using the makefile
+
+```bash
+make start-kind
+```
+
+### [Optional] Install the secret
+
+You don't need to do this if you are running the stack with keycloak.
+
+```bash
 make install-external-secrets
 ```

+### Deploy the application
+
+```bash
+# Pro Connect environment
+tilt up -f ./bin/Tiltfile 
+
+# Standalone environment with keycloak
+DEV_ENV=dev-keycloak tilt up -f ./bin/Tiltfile
+```
+
+**or** run the equivalent using the makefile
+
+```bash
+# Pro Connect environment
+make tilt-up
+
+# Standalone environment with keycloak
+make tilt-up-keycloak
+```
+
 That's it! You should now have a local development environment for Kubernetes.

-## Start the application
-
-```bash
-# You can either start :
-# ProConnect stack (but secrets must be set on your local cluster)
-make tilt-up
-
-# or standalone environment with keycloak
-make start-tilt-keycloak
-```
-
-Access your application at https://desk.127.0.0.1.nip.io 
+You can access the application at https://desk.127.0.0.1.nip.io

 ## Management

@@ -1,68 +0,0 @@
-# Releasing a new version
-
-Whenever we are cooking a new release (e.g. `4.18.1`) we should follow a standard procedure described below:
-
-1.  Checkout and pull changes from the `main` branch to ensure you have the latest updates.
-
-    ```bash
-    git checkout main
-    git pull
-    ```
-
-2.  The next steps are automated in the `scripts/release.py`, you can run it using:
-
-    ```bash
-    make release
-    ```
-
-    This script will ask you for the version you want to release and the kind of release (patch, minor, major). It will then:
-
-    - Create a new branch named: `release/4.18.1`.
-
-    - Bump the release number for backend and frontend project.
-
-    - Update the project's `Changelog` following the [keepachangelog](https://keepachangelog.com/en/0.3.0/) recommendations
-
-    - Commit your changes with the following format: 🔖 release emoji, type of release (patch/minor/patch) and release version:
-    
-        ```text
-        🔖(minor) release version 4.18.1
-        ```
-
-    - Triggers Crowdin translation action and open related PR
-
-    - Open release PR. Wait for an approval from your peers and merge it.
-
-    > [!NOTE]  
-    > It also open the PR for pre-prod deployment, see following section.
-
-3.  Following release script instructions, 
-
-    - merge translation and release pulls requests
-
-    - tag and push your commit:
-
-    ```bash
-    git tag v4.18.1 && git push origin tag v4.18.1
-    ```
-
-    This triggers the CI building new Docker images. You can ensure images were successfully built on Docker Hub [here for back-end](https://hub.docker.com/r/lasuite/people-backend/tags) and [here for front-end](https://hub.docker.com/r/lasuite/people-frontend/tags).
-
-
-# Deploying 
-
-## Staging
-
-The `staging` platform is deployed automatically with every update of the `main` branch.
-
-## Pre-prod and production
-
-If you used the release script and had permission to push on [lasuite-deploiement](https://github.com/numerique-gouv/lasuite-deploiement), a deployment branch has been created. You can skip step 1.
-
-Otherwise, for manual preprod and for production deployments :
-1. Bump tag version for both front-end and back-end images in the `.gotmpl` file located in `manifests/<your-product>/env.d/<your-environment>/`, 
-2. Add optional new secrets and variables, if applicable
-3. Create a pull request
-4. Submit to approval and merge PR
-
-The release is now done! 🎉
@@ -3,7 +3,6 @@ DJANGO_ALLOWED_HOSTS=*
 DJANGO_SECRET_KEY=ThisIsAnExampleKeyForDevPurposeOnly
 DJANGO_SETTINGS_MODULE=people.settings
 DJANGO_SUPERUSER_PASSWORD=admin
-DJANGO_CORS_ALLOWED_ORIGINS=http://localhost:3000

 # Python
 PYTHONPATH=/app
@@ -11,7 +10,7 @@ PYTHONPATH=/app
 # People settings

 # Mail
-DJANGO_EMAIL_HOST="maildev"
+DJANGO_EMAIL_HOST="mailcatcher"
 DJANGO_EMAIL_PORT=1025

 # Backend url
@@ -66,6 +65,3 @@ IH5em4M/pHIcsqCi1qggBMbdvzHBUtC3R4sK0CpEFHlN+Y59aGazidcN2FPupNJv
 MbyqKyC6DAzv4jEEhHaN7oY=
 -----END PRIVATE KEY-----
 "
-
-# INTEROP
-MAIL_PROVISIONING_API_CREDENTIALS="bGFfcmVnaWU6cGFzc3dvcmQ=" # Dev and test key for dimail interop
@@ -1,10 +1,3 @@
 # For the CI job test-e2e
 SUSTAINED_THROTTLE_RATES="200/hour"
 BURST_THROTTLE_RATES="200/minute"
-
-OIDC_ORGANIZATION_REGISTRATION_ID_FIELD="siret"
-
-OAUTH2_PROVIDER_OIDC_ENABLED=True
-OAUTH2_PROVIDER_VALIDATOR_CLASS="mailbox_oauth2.validators.ProConnectValidator"
-
-INSTALLED_PLUGINS=plugins.la_suite
@@ -1 +0,0 @@
-INSTALLED_PLUGINS=plugins.la_suite
@@ -13,12 +13,7 @@
      "enabled": false,
      "groupName": "ignored js dependencies",
      "matchManagers": ["npm"],
-      "matchPackageNames": ["fetch-mock", "node", "node-fetch", "eslint", "@hookform/resolvers"]
-    },
-    {
-      "groupName": "docker-compose dependencies",
-      "matchManagers": ["docker-compose"],
-      "matchPackageNames": ["dimail-api"]
+      "matchPackageNames": ["fetch-mock", "node", "node-fetch", "eslint"]
    }
  ]
 }
@@ -1,149 +0,0 @@
-#!/bin/bash
-
-# Script to add a new client to Keycloak using the kcadm.sh CLI
-# Usage: ./add-keycloak-client.sh [client_id] [client_secret]
-
-# Default values
-CLIENT_ID=${1:-"some-client-id"}
-CLIENT_SECRET=${2:-"ThisIsAnExampleKeyForDevPurposeOnly"}
-KEYCLOAK_URL=${KEYCLOAK_URL:-"http://keycloak:8080"}
-KEYCLOAK_ADMIN=${KEYCLOAK_ADMIN:-"admin"}
-KEYCLOAK_ADMIN_PASSWORD=${KEYCLOAK_ADMIN_PASSWORD:-"admin"}
-REALM=${REALM:-"people"}
-
-# Check for kcadm.sh in common locations
-KCADM_LOCATIONS=(
-  "/opt/keycloak/bin/kcadm.sh"
-  "/opt/jboss/keycloak/bin/kcadm.sh"
-  "/usr/local/bin/kcadm.sh"
-  "./bin/kcadm.sh"
-  "$(which kcadm.sh 2>/dev/null)"
-)
-
-KCADM=""
-for loc in "${KCADM_LOCATIONS[@]}"; do
-  if [ -x "$loc" ]; then
-    KCADM="$loc"
-    break
-  fi
-done
-
-if [ -z "$KCADM" ]; then
-  echo "Error: kcadm.sh not found. Please specify its location manually."
-  echo "You can set the KCADM environment variable to the path of kcadm.sh"
-  exit 1
-fi
-
-echo "Using Keycloak Admin CLI at: $KCADM"
-echo "Logging in to Keycloak at $KEYCLOAK_URL..."
-
-# Login to Keycloak
-$KCADM config credentials \
-  --server $KEYCLOAK_URL \
-  --realm master \
-  --user $KEYCLOAK_ADMIN \
-  --password $KEYCLOAK_ADMIN_PASSWORD
-
-if [ $? -ne 0 ]; then
-  echo "Failed to login to Keycloak. Please check your credentials and try again."
-  exit 1
-fi
-
-echo "Successfully logged in to Keycloak."
-echo "Creating new client '$CLIENT_ID' in realm '$REALM'..."
-
-# Create a temporary JSON file with client configuration
-CLIENT_JSON=$(mktemp)
-cat > "$CLIENT_JSON" << EOF
-{
-  "clientId": "$CLIENT_ID",
-  "name": "",
-  "description": "",
-  "rootUrl": "",
-  "adminUrl": "",
-  "baseUrl": "",
-  "surrogateAuthRequired": false,
-  "enabled": true,
-  "alwaysDisplayInConsole": false,
-  "clientAuthenticatorType": "client-secret",
-  "secret": "$CLIENT_SECRET",
-  "redirectUris": [
-    "http://localhost:8070/*",
-    "http://localhost:8071/*",
-    "http://localhost:3200/*",
-    "http://localhost:8088/*",
-    "http://localhost:3000/*"
-  ],
-  "webOrigins": [
-    "http://localhost:3200",
-    "http://localhost:8088",
-    "http://localhost:8070",
-    "http://localhost:3000"
-  ],
-  "notBefore": 0,
-  "bearerOnly": false,
-  "consentRequired": false,
-  "standardFlowEnabled": true,
-  "implicitFlowEnabled": false,
-  "directAccessGrantsEnabled": false,
-  "serviceAccountsEnabled": false,
-  "publicClient": false,
-  "frontchannelLogout": true,
-  "protocol": "openid-connect",
-  "attributes": {
-    "access.token.lifespan": "-1",
-    "client.secret.creation.time": "$(date +%s)",
-    "user.info.response.signature.alg": "RS256",
-    "post.logout.redirect.uris": "http://localhost:8070/*##http://localhost:3200/*##http://localhost:3000/*",
-    "oauth2.device.authorization.grant.enabled": "false",
-    "use.jwks.url": "false",
-    "backchannel.logout.revoke.offline.tokens": "false",
-    "use.refresh.tokens": "true",
-    "tls-client-certificate-bound-access-tokens": "false",
-    "oidc.ciba.grant.enabled": "false",
-    "backchannel.logout.session.required": "true",
-    "client_credentials.use_refresh_token": "false",
-    "acr.loa.map": "{}",
-    "require.pushed.authorization.requests": "false",
-    "display.on.consent.screen": "false",
-    "client.session.idle.timeout": "-1",
-    "token.response.type.bearer.lower-case": "false"
-  },
-  "authenticationFlowBindingOverrides": {},
-  "fullScopeAllowed": true,
-  "nodeReRegistrationTimeout": -1,
-  "defaultClientScopes": [
-    "web-origins",
-    "acr",
-    "roles",
-    "profile",
-    "email"
-  ],
-  "optionalClientScopes": [
-    "address",
-    "phone",
-    "offline_access",
-    "microprofile-jwt"
-  ]
-}
-EOF
-
-# Create the client using kcadm.sh
-$KCADM create clients -r "$REALM" -f "$CLIENT_JSON"
-
-if [ $? -ne 0 ]; then
-  echo "Failed to create client. Check the error message above."
-  rm "$CLIENT_JSON"
-  exit 1
-fi
-
-echo "✅ Client '$CLIENT_ID' created successfully!"
-echo "  Client ID: $CLIENT_ID"
-echo "  Client Secret: $CLIENT_SECRET"
-
-# Clean up temporary file
-rm "$CLIENT_JSON"
-
-# Display the created client
-echo "Client details:"
-$KCADM get clients -r "$REALM" --query "clientId=$CLIENT_ID"
@@ -76,7 +76,7 @@ def update_changelog(path, version):
        file.writelines(lines)


-def deployment_part(version):
+def deployment_part(version, kind):
    """ Update helm file of preprod on deployment repository numerique-gouv/lasuite-deploiement
    """
    # Move to lasuite-deploiement repository
@@ -95,22 +95,19 @@ def deployment_part(version):
        path = f"manifests/regie/env.d/preprod/values.desk.yaml.gotmpl"
        update_helm_files(path)
        run_command(f"git add {path}", shell=True)
-        message = f"""🔖(regie) bump preprod version to {version}"""
+        message = f"""🔖({RELEASE_KINDS[kind]}) release version {version}"""
        run_command(f"git commit -m '{message}'", shell=True)
        confirm = input(f"""\033[0;32m
 ### DEPLOYMENT ###
 NEXT COMMAND on lasuite-deploiement repository: 
    >> git push origin {deployment_branch}
 Continue ? (y,n) 
-\x1b[0m""").strip()
+\x1b[0m""")
        if confirm == 'y':
            run_command(f"git push origin {deployment_branch}", shell=True)
        sys.stdout.write(f"""\033[1;34m
 PLEASE DO THE FOLLOWING INSTRUCTIONS: 
--> Check if you need to bump chart version in the manifests/regie/helmfile.yaml file
-    and settings in the manifests/regie/env.d/preprod/values.desk.yaml.gotmpl file
-    add commits into {deployment_branch} branch to do it if needed, then...
--> Please submit PR {deployment_branch} and merge code to main [https://github.com/numerique-gouv/lasuite-deploiement]
+--> Please submit PR {deployment_branch} and merge code to main
 \x1b[0m""")


@@ -128,21 +125,19 @@ def project_part(version, kind):
    run_command("git add src/", shell=True)
    message = f"""🔖({RELEASE_KINDS[kind]}) release version {version}

-Update all version files and changelog for {RELEASE_KINDS[kind]} release."""
+        Update all version files and changelog for {RELEASE_KINDS[kind]} release."""
    run_command(f"git commit -m '{message}'", shell=True)
    confirm = input(f"""\033[0;32m
 ### RELEASE ###
 NEXT COMMAND on current repository:
    >> git push origin {branch_to_release}
 Continue ? (y,n)
-\x1b[0m""").strip()
+\x1b[0m""")
    if confirm == 'y':
        run_command(f"git push origin {branch_to_release}", shell=True)
    sys.stdout.write(f"""
 \033[1;34mPLEASE DO THE FOLLOWING INSTRUCTIONS:
--> A github action will download last translations from crowdin and create a PR (i18n/update-translations) to merge into the release branch.
-    Please wait for this, approve and merge this translations PR into the release branch {branch_to_release}.
--> Then please submit PR {branch_to_release} and merge code to main [https://github.com/suitenumerique/people/]
+--> Please submit PR {branch_to_release} and merge code to main 
 --> Then do:
    >> git checkout main
    >> git pull
@@ -158,9 +153,9 @@ Continue ? (y,n)
 if __name__ == "__main__":
    version, kind = None, None
    while not version:
-        version = input("Enter your release version:").strip()
+        version = input("Enter your release version:")
    while kind not in RELEASE_KINDS:
-        kind = input("Enter kind of release (p:patch, m:minor, mj:major):").strip()
+        kind = input("Enter kind of release (p:patch, m:minor, mj:major):")
    if "--only-deployment-part" not in sys.argv:
        project_part(version, kind)
-    deployment_part(version)
+    deployment_part(version, kind)
@@ -0,0 +1 @@
+"""People custom admin site."""
@@ -0,0 +1,9 @@
+"""Custom Django admin site application configuration."""
+
+from django.contrib.admin.apps import AdminConfig
+
+
+class PeopleAdminConfig(AdminConfig):
+    """Declare our custom Django admin site."""
+
+    default_site = "admin.sites.PeopleAdminSite"
@@ -0,0 +1,15 @@
+"""Custom Django admin site for the People app."""
+
+from django.conf import settings
+from django.contrib import admin
+
+
+class PeopleAdminSite(admin.AdminSite):
+    """People custom admin site."""
+
+    def each_context(self, request):
+        """Add custom context to the admin site."""
+        return super().each_context(request) | {
+            "ADMIN_HEADER_BACKGROUND": settings.ADMIN_HEADER_BACKGROUND,
+            "ADMIN_HEADER_COLOR": settings.ADMIN_HEADER_COLOR,
+        }
@@ -0,0 +1,13 @@
+{% extends "admin/base_site.html" %}
+
+{% block extrastyle %}{{ block.super }}
+<style>
+html[data-theme="light"], :root {
+  {% if ADMIN_HEADER_BACKGROUND %}--header-bg: {{ ADMIN_HEADER_BACKGROUND }};{% endif %}
+  {% if ADMIN_HEADER_COLOR %}--header-color: {{ ADMIN_HEADER_COLOR }};{% endif %}
+}
+ul.messagelist li.info {
+    background-color: #EEEEEE;
+}
+</style>
+{% endblock %}
@@ -1,30 +0,0 @@
-"""Global fixtures for the backend tests."""
-
-import pytest
-from urllib3.connectionpool import HTTPConnectionPool
-
-
-@pytest.fixture(autouse=True)
-def no_http_requests(monkeypatch):
-    """
-    Prevents HTTP requests from being made during tests.
-    This is useful for tests that do not require actual HTTP requests
-    and helps to avoid network-related issues.
-
-    Credits: https://blog.jerrycodes.com/no-http-requests/
-    """
-
-    allowed_hosts = {"localhost"}
-    original_urlopen = HTTPConnectionPool.urlopen
-
-    def urlopen_mock(self, method, url, *args, **kwargs):
-        if self.host in allowed_hosts:
-            return original_urlopen(self, method, url, *args, **kwargs)
-
-        raise RuntimeError(
-            f"The test was about to {method} {self.scheme}://{self.host}{url}"
-        )
-
-    monkeypatch.setattr(
-        "urllib3.connectionpool.HTTPConnectionPool.urlopen", urlopen_mock
-    )
@@ -1,6 +1,5 @@
 """Admin classes and registrations for People's core app."""

-from django.conf import settings
 from django.contrib import admin, messages
 from django.contrib.auth import admin as auth_admin
 from django.utils.translation import gettext_lazy as _
@@ -11,7 +10,10 @@ from treebeard.forms import movenodeform_factory
 from mailbox_manager.admin import MailDomainAccessInline

 from . import models
-from .plugins.registry import registry as plugin_hooks_registry
+from .plugins.loader import (
+    get_organization_plugins,
+    organization_plugins_run_after_create,
+)


 class TeamAccessInline(admin.TabularInline):
@@ -58,17 +60,7 @@ class UserAdmin(auth_admin.UserAdmin):
                )
            },
        ),
-        (
-            _("Personal info"),
-            {
-                "fields": (
-                    "name",
-                    "email",
-                    "language",
-                    "timezone",
-                )
-            },
-        ),
+        (_("Personal info"), {"fields": ("name", "email", "language", "timezone")}),
        (
            _("Permissions"),
            {
@@ -227,7 +219,7 @@ class OrganizationServiceProviderInline(admin.TabularInline):
 def run_post_creation_plugins(modeladmin, request, queryset):  # pylint: disable=unused-argument
    """Run the post creation plugins for the selected organizations."""
    for organization in queryset:
-        plugin_hooks_registry.execute_hook("organization_created", organization)
+        organization_plugins_run_after_create(organization)

    messages.success(
        request,
@@ -242,11 +234,9 @@ class OrganizationAdmin(admin.ModelAdmin):
    actions = [run_post_creation_plugins]
    list_display = (
        "name",
-        "is_active",
        "created_at",
        "updated_at",
    )
-    list_filter = ("is_active",)
    search_fields = ("name",)
    inlines = (OrganizationAccessInline, OrganizationServiceProviderInline)
    exclude = ("service_providers",)  # Handled by the inline
@@ -254,7 +244,7 @@ class OrganizationAdmin(admin.ModelAdmin):
    def get_actions(self, request):
        """Adapt actions list to the context."""
        actions = super().get_actions(request)
-        if not plugin_hooks_registry.get_callbacks("organization_created"):
+        if not get_organization_plugins():
            actions.pop("run_post_creation_plugins", None)
        return actions

@@ -285,20 +275,3 @@ class ServiceProviderAdmin(admin.ModelAdmin):
    )
    search_fields = ("name", "audience_id")
    readonly_fields = ("created_at", "updated_at")
-
-
-@admin.register(models.AccountService)
-class AccountServiceAdmin(admin.ModelAdmin):
-    """Admin interface for account services."""
-
-    list_display = ("name", "created_at", "updated_at")
-    readonly_fields = ("api_key", "created_at", "updated_at")
-
-    def get_form(self, request, obj=None, change=False, **kwargs):
-        """Add help text to the scopes field to provide list of available scopes."""
-        form = super().get_form(request, obj, change, **kwargs)
-        form.base_fields[
-            "scopes"
-        ].help_text = f"Scopes define what the service can access. \
-            Available scopes: {', '.join(settings.ACCOUNT_SERVICE_SCOPES)}"
-        return form
@@ -251,7 +251,6 @@ class TeamSerializer(serializers.ModelSerializer):
    """Serialize teams."""

    abilities = serializers.SerializerMethodField(read_only=True)
-    is_visible_all_services = serializers.BooleanField(required=False, default=True)
    service_providers = serializers.PrimaryKeyRelatedField(
        queryset=ServiceProvider.objects.all(), many=True, required=False
    )
@@ -264,7 +263,6 @@ class TeamSerializer(serializers.ModelSerializer):
            "accesses",
            "created_at",
            "depth",
-            "is_visible_all_services",
            "name",
            "numchild",
            "path",
@@ -7,7 +7,6 @@ from functools import reduce
 from django.conf import settings
 from django.db.models import OuterRef, Q, Subquery, Value
 from django.db.models.functions import Coalesce
-from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_page

@@ -29,7 +28,6 @@ from core.api import permissions
 from core.api.client import serializers
 from core.utils.raw_sql import gen_sql_filter_json_array

-from mailbox_manager import enums
 from mailbox_manager import models as domains_models


@@ -146,7 +144,7 @@ class ContactViewSet(
    """Contact ViewSet"""

    permission_classes = [permissions.AccessPermission]
-    queryset = models.Contact.objects.select_related("user", "owner").all()
+    queryset = models.Contact.objects.select_related("user").all()
    serializer_class = serializers.ContactSerializer
    throttle_classes = [BurstRateThrottle, SustainedRateThrottle]
    ordering_fields = ["full_name", "short_name", "created_at"]
@@ -263,10 +261,9 @@ class UserViewSet(
        queryset = self.queryset

        if self.action == "list":
-            # Filter active users
-            # and users from same organization
+            # Exclude inactive contacts
            queryset = queryset.filter(
-                is_active=True, organization_id=self.request.user.organization_id
+                is_active=True,
            )

            # Exclude all users already in the given team
@@ -586,13 +583,7 @@ class ConfigView(views.APIView):
        GET /api/v1.0/config/
            Return a dictionary of public settings.
        """
-        array_settings = [
-            "LANGUAGES",
-            "FEATURES",
-            "RELEASE",
-            "COMMIT",
-            "CRISP_WEBSITE_ID",
-        ]
+        array_settings = ["LANGUAGES", "FEATURES", "RELEASE", "COMMIT"]
        dict_settings = {}
        for setting in array_settings:
            dict_settings[setting] = getattr(settings, setting)
@@ -614,14 +605,11 @@ class StatView(views.APIView):
        context = {
            "total_users": models.User.objects.count(),
            "mau": models.User.objects.filter(
-                last_login__gte=timezone.now() - datetime.timedelta(30)
+                last_login__gte=datetime.datetime.now() - datetime.timedelta(30)
            ).count(),
            "teams": models.Team.objects.count(),
-            "active_domains": domains_models.MailDomain.objects.filter(
-                status=enums.MailDomainStatusChoices.ENABLED
-            ).count(),
+            "domains": domains_models.MailDomain.objects.count(),
            "mailboxes": domains_models.Mailbox.objects.count(),
-            "aliases": domains_models.Alias.objects.count(),
        }
        return response.Response(context)

@@ -4,8 +4,6 @@ from django.core import exceptions

 from rest_framework import permissions

-from core import models
-

 class IsAuthenticated(permissions.BasePermission):
    """
@@ -70,28 +68,3 @@ class TeamPermission(IsAuthenticated):

        abilities = request.user.get_abilities()
        return abilities["teams"]["can_create"]
-
-
-class TeamInvitationCreationPermission(IsAuthenticated):
-    """Permission class that allows only team owners and admins to perform actions."""
-
-    def has_permission(self, request, view):
-        """Check if user is authenticated and has required role for the team."""
-        if not super().has_permission(request, view):
-            return False
-
-        # Only check roles for edition operations
-        if request.method in permissions.SAFE_METHODS:
-            return True
-
-        team_id = view.kwargs.get("team_id")
-        if not team_id:
-            return False
-
-        team_access = models.TeamAccess.objects.filter(
-            team_id=team_id,
-            user=request.user,
-            role__in=[models.RoleChoices.OWNER, models.RoleChoices.ADMIN],
-        ).exists()
-
-        return team_access
@@ -1 +0,0 @@
-"""SCIM compliant API for resource server"""
@@ -1,16 +0,0 @@
-"""Exceptions for SCIM API."""
-
-from django.conf import settings
-
-from core.api.resource_server.scim.response import ScimJsonResponse
-
-
-def scim_exception_handler(exc, _context):
-    """Handle SCIM exceptions and return them in the correct format."""
-    data = {
-        "schemas": ["urn:ietf:params:scim:api:messages:2.0:Error"],
-        "status": str(exc.status_code),
-        "detail": str(exc.detail) if settings.DEBUG else "",
-    }
-
-    return ScimJsonResponse(data, status=exc.status_code)
@@ -1,16 +0,0 @@
-"""SCIM API response classes."""
-
-from rest_framework.response import Response
-
-
-class ScimJsonResponse(Response):
-    """
-    Custom JSON response class for SCIM API.
-
-    This class sets the content type to "application/json+scim" for SCIM
-    responses.
-    """
-
-    def __init__(self, *args, **kwargs):
-        """JSON response with enforced SCIM content type."""
-        super().__init__(*args, content_type="application/json+scim", **kwargs)
@@ -1,90 +0,0 @@
-"""SCIM serializers for resource server API."""
-
-from django.urls import reverse
-
-from rest_framework import serializers
-
-from core import models
-
-
-class SCIMUserSerializer(serializers.ModelSerializer):
-    """Serialize users in SCIM format."""
-
-    schemas = serializers.SerializerMethodField()
-    userName = serializers.CharField(source="sub")
-    displayName = serializers.CharField(source="name")
-    emails = serializers.SerializerMethodField()
-    meta = serializers.SerializerMethodField()
-    groups = serializers.SerializerMethodField()
-    active = serializers.BooleanField(source="is_active")
-
-    class Meta:
-        model = models.User
-        fields = [
-            "id",
-            "schemas",
-            "active",
-            "userName",
-            "displayName",
-            "emails",
-            "groups",
-            "meta",
-        ]
-        read_only_fields = [
-            "id",
-            "schemas",
-            "active",
-            "userName",
-            "displayName",
-            "emails",
-            "groups",
-            "meta",
-        ]
-
-    def get_schemas(self, _obj):
-        """Return the SCIM schemas for the user."""
-        return ["urn:ietf:params:scim:schemas:core:2.0:User"]
-
-    def get_emails(self, obj):
-        """Return the user's email as a list of email objects."""
-        if obj.email:
-            return [
-                {
-                    "value": obj.email,
-                    "primary": True,
-                    "type": "work",
-                }
-            ]
-        return []
-
-    def get_groups(self, obj):
-        """
-        Return the groups the user belongs to.
-
-        WARNING: you need to prefetch the team accesses in the
-        viewset to avoid N+1 queries.
-        """
-        return [
-            {
-                "value": str(team_access.team.external_id),
-                "display": team_access.team.name,
-                "type": "direct",
-            }
-            for team_access in obj.accesses.all()
-        ]
-
-    def get_meta(self, obj):
-        """Return metadata about the user."""
-        request = self.context.get("request")
-        location = (
-            f"{request.build_absolute_uri('/').rstrip('/')}{reverse('scim-me-list')}"
-            if request
-            else None
-        )
-
-        return {
-            "resourceType": "User",
-            "created": obj.created_at.isoformat(),
-            "lastModified": obj.updated_at.isoformat(),
-            "location": location,
-        }
@@ -1,62 +0,0 @@
-"""Resource server SCIM API endpoints"""
-
-from django.contrib.auth import get_user_model
-from django.db.models import Prefetch, Q
-
-from lasuite.oidc_resource_server.mixins import ResourceServerMixin
-from rest_framework import (
-    viewsets,
-)
-
-from core.api import permissions
-from core.models import TeamAccess
-
-from . import serializers
-from .exceptions import scim_exception_handler
-from .response import ScimJsonResponse
-
-User = get_user_model()
-
-
-class MeViewSet(ResourceServerMixin, viewsets.ViewSet):
-    """
-    SCIM-compliant ViewSet for the /Me endpoint.
-
-    This endpoint provides information about the currently authenticated user
-    in SCIM (System for Cross-domain Identity Management) format.
-
-    Features:
-    - Returns user details in SCIM format.
-    - Includes the user's teams, restricted to the audience.
-
-    Limitations:
-    - Does not currently support managing Team hierarchies.
-
-    Endpoint:
-    GET /resource-server/v1.0/scim/Me/
-        Retrieves the authenticated user's details and associated teams.
-    """
-
-    permission_classes = [permissions.IsAuthenticated]
-    serializer_class = serializers.SCIMUserSerializer
-
-    def get_exception_handler(self):
-        """Override the default exception handler to use SCIM-specific handling."""
-        return scim_exception_handler
-
-    def list(self, request, *args, **kwargs):
-        """Return the current user's details in SCIM format."""
-        service_provider_audience = self._get_service_provider_audience()
-
-        user = User.objects.prefetch_related(
-            Prefetch(
-                "accesses",
-                queryset=TeamAccess.objects.select_related("team").filter(
-                    Q(team__service_providers__audience_id=service_provider_audience)
-                    | Q(team__is_visible_all_services=True)
-                ),
-            )
-        ).get(pk=request.user.pk)
-
-        serializer = self.serializer_class(user, context={"request": request})
-        return ScimJsonResponse(serializer.data)
@@ -14,7 +14,6 @@ class TeamSerializer(serializers.ModelSerializer):
            "id",
            "created_at",
            "depth",
-            "is_visible_all_services",
            "name",
            "numchild",
            "path",
@@ -51,28 +50,3 @@ class TeamSerializer(serializers.ModelSerializer):
                "service_providers": [service_provider],
            },
        )
-
-
-class InvitationSerializer(serializers.ModelSerializer):
-    """Serialize invitations."""
-
-    class Meta:
-        model = models.Invitation
-        fields = ["id", "created_at", "email", "team", "role", "issuer", "is_expired"]
-        read_only_fields = ["id", "created_at", "team", "issuer", "is_expired"]
-
-    def validate(self, attrs):
-        """Fill team and issuer from request."""
-        is_team_available_for_service_provider = models.Team.objects.filter(
-            id=self.context["team_id"],
-            service_providers__audience_id=self.context[
-                "from_service_provider_audience"
-            ],
-        ).exists()
-        if not is_team_available_for_service_provider:
-            raise serializers.ValidationError({"team": "Team not found."})
-
-        attrs["team_id"] = self.context["team_id"]
-        attrs["issuer"] = self.context["request"].user  # User is authenticated
-
-        return attrs
@@ -6,7 +6,6 @@ from functools import reduce
 from django.db.models import OuterRef, Prefetch, Q, Subquery, Value
 from django.db.models.functions import Coalesce

-from lasuite.oidc_resource_server.mixins import ResourceServerMixin
 from rest_framework import (
    filters,
    mixins,
@@ -16,6 +15,7 @@ from rest_framework import (
 from core import models
 from core.api import permissions
 from core.api.client.viewsets import Pagination
+from core.resource_server.mixins import ResourceServerMixin

 from . import serializers

@@ -103,8 +103,7 @@ class TeamViewSet(  # pylint: disable=too-many-ancestors
                        for d in depth_path
                    ),
                ),
-                Q(service_providers__audience_id=service_provider_audience)
-                | Q(is_visible_all_services=True),
+                service_providers__audience_id=service_provider_audience,
            )
            # Abilities are computed based on logged-in user's role for the team
            # and if the user does not have access, it's ok to consider them as a member
@@ -124,79 +123,3 @@ class TeamViewSet(  # pylint: disable=too-many-ancestors
            user=self.request.user,
            role=models.RoleChoices.OWNER,
        )
-
-
-class InvitationViewset(  # pylint: disable=too-many-ancestors
-    ResourceServerMixin,
-    mixins.CreateModelMixin,
-    mixins.ListModelMixin,
-    mixins.RetrieveModelMixin,
-    mixins.DestroyModelMixin,
-    viewsets.GenericViewSet,
-):
-    """API ViewSet for user invitations to team via resource server.
-
-    GET /resource-server/v1.0/teams/<team_id>/invitations/:<invitation_id>/
-        Return list of invitations related to that team or one
-        team access if an id is provided.
-
-    POST /resource-server/v1.0/teams/<team_id>/invitations/ with expected data:
-        - email: str
-        - role: str [owner|admin|member]
-        - issuer : User, automatically added from user making query, if allowed
-        - team : Team, automatically added from requested URI
-        Return newly created invitation
-
-    PUT / PATCH : Not permitted. Instead of updating your invitation,
-        delete and create a new one.
-
-    DELETE  /resource-server/v1.0/teams/<team_id>/invitations/<invitation_id>/
-        Delete targeted invitation
-    """
-
-    lookup_field = "id"
-    pagination_class = Pagination
-    permission_classes = [permissions.AccessPermission]
-    serializer_class = serializers.InvitationSerializer
-
-    def get_permissions(self):
-        """Set specific permissions based on the action."""
-        if self.action == "list":
-            permission_classes = [permissions.IsAuthenticated]
-        elif self.action == "create":
-            permission_classes = [permissions.TeamInvitationCreationPermission]
-        else:
-            permission_classes = [permissions.AccessPermission]
-
-        return [permission() for permission in permission_classes]
-
-    def get_serializer_context(self):
-        """Extra context provided to the serializer class."""
-        context = super().get_serializer_context()
-        context["team_id"] = self.kwargs["team_id"]
-        return context
-
-    def get_queryset(self):
-        """Return the queryset according to the action."""
-        service_provider_audience = self._get_service_provider_audience()
-
-        # Determine which role the logged-in user has in the team
-        user_role_query = models.TeamAccess.objects.filter(
-            user=self.request.user, team=self.kwargs["team_id"]
-        ).values("role")[:1]
-
-        queryset = (
-            models.Invitation.objects.select_related("team")
-            .filter(
-                team=self.kwargs["team_id"],
-                # The logged-in user should be part of a team to see its accesses
-                team__accesses__user=self.request.user,
-                # The team should be accessible by the service provider audience
-                team__service_providers__audience_id=service_provider_audience,
-            )
-            .annotate(user_role=Subquery(user_role_query))
-            .order_by("-created_at")
-            .distinct()
-        )
-
-        return queryset
@@ -1,69 +1,11 @@
 """People Core application"""
-
-import logging
-
-from django.apps import AppConfig
-from django.conf import settings
-from django.core.management import call_command, get_commands
-from django.utils.translation import gettext_lazy as _
-
-from core.utils.io import TeeStringIO
-
-from people.celery_app import app as celery_app
-
-logger = logging.getLogger(__name__)
+# from django.apps import AppConfig
+# from django.utils.translation import gettext_lazy as _


-def _register_management_commands_as_task():
-    """
-    Register management command which are enabled via MANAGEMENT_COMMAND_AS_TASK setting.
-    """
-    for command_name in settings.MANAGEMENT_COMMAND_AS_TASK:
-        # Check if the command is a valid management command
-        try:
-            app_name = get_commands()[command_name]
-        except KeyError:
-            logging.error("Command %s is not a valid management command.", command_name)
-            continue
+# class CoreConfig(AppConfig):
+#     """Configuration class for the People core app."""

-        command_full_name = ".".join([app_name, command_name])
-
-        # Create a closure to capture the current value of command_full_name and command_name
-        def create_task(cmd_name, cmd_full_name):
-            @celery_app.task(name=cmd_full_name)
-            def task_wrapper(*command_args, **command_options):
-                stdout = TeeStringIO(logging.getLogger(cmd_full_name).info)
-                stderr = TeeStringIO(logging.getLogger(cmd_full_name).error)
-
-                call_command(
-                    cmd_name,
-                    *command_args,
-                    no_color=True,
-                    stdout=stdout,
-                    stderr=stderr,
-                    **command_options,
-                )
-
-                stdout.seek(0)
-                stderr.seek(0)
-                return {
-                    "stdout": str(stdout.read()),
-                    "stderr": str(stderr.read()),
-                }
-
-            return task_wrapper
-
-        # Create the task with the current values
-        create_task(command_name, command_full_name)
-
-
-class CoreConfig(AppConfig):
-    """Configuration class for the People core app."""
-
-    name = "core"
-    app_label = "core"
-    verbose_name = _("People core application")
-
-    def ready(self):
-        """Run when the application is ready."""
-        _register_management_commands_as_task()
+#     name = "core"
+#     app_label = "core"
+#     verbose_name = _("People core application")
@@ -1,65 +1,123 @@
 """Authentication Backends for the People core app."""

 import logging
+from email.headerregistry import Address
+from typing import Optional

 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.core.exceptions import SuspiciousOperation
 from django.utils.translation import gettext_lazy as _

-from lasuite.oidc_login.backends import (
-    OIDCAuthenticationBackend as LaSuiteOIDCAuthenticationBackend,
+import requests
+from mozilla_django_oidc.auth import (
+    OIDCAuthenticationBackend as MozillaOIDCAuthenticationBackend,
 )
-from lasuite.tools.email import get_domain_from_email
-from rest_framework.authentication import BaseAuthentication
-from rest_framework.exceptions import AuthenticationFailed

 from core.models import (
-    AccountService,
    Contact,
    Organization,
+    OrganizationAccess,
+    OrganizationRoleChoices,
 )

 logger = logging.getLogger(__name__)

+User = get_user_model()

-class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):
+
+def get_domain_from_email(email: Optional[str]) -> Optional[str]:
+    """Extract domain from email."""
+    try:
+        return Address(addr_spec=email).domain
+    except (ValueError, AttributeError):
+        return None
+
+
+class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
    """Custom OpenID Connect (OIDC) Authentication Backend.

    This class overrides the default OIDC Authentication Backend to accommodate differences
    in the User model, and handles signed and/or encrypted UserInfo response.
    """

-    def get_extra_claims(self, user_info):
-        """
-        Return extra claims from user_info.
+    def get_userinfo(self, access_token, id_token, payload):
+        """Return user details dictionary.

-        Args:
-          user_info (dict): The user information dictionary.
+        Parameters:
+        - access_token (str): The access token.
+        - id_token (str): The id token (unused).
+        - payload (dict): The token payload (unused).
+
+        Note: The id_token and payload parameters are unused in this implementation,
+        but were kept to preserve base method signature.
+
+        Note: It handles signed and/or encrypted UserInfo Response. It is required by
+        Agent Connect, which follows the OIDC standard. It forces us to override the
+        base method, which deal with 'application/json' response.

        Returns:
-          dict: A dictionary of extra claims.
-
+        - dict: User details dictionary obtained from the OpenID Connect user endpoint.
        """
-        extra_claims = super().get_extra_claims(user_info)
-        if settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD:
-            extra_claims[settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD] = (
-                user_info.get(settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD)
+
+        user_response = requests.get(
+            self.OIDC_OP_USER_ENDPOINT,
+            headers={"Authorization": f"Bearer {access_token}"},
+            verify=self.get_settings("OIDC_VERIFY_SSL", True),
+            timeout=self.get_settings("OIDC_TIMEOUT", None),
+            proxies=self.get_settings("OIDC_PROXY", None),
+        )
+        user_response.raise_for_status()
+        userinfo = self.verify_token(user_response.text)
+        return userinfo
+
+    def get_or_create_user(self, access_token, id_token, payload):
+        """Return a User based on userinfo. Create a new user if no match is found.
+
+        Parameters:
+        - access_token (str): The access token.
+        - id_token (str): The ID token.
+        - payload (dict): The user payload.
+
+        Returns:
+        - User: An existing or newly created User instance.
+
+        Raises:
+        - Exception: Raised when user creation is not allowed and no existing user is found.
+        """
+
+        user_info = self.get_userinfo(access_token, id_token, payload)
+
+        sub = user_info.get("sub")
+        if not sub:
+            raise SuspiciousOperation(
+                _("User info contained no recognizable user identification")
            )
-        return extra_claims

-    def post_get_or_create_user(self, user, claims, is_new_user):
-        """
-        Post-processing after user creation or retrieval.
+        # Get user's full name from OIDC fields defined in settings
+        full_name = self.compute_full_name(user_info)
+        email = user_info.get("email")

-        Args:
-          user (User): The user instance.
-          claims (dict): The claims dictionary.
-          is_new_user (bool): Indicates if the user was newly created.
+        claims = {
+            "sub": sub,
+            "email": email,
+            "name": full_name,
+        }
+        if settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD:
+            claims[settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD] = user_info.get(
+                settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD
+            )

-        Returns:
-        - None
+        # if sub is absent, try matching on email
+        user = self.get_existing_user(sub, email)
+
+        if user:
+            if not user.is_active:
+                raise SuspiciousOperation(_("User account is disabled"))
+            self.update_user_if_needed(user, claims)
+        elif self.get_settings("OIDC_CREATE_USER", True):
+            user = self.create_user(claims)

-        """
        # Data cleaning, to be removed when user organization is null=False
        # or all users have an organization.
        # See https://github.com/suitenumerique/people/issues/504
@@ -67,7 +125,7 @@ class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):
            organization_registration_id = claims.get(
                settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD
            )
-            domain = get_domain_from_email(claims["email"])
+            domain = get_domain_from_email(email)
            try:
                organization, organization_created = (
                    Organization.objects.get_or_create_from_user_claims(
@@ -94,6 +152,8 @@ class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):
                    "User %s updated with organization %s", user.pk, organization
                )

+        return user
+
    def create_user(self, claims):
        """Return a newly created User instance."""
        sub = claims.get("sub")
@@ -105,9 +165,8 @@ class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):
        name = claims.get("name")

        # Extract or create the organization from the data
-        organization_registration_id = claims.pop(
-            settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD,
-            None,
+        organization_registration_id = claims.get(
+            settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD
        )
        domain = get_domain_from_email(email)
        try:
@@ -127,7 +186,21 @@ class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):

        logger.info("Creating user %s / %s", sub, email)

-        user = super().create_user(claims | {"organization": organization})
+        user = self.UserModel.objects.create(
+            organization=organization,
+            password="!",  # noqa: S106
+            sub=sub,
+            email=email,
+            name=name,
+        )
+        if organization_created:
+            # Warning: we may remove this behavior in the near future when we
+            # add a feature to claim the organization ownership.
+            OrganizationAccess.objects.create(
+                organization=organization,
+                user=user,
+                role=OrganizationRoleChoices.ADMIN,
+            )

        # Initiate the user's profile
        Contact.objects.create(
@@ -143,44 +216,33 @@ class OIDCAuthenticationBackend(LaSuiteOIDCAuthenticationBackend):

        return user

+    def compute_full_name(self, user_info):
+        """Compute user's full name based on OIDC fields in settings."""
+        name_fields = settings.USER_OIDC_FIELDS_TO_NAME
+        full_name = " ".join(
+            user_info[field] for field in name_fields if user_info.get(field)
+        )
+        return full_name or None

-class AccountServiceAuthentication(BaseAuthentication):
-    """Authentication backend for account services using Authorization header.
-    The Authorization header is used to authenticate the request.
-    The api key is stored in the AccountService model.
-
-    Header format:
-        Authorization: ApiKey <api_key>
-    """
-
-    def authenticate(self, request):
-        """Authenticate the request. Find the account service and check the api key.
-
-        Should return either:
-        - a tuple of (account_service, api_key) if allowed,
-        - None to pass on other authentication backends
-        - raise an AuthenticationFailed exception to stop propagation.
-        """
-        auth_header = request.headers.get("Authorization", "")
-        if not auth_header:
-            return None
+    def get_existing_user(self, sub, email):
+        """Fetch existing user by sub or email."""
        try:
-            auth_mode, api_key = auth_header.split(" ")
-        except (IndexError, ValueError) as err:
-            raise AuthenticationFailed(_("Invalid authorization header.")) from err
-        if auth_mode.lower() != "apikey" or not api_key:
-            raise AuthenticationFailed(_("Invalid authorization header."))
-        try:
-            account_service = AccountService.objects.get(api_key=api_key)
-        except AccountService.DoesNotExist as err:
-            logger.warning("Invalid api_key: %s", api_key)
-            raise AuthenticationFailed(_("Invalid api key.")) from err
-        return (account_service, account_service.api_key)
+            return User.objects.get(sub=sub)
+        except User.DoesNotExist:
+            if email and settings.OIDC_FALLBACK_TO_EMAIL_FOR_IDENTIFICATION:
+                try:
+                    return User.objects.get(email=email)
+                except User.DoesNotExist:
+                    pass
+        return None

-    def authenticate_header(self, request):
-        """
-        Return a string to be used as the value of the `WWW-Authenticate`
-        header in a `401 Unauthenticated` response, or `None` if the
-        authentication scheme should return `403 Permission Denied` responses.
-        """
-        return "apikey"
+    def update_user_if_needed(self, user, claims):
+        """Update user claims if they have changed."""
+        updated_claims = {}
+        for key in ["email", "name"]:
+            claim_value = claims.get(key)
+            if claim_value and claim_value != getattr(user, key):
+                updated_claims[key] = claim_value
+
+        if updated_claims:
+            self.UserModel.objects.filter(sub=user.sub).update(**updated_claims)
@@ -0,0 +1,18 @@
+"""Authentication URLs for the People core app."""
+
+from django.urls import path
+
+from mozilla_django_oidc.urls import urlpatterns as mozzila_oidc_urls
+
+from .views import OIDCLogoutCallbackView, OIDCLogoutView
+
+urlpatterns = [
+    # Override the default 'logout/' path from Mozilla Django OIDC with our custom view.
+    path("logout/", OIDCLogoutView.as_view(), name="oidc_logout_custom"),
+    path(
+        "logout-callback/",
+        OIDCLogoutCallbackView.as_view(),
+        name="oidc_logout_callback",
+    ),
+    *mozzila_oidc_urls,
+]
@@ -0,0 +1,137 @@
+"""Authentication Views for the People core app."""
+
+from urllib.parse import urlencode
+
+from django.contrib import auth
+from django.core.exceptions import SuspiciousOperation
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from django.utils import crypto
+
+from mozilla_django_oidc.utils import (
+    absolutify,
+)
+from mozilla_django_oidc.views import (
+    OIDCLogoutView as MozillaOIDCOIDCLogoutView,
+)
+
+
+class OIDCLogoutView(MozillaOIDCOIDCLogoutView):
+    """Custom logout view for handling OpenID Connect (OIDC) logout flow.
+
+    Adds support for handling logout callbacks from the identity provider (OP)
+    by initiating the logout flow if the user has an active session.
+
+    The Django session is retained during the logout process to persist the 'state' OIDC parameter.
+    This parameter is crucial for maintaining the integrity of the logout flow between this call
+    and the subsequent callback.
+    """
+
+    @staticmethod
+    def persist_state(request, state):
+        """Persist the given 'state' parameter in the session's 'oidc_states' dictionary
+
+        This method is used to store the OIDC state parameter in the session, according to the
+        structure expected by Mozilla Django OIDC's 'add_state_and_verifier_and_nonce_to_session'
+        utility function.
+        """
+
+        if "oidc_states" not in request.session or not isinstance(
+            request.session["oidc_states"], dict
+        ):
+            request.session["oidc_states"] = {}
+
+        request.session["oidc_states"][state] = {}
+        request.session.save()
+
+    def construct_oidc_logout_url(self, request):
+        """Create the redirect URL for interfacing with the OIDC provider.
+
+        Retrieves the necessary parameters from the session and constructs the URL
+        required to initiate logout with the OpenID Connect provider.
+
+        If no ID token is found in the session, the logout flow will not be initiated,
+        and the method will return the default redirect URL.
+
+        The 'state' parameter is generated randomly and persisted in the session to ensure
+        its integrity during the subsequent callback.
+        """
+
+        oidc_logout_endpoint = self.get_settings("OIDC_OP_LOGOUT_ENDPOINT")
+
+        if not oidc_logout_endpoint:
+            return self.redirect_url
+
+        reverse_url = reverse("oidc_logout_callback")
+        id_token = request.session.get("oidc_id_token", None)
+
+        if not id_token:
+            return self.redirect_url
+
+        query = {
+            "id_token_hint": id_token,
+            "state": crypto.get_random_string(self.get_settings("OIDC_STATE_SIZE", 32)),
+            "post_logout_redirect_uri": absolutify(request, reverse_url),
+        }
+
+        self.persist_state(request, query["state"])
+
+        return f"{oidc_logout_endpoint}?{urlencode(query)}"
+
+    def post(self, request):
+        """Handle user logout.
+
+        If the user is not authenticated, redirects to the default logout URL.
+        Otherwise, constructs the OIDC logout URL and redirects the user to start
+        the logout process.
+
+        If the user is redirected to the default logout URL, ensure her Django session
+        is terminated.
+        """
+
+        logout_url = self.redirect_url
+
+        if request.user.is_authenticated:
+            logout_url = self.construct_oidc_logout_url(request)
+
+        # If the user is not redirected to the OIDC provider, ensure logout
+        if logout_url == self.redirect_url:
+            auth.logout(request)
+
+        return HttpResponseRedirect(logout_url)
+
+
+class OIDCLogoutCallbackView(MozillaOIDCOIDCLogoutView):
+    """Custom view for handling the logout callback from the OpenID Connect (OIDC) provider.
+
+    Handles the callback after logout from the identity provider (OP).
+    Verifies the state parameter and performs necessary logout actions.
+
+    The Django session is maintained during the logout process to ensure the integrity
+    of the logout flow initiated in the previous step.
+    """
+
+    http_method_names = ["get"]
+
+    def get(self, request):
+        """Handle the logout callback.
+
+        If the user is not authenticated, redirects to the default logout URL.
+        Otherwise, verifies the state parameter and performs necessary logout actions.
+        """
+
+        if not request.user.is_authenticated:
+            return HttpResponseRedirect(self.redirect_url)
+
+        state = request.GET.get("state")
+
+        if state not in request.session.get("oidc_states", {}):
+            msg = "OIDC callback state not found in session `oidc_states`!"
+            raise SuspiciousOperation(msg)
+
+        del request.session["oidc_states"][state]
+        request.session.save()
+
+        auth.logout(request)
+
+        return HttpResponseRedirect(self.redirect_url)
@@ -1,4 +1,3 @@
-# pylint: disable=too-many-ancestors
 """
 Core application enums declaration
 """
@@ -24,10 +23,3 @@ class WebhookStatusChoices(models.TextChoices):
    FAILURE = "failure", _("Failure")
    PENDING = "pending", _("Pending")
    SUCCESS = "success", _("Success")
-
-
-class WebhookProtocolChoices(models.TextChoices):
-    """Defines the possible protocols of webhook."""
-
-    SCIM = "scim"
-    MATRIX = "matrix"
@@ -1,18 +0,0 @@
-"""
-Custom exceptions for mailbox manager app
-"""
-
-from django.utils.translation import gettext_lazy as _
-
-from rest_framework import status
-from rest_framework.exceptions import APIException
-
-
-class EmailAlreadyKnownException(APIException):
-    """Exception raised when trying to create a user with an already existing email address."""
-
-    status_code = status.HTTP_201_CREATED
-    default_detail = _(
-        "Email already known. Invitation not sent but access created instead."
-    )
-    default_code = "email already known"
@@ -1,3 +1,4 @@
+# ruff: noqa: S311
 """
 Core application factories
 """
@@ -239,7 +240,7 @@ class TeamWebhookFactory(factory.django.DjangoModelFactory):
        model = models.TeamWebhook

    team = factory.SubFactory(TeamFactory)
-    url = factory.Sequence(lambda n: f"https://nosuchdomain.xyz/Groups/{n!s}")
+    url = factory.Sequence(lambda n: f"https://example.com/Groups/{n!s}")


 class InvitationFactory(factory.django.DjangoModelFactory):
@@ -276,13 +277,3 @@ class ServiceProviderFactory(factory.django.DjangoModelFactory):
        if not create or not extracted:
            return
        self.organizations.set(extracted)
-
-
-class AccountServiceFactory(factory.django.DjangoModelFactory):
-    """A factory to create account services for testing purposes."""
-
-    class Meta:
-        model = models.AccountService
-
-    name = factory.Sequence(lambda n: f"Account Service {n!s}")
-    api_key = factory.Faker("uuid4")
@@ -1,15 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "title": "Organization Metadata",
-  "properties": {
-    "is_public_service": {
-      "type": "boolean",
-      "title": "Is public service"
-    },
-    "is_commune": {
-      "type": "boolean",
-      "title": "Is commune"
-    }
-  }
-}
@@ -1 +0,0 @@
-"""Management commands for core app."""
@@ -1 +0,0 @@
-"""Management commands for core app."""
@@ -1,34 +0,0 @@
-"""
-Management command for filling organization metadata with default values.
-"""
-
-from django.core.management.base import BaseCommand
-
-from core import models
-from core.utils.json_schema import generate_default_from_schema
-
-
-class Command(BaseCommand):
-    """Management command to fill organization metadata with default values."""
-
-    help = "Fill organization metadata with default values"
-
-    def handle(self, *args, **options):
-        """Fill organizations metadata missing values with default values."""
-        organization_metadata_schema = models.get_organization_metadata_schema()
-
-        if not organization_metadata_schema:
-            message = "No organization metadata schema defined."
-            self.stdout.write(self.style.ERROR(message))
-            return
-
-        default_metadata = generate_default_from_schema(organization_metadata_schema)
-        for organization in models.Organization.objects.all():
-            organization.metadata = {**default_metadata, **organization.metadata}
-
-            # Save the organization with the updated metadata
-            # We don't use bulk update because we want to trigger the clean method
-            organization.save(update_fields=["metadata", "updated_at"])
-
-        message = "Organization metadata filled with default values."
-        self.stdout.write(self.style.SUCCESS(message))
@@ -1,22 +0,0 @@
-"""Management command to list all plugins and their hooks."""
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-from core.plugins.registry import registry
-
-
-class Command(BaseCommand):
-    """Management command to list all plugins and their hooks."""
-
-    help = "List all plugins and their hooks"
-
-    def handle(self, *args, **options):
-        """Print plugin information."""
-        self.stdout.write(self.style.NOTICE("# Listing plugins\n"))
-        for plugin_app in settings.INSTALLED_PLUGINS:
-            self.stdout.write(self.style.NOTICE(f" - {plugin_app}\n"))
-
-        self.stdout.write(self.style.NOTICE("# Listing loaded hooks\n"))
-        for hook_name, callbacks in registry.get_registered_hooks():
-            self.stdout.write(self.style.NOTICE(f" - {hook_name}: {callbacks}\n"))
@@ -11,7 +11,7 @@ def update_team_paths(apps, schema_editor):
    steplen = 5

    # Initialize NumConv with the specified custom alphabet
-    converter = NumConv(alphabet)
+    converter = NumConv(len(alphabet), alphabet)

    nodes = Team.objects.all().order_by("created_at")
    for i, node in enumerate(nodes, 1):
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-03-11 13:34
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0010_team_depth_team_numchild_team_path_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='team',
-            name='is_visible_all_services',
-            field=models.BooleanField(default=False, help_text='Whether this team is visible to all service providers.', verbose_name='is visible for all SP'),
-        ),
-    ]
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-03-10 14:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0011_team_is_visible_all_services'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='organization',
-            name='metadata',
-            field=models.JSONField(blank=True, default=dict, help_text='A JSON object containing the organization metadata', verbose_name='metadata'),
-        ),
-    ]
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.7 on 2025-03-27 10:03
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0012_organization_metadata'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='organization',
-            name='is_active',
-            field=models.BooleanField(default=True, verbose_name='active'),
-        ),
-    ]
@@ -1,32 +0,0 @@
-# Generated by Django 5.1.8 on 2025-04-03 20:37
-
-import core.models
-import django.contrib.postgres.fields
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0013_organization_is_active'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AccountService',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, help_text='primary key for the record as UUID', primary_key=True, serialize=False, verbose_name='id')),
-                ('created_at', models.DateTimeField(auto_now_add=True, help_text='date and time at which a record was created', verbose_name='created at')),
-                ('updated_at', models.DateTimeField(auto_now=True, help_text='date and time at which a record was last updated', verbose_name='updated at')),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
-                ('api_key', models.CharField(default='Y9-IThtCrKASOvRAKO2MUBd_XvZrnSTGNMMlv-Z1_o8', max_length=255, verbose_name='api key')),
-                ('scopes', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=255, validators=[core.models.validate_account_service_scope]), help_text='Allowed scopes for this service', size=None, verbose_name='allowed scopes')),
-            ],
-            options={
-                'verbose_name': 'Account service',
-                'verbose_name_plural': 'Account services',
-                'db_table': 'people_account_service',
-            },
-        ),
-    ]
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.8 on 2025-04-10 07:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0014_accountservice'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='accountservice',
-            name='api_key',
-            field=models.CharField(max_length=255, verbose_name='api key'),
-        ),
-    ]
@@ -1,40 +0,0 @@
-# Generated by Django 5.2 on 2025-06-12 09:58
-
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-def gen_team_uuid(apps, schema_editor):
-    Team = apps.get_model("core", "Team")
-    for row in Team.objects.all():
-        row.external_id = uuid.uuid4()
-        # Don't need to batch update here, as the table is likely small or empty
-        row.save(update_fields=["external_id"])
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0015_alter_accountservice_api_key'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='team',
-            name='external_id',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, help_text='Team external UUID for synchronization with external systems', unique=False, verbose_name='external_id'),
-        ),
-        migrations.RunPython(gen_team_uuid, reverse_code=migrations.RunPython.noop),
-        migrations.AlterField(
-            model_name='team',
-            name='external_id',
-            field=models.UUIDField(default=uuid.uuid4, editable=False, help_text='Team external UUID for synchronization with external systems', unique=True, verbose_name='external_id'),
-        ),
-        #
-        migrations.AlterField(
-            model_name='team',
-            name='users',
-            field=models.ManyToManyField(related_name='teams', through='core.TeamAccess', through_fields=('team', 'user'), to=settings.AUTH_USER_MODEL),
-        ),
-    ]
@@ -1,18 +0,0 @@
-# Generated by Django 5.2.3 on 2025-06-17 14:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0016_team_external_id_alter_team_users'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='teamwebhook',
-            name='protocol',
-            field=models.CharField(choices=[('scim', 'Scim'), ('matrix', 'Matrix')], default='scim'),
-        ),
-    ]
@@ -1,18 +1,15 @@
 """
 Declare and configure the models for the People core application
 """
-# pylint: disable=too-many-lines import-outside-toplevel

 import json
 import os
-import secrets
 import smtplib
 import uuid
 from contextlib import suppress
 from datetime import timedelta
-from functools import lru_cache
 from logging import getLogger
-from typing import Optional, Tuple
+from typing import Tuple

 from django.conf import settings
 from django.contrib.auth import models as auth_models
@@ -21,7 +18,7 @@ from django.contrib.postgres.fields import ArrayField
 from django.contrib.sites.models import Site
 from django.core import exceptions, mail, validators
 from django.core.exceptions import ValidationError
-from django.db import models
+from django.db import models, transaction
 from django.template.loader import render_to_string
 from django.utils import timezone
 from django.utils.translation import gettext, override
@@ -31,46 +28,19 @@ import jsonschema
 from timezone_field import TimeZoneField
 from treebeard.mp_tree import MP_Node, MP_NodeManager

-from core.enums import WebhookProtocolChoices, WebhookStatusChoices
-from core.exceptions import EmailAlreadyKnownException
-from core.plugins.registry import registry as plugin_hooks_registry
-from core.utils.webhooks import webhooks_synchronizer
+from core.enums import WebhookStatusChoices
+from core.plugins.loader import organization_plugins_run_after_create
+from core.utils.webhooks import scim_synchronizer
 from core.validators import get_field_validators_from_setting

 logger = getLogger(__name__)

 current_dir = os.path.dirname(os.path.abspath(__file__))
-
 contact_schema_path = os.path.join(current_dir, "jsonschema", "contact_data.json")
 with open(contact_schema_path, "r", encoding="utf-8") as contact_schema_file:
    contact_schema = json.load(contact_schema_file)


-@lru_cache(maxsize=None)
-def get_organization_metadata_schema() -> Optional[dict]:
-    """Load the organization metadata schema from the settings."""
-    if not settings.ORGANIZATION_METADATA_SCHEMA:
-        logger.info("No organization metadata schema specified")
-        return None
-
-    organization_metadata_schema_path = os.path.join(
-        current_dir,
-        "jsonschema",
-        settings.ORGANIZATION_METADATA_SCHEMA,
-    )
-    with open(
-        organization_metadata_schema_path,
-        "r",
-        encoding="utf-8",
-    ) as organization_metadata_schema_file:
-        organization_metadata_schema = json.load(organization_metadata_schema_file)
-
-    logger.info(
-        "Loaded organization metadata schema from %s", organization_metadata_schema_path
-    )
-    return organization_metadata_schema
-
-
 class RoleChoices(models.TextChoices):  # pylint: disable=too-many-ancestors
    """Defines the possible roles a user can have in a team."""

@@ -324,23 +294,7 @@ class OrganizationManager(models.Manager):
        This method is overridden to call the Organization plugins.
        """
        instance = super().create(**kwargs)
-        plugin_hooks_registry.execute_hook("organization_created", instance)
-        return instance
-
-
-class OrganizationAccessManager(models.Manager):
-    """
-    Custom manager for the OrganizationAccess model, to manage complexity/automation.
-    """
-
-    def create(self, **kwargs):
-        """
-        Create an organization access with the given kwargs.
-
-        This method is overridden to call the Organization plugins.
-        """
-        instance = super().create(**kwargs)
-        plugin_hooks_registry.execute_hook("organization_access_granted", instance)
+        organization_plugins_run_after_create(instance)
        return instance


@@ -383,19 +337,11 @@ class Organization(BaseModel):
        # list overlap validation is done in the validate_unique method
    )

-    metadata = models.JSONField(
-        _("metadata"),
-        help_text=_("A JSON object containing the organization metadata"),
-        blank=True,
-        default=dict,
-    )
-
    service_providers = models.ManyToManyField(
        ServiceProvider,
        related_name="organizations",
        blank=True,
    )
-    is_active = models.BooleanField(verbose_name=_("active"), default=True)

    objects = OrganizationManager()

@@ -421,22 +367,6 @@ class Organization(BaseModel):
    def __str__(self):
        return f"{self.name} (# {self.pk})"

-    def clean(self):
-        """Validate fields."""
-        super().clean()
-
-        organization_metadata_schema = get_organization_metadata_schema()
-        if not organization_metadata_schema:
-            return
-
-        try:
-            jsonschema.validate(self.metadata, organization_metadata_schema)
-        except jsonschema.ValidationError as e:
-            # Specify the property in the data in which the error occurred
-            field_path = ".".join(map(str, e.path))
-            error_message = f"Validation error in '{field_path:s}': {e.message}"
-            raise exceptions.ValidationError({"metadata": [error_message]}) from e
-
    def validate_unique(self, exclude=None):
        """
        Validate Registration/Domain values in an array field are unique
@@ -563,13 +493,11 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):

    def save(self, *args, **kwargs):
        """
-        If it's a new user, give them access to the relevant teams.
+        If it's a new user, give her access to the relevant teams.
        """

        if self._state.adding:
-            self._convert_valid_team_invitations()
-            # a post_save signal to convert domain invitations to domain accesses
-            # is triggered by the mailbox_manager app
+            self._convert_valid_invitations()

        super().save(*args, **kwargs)

@@ -579,7 +507,7 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
        if self.email:
            self.email = User.objects.normalize_email(self.email)

-    def _convert_valid_team_invitations(self):
+    def _convert_valid_invitations(self):
        """
        Convert valid invitations to team accesses.
        Expired invitations are ignored.
@@ -690,8 +618,6 @@ class OrganizationAccess(BaseModel):
        default=OrganizationRoleChoices.ADMIN,
    )

-    objects = OrganizationAccessManager()
-
    class Meta:
        db_table = "people_organization_access"
        verbose_name = _("Organization/user relation")
@@ -727,7 +653,7 @@ class TeamManager(MP_NodeManager):
            return self.model.add_root(**kwargs)

        # Retrieve parent object, because django-treebeard uses raw queries for most
-        # write operations, and raw queries don't update the django objects of the db
+        # write operations, and raw queries don’t update the django objects of the db
        # entries they modify. See caveats in the django-treebeard documentation.
        # This might be changed later if we never do any operation on the parent object
        # before creating the child.
@@ -743,11 +669,6 @@ class Team(MP_Node, BaseModel):
    can see it.
    When a team is created from a Service Provider this one is automatically set in the
    Team `service_providers`.
-
-    The team `external_id` is used to synchronize the team with external systems, this
-    is the equivalent of the User `sub` field but for teams (note: `sub` is highly related
-    to the OIDC standard, while `external_id` is not). The `external_id` is NOT the same as
-    the `externalId` field in the SCIM standard when importing teams from SCIM.
    """

    # Allow up to 80 nested teams with 62^5 (916_132_832) root nodes
@@ -758,14 +679,6 @@ class Team(MP_Node, BaseModel):

    name = models.CharField(max_length=100)

-    external_id = models.UUIDField(
-        verbose_name=_("external_id"),
-        help_text=_("Team external UUID for synchronization with external systems"),
-        unique=True,
-        default=uuid.uuid4,
-        editable=False,
-    )
-
    users = models.ManyToManyField(
        User,
        through="TeamAccess",
@@ -784,11 +697,6 @@ class Team(MP_Node, BaseModel):
        related_name="teams",
        blank=True,
    )
-    is_visible_all_services = models.BooleanField(
-        _("is visible for all SP"),
-        default=False,
-        help_text=_("Whether this team is visible to all service providers."),
-    )

    objects = TeamManager()

@@ -814,7 +722,7 @@ class Team(MP_Node, BaseModel):
            except AttributeError:
                try:
                    role = self.accesses.filter(user=user).values("role")[0]["role"]
-                except TeamAccess.DoesNotExist, IndexError:
+                except (TeamAccess.DoesNotExist, IndexError):
                    role = None

            is_owner_or_admin = role in [RoleChoices.OWNER, RoleChoices.ADMIN]
@@ -865,12 +773,16 @@ class TeamAccess(BaseModel):
        Override save function to fire webhooks on any addition or update
        to a team access.
        """
-        if self._state.adding and self.team.webhooks.exists():
-            self.team.webhooks.update(status=WebhookStatusChoices.PENDING)
-            # try to synchronize all webhooks
-            webhooks_synchronizer.add_user_to_group(self.team, self.user)

-        return super().save(*args, **kwargs)
+        if self._state.adding:
+            self.team.webhooks.update(status=WebhookStatusChoices.PENDING)
+            with transaction.atomic():
+                instance = super().save(*args, **kwargs)
+                scim_synchronizer.add_user_to_group(self.team, self.user)
+        else:
+            instance = super().save(*args, **kwargs)
+
+        return instance

    def delete(self, *args, **kwargs):
        """
@@ -878,12 +790,11 @@ class TeamAccess(BaseModel):
        Don't allow deleting a team access until it is successfully synchronized with all
        its webhooks.
        """
-        if webhooks := self.team.webhooks.all():
-            webhooks.update(status=WebhookStatusChoices.PENDING)
-            # try to synchronize all webhooks
-            webhooks_synchronizer.remove_user_from_group(self.team, self.user)
-
-        super().delete(*args, **kwargs)
+        self.team.webhooks.update(status=WebhookStatusChoices.PENDING)
+        with transaction.atomic():
+            arguments = self.team, self.user
+            super().delete(*args, **kwargs)
+            scim_synchronizer.remove_user_from_group(*arguments)

    def get_abilities(self, user):
        """
@@ -901,7 +812,7 @@ class TeamAccess(BaseModel):
                    role = self._meta.model.objects.filter(
                        team=self.team_id, user=user
                    ).values("role")[0]["role"]
-                except self._meta.model.DoesNotExist, IndexError:
+                except (self._meta.model.DoesNotExist, IndexError):
                    role = None

            is_team_owner_or_admin = role in [RoleChoices.OWNER, RoleChoices.ADMIN]
@@ -941,11 +852,6 @@ class TeamWebhook(BaseModel):
    team = models.ForeignKey(Team, related_name="webhooks", on_delete=models.CASCADE)
    url = models.URLField(_("url"))
    secret = models.CharField(_("secret"), max_length=255, null=True, blank=True)
-    protocol = models.CharField(
-        max_length=None,
-        default=WebhookProtocolChoices.SCIM,
-        choices=WebhookProtocolChoices.choices,
-    )
    status = models.CharField(
        max_length=10,
        default=WebhookStatusChoices.PENDING,
@@ -968,86 +874,10 @@ class TeamWebhook(BaseModel):
        return headers


-class BaseInvitation(BaseModel):
-    """Abstract base invitation model, surcharged for teams or domains."""
-
-    email = models.EmailField(_("email address"), null=False, blank=False)
-    issuer = models.ForeignKey(
-        User,
-        on_delete=models.CASCADE,
-        related_name="invitations",
-    )
-
-    MAIL_TEMPLATE_HTML = None
-    MAIL_TEMPLATE_TXT = None
-
-    class Meta:
-        abstract = True
-
-    def save(self, *args, **kwargs):
-        """Make invitations read-only."""
-        if self.created_at:
-            raise exceptions.PermissionDenied()
-        super().save(*args, **kwargs)
-
-        self.email_invitation()
-
-    def clean(self):
-        """Validate fields."""
-        super().clean()
-
-        # Check if a user already exists for the provided email
-        if User.objects.filter(email__iexact=self.email).exists():
-            raise EmailAlreadyKnownException
-
-    def refresh(self):
-        """A simple way to refresh invitation and move expiration date."""
-        self.clean()
-        self.updated_at = timezone.now()
-
-    @property
-    def is_expired(self):
-        """Calculate if invitation is still valid or has expired."""
-        if not self.updated_at:
-            return None
-
-        validity_duration = timedelta(seconds=settings.INVITATION_VALIDITY_DURATION)
-        return timezone.now() > (self.updated_at + validity_duration)
-
-    def _get_mail_subject(self):
-        """Get the subject of the invitation."""
-        return gettext("Invitation to join La Régie!")
-
-    def _get_mail_context(self):
-        """Get the template variables for the invitation."""
-        return {
-            "site": Site.objects.get_current(),
-        }
-
-    def email_invitation(self):
-        """Email invitation to the user."""
-        try:
-            with override(self.issuer.language):
-                subject = self._get_mail_subject()
-                context = self._get_mail_context()
-                msg_html = render_to_string(self.MAIL_TEMPLATE_HTML, context)
-                msg_plain = render_to_string(self.MAIL_TEMPLATE_TXT, context)
-                mail.send_mail(
-                    subject,
-                    msg_plain,
-                    settings.EMAIL_FROM,
-                    [self.email],
-                    html_message=msg_html,
-                    fail_silently=False,
-                )
-
-        except smtplib.SMTPException as exception:
-            logger.error("invitation to %s was not sent: %s", self.email, exception)
-
-
-class Invitation(BaseInvitation):
+class Invitation(BaseModel):
    """User invitation to teams."""

+    email = models.EmailField(_("email address"), null=False, blank=False)
    team = models.ForeignKey(
        Team,
        on_delete=models.CASCADE,
@@ -1056,9 +886,11 @@ class Invitation(BaseInvitation):
    role = models.CharField(
        max_length=20, choices=RoleChoices.choices, default=RoleChoices.MEMBER
    )
-
-    MAIL_TEMPLATE_HTML = "mail/html/team_invitation.html"
-    MAIL_TEMPLATE_TXT = "mail/text/team_invitation.txt"
+    issuer = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        related_name="invitations",
+    )

    class Meta:
        db_table = "people_invitation"
@@ -1073,19 +905,32 @@ class Invitation(BaseInvitation):
    def __str__(self):
        return f"{self.email} invited to {self.team}"

-    def _get_mail_subject(self):
-        """Get the subject of the team invitation."""
-        return gettext(
-            "[La Suite] You have been invited to become a %(role)s of a group"
-        ) % {"role": self.get_role_display().lower()}
+    def save(self, *args, **kwargs):
+        """Make invitations read-only."""
+        if self.created_at:
+            raise exceptions.PermissionDenied()
+        super().save(*args, **kwargs)

-    def _get_mail_context(self):
-        """Get the template variables for the invitation."""
-        return {
-            **super()._get_mail_context(),
-            "team": self.team.name,
-            "role": self.get_role_display().lower(),
-        }
+        self.email_invitation()
+
+    def clean(self):
+        """Validate fields."""
+        super().clean()
+
+        # Check if a user already exists for the provided email
+        if User.objects.filter(email=self.email).exists():
+            raise exceptions.ValidationError(
+                {"email": _("This email is already associated to a registered user.")}
+            )
+
+    @property
+    def is_expired(self):
+        """Calculate if invitation is still valid or has expired."""
+        if not self.created_at:
+            return None
+
+        validity_duration = timedelta(seconds=settings.INVITATION_VALIDITY_DURATION)
+        return timezone.now() > (self.created_at + validity_duration)

    def get_abilities(self, user):
        """Compute and return abilities for a given user."""
@@ -1100,7 +945,7 @@ class Invitation(BaseInvitation):
                    role = self.team.accesses.filter(user=user).values("role")[0][
                        "role"
                    ]
-                except self._meta.model.DoesNotExist, IndexError:
+                except (self._meta.model.DoesNotExist, IndexError):
                    role = None

            can_delete = role in [RoleChoices.OWNER, RoleChoices.ADMIN]
@@ -1112,44 +957,25 @@ class Invitation(BaseInvitation):
            "put": False,
        }

+    def email_invitation(self):
+        """Email invitation to the user."""
+        try:
+            with override(self.issuer.language):
+                subject = gettext("Invitation to join La Régie!")
+                template_vars = {
+                    "title": subject,
+                    "site": Site.objects.get_current(),
+                }
+                msg_html = render_to_string("mail/html/invitation.html", template_vars)
+                msg_plain = render_to_string("mail/text/invitation.txt", template_vars)
+                mail.send_mail(
+                    subject,
+                    msg_plain,
+                    settings.EMAIL_FROM,
+                    [self.email],
+                    html_message=msg_html,
+                    fail_silently=False,
+                )

-def validate_account_service_scope(scope):
-    """Validate the scope of the account service."""
-    if scope not in settings.ACCOUNT_SERVICE_SCOPES:
-        raise ValidationError(f"Invalid scope: {scope}")
-
-
-class AccountService(BaseModel):
-    """Account service model."""
-
-    name = models.CharField(_("name"), max_length=255)
-    api_key = models.CharField(
-        _("api key"),
-        max_length=255,
-    )
-    scopes = ArrayField(
-        models.CharField(max_length=255, validators=[validate_account_service_scope]),
-        verbose_name=_("allowed scopes"),
-        help_text=_("Allowed scopes for this service"),
-    )
-
-    class Meta:
-        db_table = "people_account_service"
-        verbose_name = _("Account service")
-        verbose_name_plural = _("Account services")
-
-    def __str__(self):
-        return self.name
-
-    def save(self, *args, **kwargs):
-        """
-        Override save method to generate a new api_key if it is not set.
-        """
-        if not self.api_key:
-            self.api_key = secrets.token_urlsafe(32)
-        return super().save(*args, **kwargs)
-
-    @property
-    def is_authenticated(self):
-        """Indicate if the account service is authenticated."""
-        return True
+        except smtplib.SMTPException as exception:
+            logger.error("invitation to %s was not sent: %s", self.email, exception)
@@ -1,24 +1,13 @@
-"""Base Django Application Configuration for plugins."""
+"""Base plugin class for organization plugins."""


-class BasePluginAppConfigMixIn:
+class BaseOrganizationPlugin:
    """
-    Configuration for the La Suite plugin application.
+    Base class for organization plugins.

-    We cannot use the `AppConfig` class directly because it is not compatible with
-    the Django way to discover default AppConfig (see `AppConfig.create`).
-    We use a mixin then, to be able to list plugins using `plugins.la_suite` instead
-    of `plugins.la_suite.apps.LaSuitePluginConfig`.
-
-    Another way would be to force `default` attribute on plugin AppConfig.
+    Plugins must implement all methods of this class even if it is only to "pass".
    """

-    def ready(self):
-        """
-        Initialize the hooks registry when the application is ready.
-        This is called by Django when the application is loaded.
-        """
-        # pylint: disable=import-outside-toplevel
-        from .registry import registry  # noqa: PLC0415
-
-        registry.register_app(self.name)  # pylint: disable=no-member
+    def run_after_create(self, organization) -> None:
+        """Method called after creating an organization."""
+        raise NotImplementedError("Plugins must implement the run_after_create method")
@@ -0,0 +1,32 @@
+"""Helper functions to load and run organization plugins."""
+
+from functools import lru_cache
+from typing import List
+
+from django.conf import settings
+from django.utils.module_loading import import_string
+
+from core.plugins.base import BaseOrganizationPlugin
+
+
+@lru_cache(maxsize=None)
+def get_organization_plugins() -> List[BaseOrganizationPlugin]:
+    """
+    Return a list of all organization plugins.
+    While the plugins initialization does not depend on the request, we can cache the result.
+    """
+    return [
+        import_string(plugin_path)() for plugin_path in settings.ORGANIZATION_PLUGINS
+    ]
+
+
+def organization_plugins_run_after_create(organization):
+    """
+    Run the after create method for all organization plugins.
+
+    Each plugin will be called in the order they are listed in the settings.
+    Each plugin is responsible to save changes if needed, this is not optimized
+    but this could be easily improved later if needed.
+    """
+    for plugin_instance in get_organization_plugins():
+        plugin_instance.run_after_create(organization)
@@ -1,129 +0,0 @@
-"""Registry for hooks."""
-
-import logging
-from typing import Callable, Dict, List, Set
-
-logger = logging.getLogger(__name__)
-
-
-class HooksRegistry:
-    """Registry for hooks."""
-
-    _available_hooks = {
-        "organization_created",
-        "organization_access_granted",
-    }
-
-    def __init__(self):
-        """Initialize the registry."""
-        self._hooks: Dict[str, List[Callable]] = {
-            hook_name: [] for hook_name in self._available_hooks
-        }
-        self._registered_apps: Set[str] = set()
-
-    def register_hook(self, hook_name: str, callback: Callable) -> None:
-        """
-        Register a hook callback.
-
-        Args:
-            hook_name: The name of the hook.
-            callback: The callback function to register.
-        """
-        try:
-            self._hooks[hook_name].append(callback)
-        except KeyError as exc:
-            logger.exception(
-                "Failed to register hook '%s' is not a valid hook: %s", hook_name, exc
-            )
-        logger.info("Registered hook %s: %s", hook_name, callback)
-
-    def get_registered_hooks(self):
-        """Get all registered hooks."""
-        return self._hooks.items()
-
-    def register_app(self, app_name: str) -> None:
-        """
-        Register an app as having hooks.
-
-        Args:
-            app_name: The name of the app.
-        """
-        if app_name in self._registered_apps:
-            return
-
-        self._registered_apps.add(app_name)
-        try:
-            # Try to import the hooks module from the app
-            __import__(f"{app_name}.hooks")
-            logger.info("Registered hooks from app: %s", app_name)
-        except ImportError:
-            # It's okay if the app doesn't have a hooks module
-            logger.info("App %s has no hooks module", app_name)
-
-    def get_callbacks(self, hook_name: str) -> List[Callable]:
-        """
-        Get all callbacks for a hook.
-
-        Args:
-            hook_name: The name of the hook.
-
-        Returns:
-            A list of callback functions.
-        """
-        try:
-            return self._hooks[hook_name]
-        except KeyError as exc:
-            logger.exception(
-                "Failed to get callbacks for hook '%s' is not a valid hook: %s",
-                hook_name,
-                exc,
-            )
-            return []
-
-    def execute_hook(self, hook_name: str, *args, **kwargs):
-        """
-        Execute all callbacks for a hook.
-
-        Args:
-            hook_name: The name of the hook.
-            *args: Positional arguments to pass to the callbacks.
-            **kwargs: Keyword arguments to pass to the callbacks.
-
-        Returns:
-            A list of results from the callbacks.
-        """
-        results = []
-        for callback in self.get_callbacks(hook_name):
-            try:
-                result = callback(*args, **kwargs)
-                results.append(result)
-            except Exception as e:  # pylint: disable=broad-except
-                logger.exception("Error executing hook %s: %s", hook_name, e)
-        return results
-
-    def reset(self):
-        """Function to reset the registry, to be used in test only."""
-        self._hooks = {hook_name: [] for hook_name in self._available_hooks}
-        self._registered_apps = set()
-
-
-# Create a singleton instance of the registry
-registry = HooksRegistry()
-
-
-def register_hook(hook_name: str):
-    """
-    Decorator to register a function as a hook callback.
-
-    Args:
-        hook_name: The name of the hook.
-
-    Returns:
-        A decorator function.
-    """
-
-    def decorator(func):
-        registry.register_hook(hook_name, func)
-        return func
-
-    return decorator
@@ -1,16 +0,0 @@
-"""URLs for plugins"""
-
-from django.conf import settings
-from django.urls import include, path
-
-plugins_urlpatterns = []
-
-# Try to import and include URLs from each installed plugin
-for app in settings.INSTALLED_PLUGINS:
-    try:
-        plugins_urlpatterns.append(path("", include(f"{app}.urls")))
-    except ImportError, AttributeError:
-        # Skip if app doesn't have urls.py
-        continue
-
-urlpatterns = plugins_urlpatterns
@@ -0,0 +1 @@
+"""Backend resource server module."""
@@ -0,0 +1,72 @@
+"""Resource Server Authentication"""
+
+import base64
+import binascii
+import logging
+
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+
+from mozilla_django_oidc.contrib.drf import OIDCAuthentication
+
+from .backend import ResourceServerBackend, ResourceServerImproperlyConfiguredBackend
+from .clients import AuthorizationServerClient
+
+logger = logging.getLogger(__name__)
+
+
+class ResourceServerAuthentication(OIDCAuthentication):
+    """Authenticate clients using the token received from the authorization server."""
+
+    def __init__(self):
+        """Require authentication to be configured in order to instantiate."""
+        super().__init__()
+
+        try:
+            authorization_server_client = AuthorizationServerClient(
+                url=settings.OIDC_OP_URL,
+                verify_ssl=settings.OIDC_VERIFY_SSL,
+                timeout=settings.OIDC_TIMEOUT,
+                proxy=settings.OIDC_PROXY,
+                url_jwks=settings.OIDC_OP_JWKS_ENDPOINT,
+                url_introspection=settings.OIDC_OP_INTROSPECTION_ENDPOINT,
+            )
+            self.backend = ResourceServerBackend(authorization_server_client)
+
+        except ImproperlyConfigured as err:
+            message = "Resource Server authentication is disabled"
+            logger.debug("%s. Exception: %s", message, err)
+            self.backend = ResourceServerImproperlyConfiguredBackend()
+
+    def get_access_token(self, request):
+        """Retrieve and decode the access token from the request.
+
+        This method overrides the 'get_access_token' method from the parent class,
+        to support service providers that would base64 encode the bearer token.
+        """
+
+        access_token = super().get_access_token(request)
+
+        try:
+            access_token = base64.b64decode(access_token).decode("utf-8")
+        except (binascii.Error, TypeError):
+            pass
+
+        return access_token
+
+    def authenticate(self, request):
+        """
+        Authenticate the request and return a tuple of (user, token) or None.
+
+        We override the 'authenticate' method from the parent class to store
+        the introspected token audience inside the request.
+        """
+        result = super().authenticate(request)  # Might raise AuthenticationFailed
+
+        if result is None:  # Case when there is no access token
+            return None
+
+        # Note: at this stage, the request is a "drf_request" object
+        request.resource_server_token_audience = self.backend.token_origin_audience
+
+        return result
@@ -0,0 +1,240 @@
+"""Resource Server Backend"""
+
+import logging
+
+from django.conf import settings
+from django.contrib import auth
+from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
+
+from joserfc import jwe as jose_jwe
+from joserfc import jwt as jose_jwt
+from joserfc.errors import InvalidClaimError, InvalidTokenError
+from requests.exceptions import HTTPError
+from rest_framework.exceptions import AuthenticationFailed
+
+from . import utils
+
+logger = logging.getLogger(__name__)
+
+
+class ResourceServerBackend:
+    """Backend of an OAuth 2.0 resource server.
+
+    This backend is designed to authenticate resource owners to our API using the access token
+    they received from the authorization server.
+
+    In the context of OAuth 2.0, a resource server is a server that hosts protected resources and
+    is capable of accepting and responding to protected resource requests using access tokens.
+    The resource server verifies the validity of the access tokens issued by the authorization
+    server to ensure secure access to the resources.
+
+    For more information, visit: https://www.oauth.com/oauth2-servers/the-resource-server/
+    """
+
+    # pylint: disable=too-many-instance-attributes
+    def __init__(self, authorization_server_client):
+        """Require client_id, client_secret set and authorization_server_client provided."""
+        # pylint: disable=invalid-name
+        self.UserModel = auth.get_user_model()
+
+        self._client_id = settings.OIDC_RS_CLIENT_ID
+        self._client_secret = settings.OIDC_RS_CLIENT_SECRET
+        self._encryption_encoding = settings.OIDC_RS_ENCRYPTION_ENCODING
+        self._encryption_algorithm = settings.OIDC_RS_ENCRYPTION_ALGO
+        self._signing_algorithm = settings.OIDC_RS_SIGNING_ALGO
+        self._scopes = settings.OIDC_RS_SCOPES
+
+        if (
+            not self._client_id
+            or not self._client_secret
+            or not authorization_server_client
+        ):
+            raise ImproperlyConfigured(
+                "Could not instantiate ResourceServerBackend, some parameters are missing."
+            )
+
+        self._authorization_server_client = authorization_server_client
+
+        self._claims_registry = jose_jwt.JWTClaimsRegistry(
+            iss={"essential": True, "value": self._authorization_server_client.url},
+            aud={"essential": True, "value": self._client_id},
+            token_introspection={"essential": True},
+        )
+
+        # Declare the token origin audience: to know where the token comes from
+        # and store it for further use in the application
+        self.token_origin_audience = None
+
+    # pylint: disable=unused-argument
+    def get_or_create_user(self, access_token, id_token, payload):
+        """Maintain API compatibility with OIDCAuthentication class from mozilla-django-oidc
+
+        Params 'id_token', 'payload' won't be used, and our implementation will only
+        support 'get_user', not 'get_or_create_user'.
+        """
+
+        return self.get_user(access_token)
+
+    def get_user(self, access_token):
+        """Get user from an access token emitted by the authorization server.
+
+        This method will submit the access token to the authorization server for
+        introspection, to ensure its validity and obtain the associated metadata.
+
+        It follows the specifications outlined in RFC7662 https://www.rfc-editor.org/info/rfc7662,
+        https://datatracker.ietf.org/doc/html/draft-ietf-oauth-jwt-introspection-response-12.
+
+        In our eGovernment applications, the standard RFC 7662 doesn't provide sufficient security.
+        Its introspection response is a plain JSON object. Therefore, we use the draft RFC
+        that extends RFC 7662 by returning a signed and encrypted JWT for stronger assurance that
+        the authorization server issued the token introspection response.
+        """
+        self.token_origin_audience = None  # Reset the token origin audience
+
+        jwt = self._introspect(access_token)
+        claims = self._verify_claims(jwt)
+        user_info = self._verify_user_info(claims["token_introspection"])
+
+        sub = user_info.get("sub")
+        if sub is None:
+            message = "User info contained no recognizable user identification"
+            logger.debug(message)
+            raise SuspiciousOperation(message)
+        try:
+            user = self.UserModel.objects.get(sub=sub)
+        except self.UserModel.DoesNotExist:
+            logger.debug("Login failed: No user with %s found", sub)
+            return None
+
+        self.token_origin_audience = str(user_info["aud"])
+
+        return user
+
+    def _verify_user_info(self, introspection_response):
+        """Verify the 'introspection_response' to get valid and relevant user info.
+
+        The 'introspection_response' should be still active, and while authenticating
+        the resource owner should have requested relevant scope to access her data in
+        our resource server.
+
+        Scope should be configured to match between the AS and the RS. The AS will filter
+        all the scopes the resource owner requested to expose only the relevant ones to
+        our resource server.
+        """
+
+        active = introspection_response.get("active", None)
+
+        if not active:
+            message = "Introspection response is not active."
+            logger.debug(message)
+            raise SuspiciousOperation(message)
+
+        requested_scopes = introspection_response.get("scope", None).split(" ")
+        if set(self._scopes).isdisjoint(set(requested_scopes)):
+            message = "Introspection response contains any required scopes."
+            logger.debug(message)
+            raise SuspiciousOperation(message)
+
+        audience = introspection_response.get("aud", None)
+        if not audience:
+            raise SuspiciousOperation(
+                "Introspection response does not provide source audience."
+            )
+
+        return introspection_response
+
+    def _introspect(self, token):
+        """Introspect an access token to the authorization server."""
+        try:
+            jwe = self._authorization_server_client.get_introspection(
+                self._client_id,
+                self._client_secret,
+                token,
+            )
+        except HTTPError as err:
+            message = "Could not fetch introspection"
+            logger.debug("%s. Exception:", message, exc_info=True)
+            raise SuspiciousOperation(message) from err
+
+        private_key = utils.import_private_key_from_settings()
+        jws = self._decrypt(jwe, private_key=private_key)
+
+        try:
+            public_key_set = self._authorization_server_client.import_public_keys()
+        except (TypeError, ValueError, AttributeError, HTTPError) as err:
+            message = "Could get authorization server JWKS"
+            logger.debug("%s. Exception:", message, exc_info=True)
+            raise SuspiciousOperation(message) from err
+
+        jwt = self._decode(jws, public_key_set)
+
+        return jwt
+
+    def _decrypt(self, encrypted_token, private_key):
+        """Decrypt the token encrypted by the Authorization Server (AS).
+
+        Resource Server (RS)'s public key is used for encryption, and its private
+        key is used for decryption. The RS's public key is exposed to the AS via a JWKS endpoint.
+        Encryption Algorithm and Encoding should be configured to match between the AS
+        and the RS.
+        """
+
+        try:
+            decrypted_token = jose_jwe.decrypt_compact(
+                encrypted_token,
+                private_key,
+                algorithms=[self._encryption_algorithm, self._encryption_encoding],
+            )
+        except Exception as err:
+            message = "Token decryption failed"
+            logger.debug("%s. Exception:", message, exc_info=True)
+            raise SuspiciousOperation(message) from err
+
+        return decrypted_token
+
+    def _decode(self, encoded_token, public_key_set):
+        """Decode the token signed by the Authorization Server (AS).
+
+        AS's private key is used for signing, and its public key is used for decoding.
+        The AS public key is exposed via a JWK endpoint.
+        Signing Algorithm should be configured to match between the AS and the RS.
+        """
+        try:
+            token = jose_jwt.decode(
+                encoded_token.plaintext,
+                public_key_set,
+                algorithms=[self._signing_algorithm],
+            )
+        except ValueError as err:
+            message = "Token decoding failed"
+            logger.debug("%s. Exception:", message, exc_info=True)
+            raise SuspiciousOperation(message) from err
+
+        return token
+
+    def _verify_claims(self, token):
+        """Verify the claims of the token to ensure authentication security.
+
+        By verifying these claims, we ensure that the token was issued by a
+        trusted authorization server and is intended for this specific
+        resource server. This prevents various types of attacks, such as
+        token substitution or misuse of tokens issued for different clients.
+        """
+        try:
+            self._claims_registry.validate(token.claims)
+        except (InvalidClaimError, InvalidTokenError) as err:
+            message = "Failed to validate token's claims"
+            logger.debug("%s. Exception:", message, exc_info=True)
+            raise SuspiciousOperation(message) from err
+
+        return token.claims
+
+
+class ResourceServerImproperlyConfiguredBackend:
+    """Fallback backend for improperly configured Resource Servers."""
+
+    token_origin_audience = None
+
+    def get_or_create_user(self, access_token, id_token, payload):
+        """Indicate that the Resource Server is improperly configured."""
+        raise AuthenticationFailed("Resource Server is improperly configured")
@@ -0,0 +1,97 @@
+"""Resource Server Clients classes"""
+
+from django.core.exceptions import ImproperlyConfigured
+
+import requests
+from joserfc.jwk import KeySet
+
+
+class AuthorizationServerClient:
+    """Client for interacting with an OAuth 2.0 authorization server.
+
+    An authorization server issues access tokens to client applications after authenticating
+    and obtaining authorization from the resource owner. It also provides endpoints for token
+    introspection and JSON Web Key Sets (JWKS) to validate and decode tokens.
+
+    This client facilitates communication with the authorization server, including:
+    - Fetching token introspection responses.
+    - Fetching JSON Web Key Sets (JWKS) for token validation.
+    - Setting appropriate headers for secure communication as recommended by RFC drafts.
+    """
+
+    # ruff: noqa: PLR0913 PLR0917
+    # pylint: disable=too-many-positional-arguments
+    # pylint: disable=too-many-arguments
+    def __init__(
+        self,
+        url,
+        url_jwks,
+        url_introspection,
+        verify_ssl,
+        timeout,
+        proxy,
+    ):
+        """Require at a minimum url, url_jwks and url_introspection."""
+
+        if not url or not url_jwks or not url_introspection:
+            raise ImproperlyConfigured(
+                "Could not instantiate AuthorizationServerClient, some parameters are missing."
+            )
+
+        self.url = url
+        self._url_introspection = url_introspection
+        self._url_jwks = url_jwks
+        self._verify_ssl = verify_ssl
+        self._timeout = timeout
+        self._proxy = proxy
+
+    @property
+    def _introspection_headers(self):
+        """Get HTTP header for the introspection request.
+
+        Notify the authorization server that we expect a signed and encrypted response
+        by setting the appropriate 'Accept' header.
+
+        This follows the recommendation from the draft RFC:
+        https://datatracker.ietf.org/doc/html/draft-ietf-oauth-jwt-introspection-response-12.
+        """
+        return {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Accept": "application/token-introspection+jwt",
+        }
+
+    def get_introspection(self, client_id, client_secret, token):
+        """Retrieve introspection response about a token."""
+        response = requests.post(
+            self._url_introspection,
+            data={
+                "client_id": client_id,
+                "client_secret": client_secret,
+                "token": token,
+            },
+            headers=self._introspection_headers,
+            verify=self._verify_ssl,
+            timeout=self._timeout,
+            proxies=self._proxy,
+        )
+        response.raise_for_status()
+        return response.text
+
+    def get_jwks(self):
+        """Retrieve Authorization Server JWKS."""
+        response = requests.get(
+            self._url_jwks,
+            verify=self._verify_ssl,
+            timeout=self._timeout,
+            proxies=self._proxy,
+        )
+        response.raise_for_status()
+        return response.json()
+
+    def import_public_keys(self):
+        """Retrieve and import Authorization Server JWKS."""
+
+        jwks = self.get_jwks()
+        public_keys = KeySet.import_key_set(jwks)
+
+        return public_keys
@@ -0,0 +1,53 @@
+"""
+Mixins for resource server views.
+"""
+
+from rest_framework import exceptions as drf_exceptions
+
+from .authentication import ResourceServerAuthentication
+
+
+class ResourceServerMixin:
+    """
+    Mixin for resource server views:
+     - Restrict the authentication class to ResourceServerAuthentication.
+     - Adds the Service Provider ID to the serializer context.
+     - Fetch the Service Provider ID from the OIDC introspected token stored
+       in the request.
+
+    This Mixin *must* be used in every view that should act as a resource server.
+    """
+
+    authentication_classes = [ResourceServerAuthentication]
+
+    def get_serializer_context(self):
+        """Extra context provided to the serializer class."""
+        context = super().get_serializer_context()
+
+        # When used as a resource server, we need to know the audience to automatically:
+        # - add the Service Provider to the team "scope" on creation
+        context["from_service_provider_audience"] = (
+            self._get_service_provider_audience()
+        )
+
+        return context
+
+    def _get_service_provider_audience(self):
+        """Return the audience of the Service Provider from the OIDC introspected token."""
+        if not isinstance(
+            self.request.successful_authenticator, ResourceServerAuthentication
+        ):
+            # We could check request.resource_server_token_audience here, but it's
+            # more explicit to check the authenticator type and assert the attribute
+            # existence.
+            return None
+
+        # When used as a resource server, the request has a token audience
+        service_provider_audience = self.request.resource_server_token_audience
+
+        if not service_provider_audience:  # should not happen
+            raise drf_exceptions.AuthenticationFailed(
+                "Resource server token audience not found in request"
+            )
+
+        return service_provider_audience
@@ -0,0 +1,9 @@
+"""Resource Server URL Configuration"""
+
+from django.urls import path
+
+from .views import JWKSView
+
+urlpatterns = [
+    path("jwks", JWKSView.as_view(), name="resource_server_jwks"),
+]
@@ -0,0 +1,48 @@
+"""Resource Server utils functions"""
+
+from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
+
+from joserfc.jwk import JWKRegistry
+
+
+def import_private_key_from_settings():
+    """Import the private key used by the resource server when interacting with the OIDC provider.
+
+    This private key is crucial; its public components are exposed in the JWK endpoints,
+    while its private component is used for decrypting the introspection token retrieved
+    from the OIDC provider.
+
+    By default, we recommend using RSAKey for asymmetric encryption,
+    known for its strong security features.
+
+    Note:
+        - The function requires the 'OIDC_RS_PRIVATE_KEY_STR' setting to be configured.
+        - The 'OIDC_RS_ENCRYPTION_KEY_TYPE' and 'OIDC_RS_ENCRYPTION_ALGO' settings can be customized
+          based on the chosen key type.
+
+    Raises:
+        ImproperlyConfigured: If the private key setting is missing, empty, or incorrect.
+
+    Returns:
+        joserfc.jwk.JWK: The imported private key as a JWK object.
+    """
+
+    private_key_str = getattr(settings, "OIDC_RS_PRIVATE_KEY_STR", None)
+    if not private_key_str:
+        raise ImproperlyConfigured(
+            "OIDC_RS_PRIVATE_KEY_STR setting is missing or empty."
+        )
+
+    private_key_pem = private_key_str.encode()
+
+    try:
+        private_key = JWKRegistry.import_key(
+            private_key_pem,
+            key_type=settings.OIDC_RS_ENCRYPTION_KEY_TYPE,
+            parameters={"alg": settings.OIDC_RS_ENCRYPTION_ALGO, "use": "enc"},
+        )
+    except ValueError as err:
+        raise ImproperlyConfigured("OIDC_RS_PRIVATE_KEY_STR setting is wrong.") from err
+
+    return private_key
@@ -0,0 +1,40 @@
+"""Resource Server views"""
+
+from django.core.exceptions import ImproperlyConfigured
+
+from joserfc.jwk import KeySet
+from rest_framework.response import Response
+from rest_framework.views import APIView
+
+from . import utils
+
+
+class JWKSView(APIView):
+    """
+    API endpoint for retrieving a JSON Web Keys Set (JWKS).
+
+    Returns:
+        Response: JSON response containing the JWKS data.
+    """
+
+    authentication_classes = []  # disable authentication
+    permission_classes = []  # disable permission
+
+    def get(self, request):
+        """Handle GET requests to retrieve JSON Web Keys Set (JWKS).
+
+        Returns:
+            Response: JSON response containing the JWKS data.
+        """
+
+        try:
+            private_key = utils.import_private_key_from_settings()
+        except (ImproperlyConfigured, ValueError) as err:
+            return Response({"error": str(err)}, status=500)
+
+        try:
+            jwk = KeySet([private_key]).as_dict(private=False)
+        except (TypeError, ValueError, AttributeError):
+            return Response({"error": "Could not load key"}, status=500)
+
+        return Response(jwk)
@@ -2,16 +2,11 @@

 from django.contrib.auth import get_user_model
 from django.core.exceptions import SuspiciousOperation
-from django.test import RequestFactory, override_settings

 import pytest
-from rest_framework.exceptions import AuthenticationFailed

 from core import factories, models
-from core.authentication.backends import (
-    AccountServiceAuthentication,
-    OIDCAuthenticationBackend,
-)
+from core.authentication.backends import OIDCAuthenticationBackend

 pytestmark = pytest.mark.django_db
 User = get_user_model()
@@ -100,7 +95,7 @@ def test_authentication_getter_existing_user_change_fields(
    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)

    # One and only one additional update query when a field has changed
-    with django_assert_num_queries(4):
+    with django_assert_num_queries(2):
        authenticated_user = klass.get_or_create_user(
            access_token="test-token", id_token=None, payload=None
        )
@@ -160,8 +155,7 @@ def test_authentication_getter_existing_user_via_email(

    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)

-    with django_assert_num_queries(5):
-        # 5 = user by email + user by sub + update sub + 2 from django-lasuite
+    with django_assert_num_queries(2):
        user = klass.get_or_create_user(
            access_token="test-token", id_token=None, payload=None
        )
@@ -239,7 +233,7 @@ def test_authentication_getter_new_user_with_email(monkeypatch):
    assert user.sub == "123"
    assert user.email == email
    assert user.name == "John Doe"
-    assert user.has_usable_password() is False
+    assert user.password == "!"
    assert models.User.objects.count() == 1


@@ -258,7 +252,7 @@ def test_models_oidc_user_getter_invalid_token(django_assert_num_queries, monkey
        django_assert_num_queries(0),
        pytest.raises(
            SuspiciousOperation,
-            match="Claims verification failed",
+            match="User info contained no recognizable user identification",
        ),
    ):
        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
@@ -391,8 +385,6 @@ def test_authentication_getter_new_user_with_registration_id_new_organization(
    assert user.organization.domain_list == expected_domain_list
    assert user.organization.registration_id_list == expected_registration_id_list

-    assert models.OrganizationAccess.objects.filter(user=user).exists() is False
-

 def test_authentication_getter_existing_user_via_email_update_organization(
    django_assert_num_queries, monkeypatch
@@ -414,7 +406,7 @@ def test_authentication_getter_existing_user_via_email_update_organization(

    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)

-    with django_assert_num_queries(11):
+    with django_assert_num_queries(9):
        user = klass.get_or_create_user(
            access_token="test-token", id_token=None, payload=None
        )
@@ -461,60 +453,3 @@ def test_authentication_getter_existing_user_with_registration_id(

    assert user.organization is not None
    assert user.organization.registration_id_list == ["12345678901234"]
-
-
-@override_settings(ACCOUNT_SERVICE_SCOPES=["la-suite-list-organizations-siret"])
-def test_account_service_authenticate_valid_api_key():
-    """Test the authenticate method with a valid API key."""
-    request = RequestFactory().get("/")
-    account_service = factories.AccountServiceFactory(
-        name="test_service",
-        api_key="test_api_key_123",
-        scopes=["la-suite-list-organizations-siret"],
-    )
-    request.headers = {"Authorization": f"ApiKey {account_service.api_key}"}
-
-    result = AccountServiceAuthentication().authenticate(request)
-
-    assert result is not None
-    assert result[0] == account_service
-    assert result[1] == account_service.api_key
-
-
-def test_account_service_authenticate_missing_api_key():
-    """Test the authenticate method with a missing API key."""
-    request = RequestFactory().get("/")
-    request.headers = {}
-
-    result = AccountServiceAuthentication().authenticate(request)
-
-    assert result is None
-
-
-def test_account_service_authenticate_invalid_api_key():
-    """Test the authenticate method with an invalid API key."""
-    request = RequestFactory().get("/")
-    request.headers = {"Authorization": "ApiKey invalid_key"}
-
-    with pytest.raises(AuthenticationFailed):
-        AccountServiceAuthentication().authenticate(request)
-
-
-@override_settings(ACCOUNT_SERVICE_SCOPES=["la-suite-list-organizations-siret"])
-def test_account_service_authenticate_invalid_header():
-    """Test the authenticate method with an invalid header."""
-    request = RequestFactory().get("/")
-    account_service = factories.AccountServiceFactory(
-        name="test_service",
-        api_key="test_api_key_123",
-        scopes=["la-suite-list-organizations-siret"],
-    )
-    request.headers = {"Authorization": f"Bearer {account_service.api_key}"}
-
-    with pytest.raises(AuthenticationFailed):
-        AccountServiceAuthentication().authenticate(request)
-
-    request.headers = {"Authorization": account_service.api_key}
-
-    with pytest.raises(AuthenticationFailed):
-        AccountServiceAuthentication().authenticate(request)
@@ -0,0 +1,10 @@
+"""Unit tests for the Authentication URLs."""
+
+from core.authentication.urls import urlpatterns
+
+
+def test_urls_override_default_mozilla_django_oidc():
+    """Custom URL patterns should override default ones from Mozilla Django OIDC."""
+
+    url_names = [u.name for u in urlpatterns]
+    assert url_names.index("oidc_logout_custom") < url_names.index("oidc_logout")
@@ -0,0 +1,231 @@
+"""Unit tests for the Authentication Views."""
+
+from unittest import mock
+from urllib.parse import parse_qs, urlparse
+
+from django.contrib.auth.models import AnonymousUser
+from django.contrib.sessions.middleware import SessionMiddleware
+from django.core.exceptions import SuspiciousOperation
+from django.test import RequestFactory
+from django.test.utils import override_settings
+from django.urls import reverse
+from django.utils import crypto
+
+import pytest
+from rest_framework.test import APIClient
+
+from core import factories
+from core.authentication.views import OIDCLogoutCallbackView, OIDCLogoutView
+
+pytestmark = pytest.mark.django_db
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/example-logout")
+def test_view_logout_anonymous():
+    """Anonymous users calling the logout url,
+    should be redirected to the specified LOGOUT_REDIRECT_URL."""
+
+    url = reverse("oidc_logout_custom")
+    response = APIClient().get(url)
+
+    assert response.status_code == 302
+    assert response.url == "/example-logout"
+
+
+@mock.patch.object(
+    OIDCLogoutView, "construct_oidc_logout_url", return_value="/example-logout"
+)
+def test_view_logout(mocked_oidc_logout_url):
+    """Authenticated users should be redirected to OIDC provider for logout."""
+
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    url = reverse("oidc_logout_custom")
+    response = client.get(url)
+
+    mocked_oidc_logout_url.assert_called_once()
+
+    assert response.status_code == 302
+    assert response.url == "/example-logout"
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/default-redirect-logout")
+@mock.patch.object(
+    OIDCLogoutView, "construct_oidc_logout_url", return_value="/default-redirect-logout"
+)
+def test_view_logout_no_oidc_provider(mocked_oidc_logout_url):
+    """Authenticated users should be logged out when no OIDC provider is available."""
+
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    url = reverse("oidc_logout_custom")
+
+    with mock.patch("mozilla_django_oidc.views.auth.logout") as mock_logout:
+        response = client.get(url)
+        mocked_oidc_logout_url.assert_called_once()
+        mock_logout.assert_called_once()
+
+    assert response.status_code == 302
+    assert response.url == "/default-redirect-logout"
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/example-logout")
+def test_view_logout_callback_anonymous():
+    """Anonymous users calling the logout callback url,
+    should be redirected to the specified LOGOUT_REDIRECT_URL."""
+
+    url = reverse("oidc_logout_callback")
+    response = APIClient().get(url)
+
+    assert response.status_code == 302
+    assert response.url == "/example-logout"
+
+
+@pytest.mark.parametrize(
+    "initial_oidc_states",
+    [{}, {"other_state": "foo"}],
+)
+def test_view_logout_persist_state(initial_oidc_states):
+    """State value should be persisted in session's data."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    if initial_oidc_states:
+        request.session["oidc_states"] = initial_oidc_states
+        request.session.save()
+
+    mocked_state = "mock_state"
+
+    OIDCLogoutView().persist_state(request, mocked_state)
+
+    assert "oidc_states" in request.session
+    assert request.session["oidc_states"] == {
+        "mock_state": {},
+        **initial_oidc_states,
+    }
+
+
+@override_settings(OIDC_OP_LOGOUT_ENDPOINT="/example-logout")
+@mock.patch.object(OIDCLogoutView, "persist_state")
+@mock.patch.object(crypto, "get_random_string", return_value="mocked_state")
+def test_view_logout_construct_oidc_logout_url(
+    mocked_get_random_string, mocked_persist_state
+):
+    """Should construct the logout URL to initiate the logout flow with the OIDC provider."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    request.session["oidc_id_token"] = "mocked_oidc_id_token"
+    request.session.save()
+
+    redirect_url = OIDCLogoutView().construct_oidc_logout_url(request)
+
+    mocked_persist_state.assert_called_once()
+    mocked_get_random_string.assert_called_once()
+
+    params = parse_qs(urlparse(redirect_url).query)
+
+    assert params["id_token_hint"][0] == "mocked_oidc_id_token"
+    assert params["state"][0] == "mocked_state"
+
+    url = reverse("oidc_logout_callback")
+    assert url in params["post_logout_redirect_uri"][0]
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/")
+def test_view_logout_construct_oidc_logout_url_none_id_token():
+    """If no ID token is available in the session,
+    the user should be redirected to the final URL."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    redirect_url = OIDCLogoutView().construct_oidc_logout_url(request)
+
+    assert redirect_url == "/"
+
+
+@pytest.mark.parametrize(
+    "initial_state",
+    [None, {"other_state": "foo"}],
+)
+def test_view_logout_callback_wrong_state(initial_state):
+    """Should raise an error if OIDC state doesn't match session data."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().request()
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    if initial_state:
+        request.session["oidc_states"] = initial_state
+        request.session.save()
+
+    callback_view = OIDCLogoutCallbackView.as_view()
+
+    with pytest.raises(SuspiciousOperation) as excinfo:
+        callback_view(request)
+
+    assert (
+        str(excinfo.value) == "OIDC callback state not found in session `oidc_states`!"
+    )
+
+
+@override_settings(LOGOUT_REDIRECT_URL="/example-logout")
+def test_view_logout_callback():
+    """If state matches, callback should clear OIDC state and redirects."""
+
+    user = factories.UserFactory()
+
+    request = RequestFactory().get("/logout-callback/", data={"state": "mocked_state"})
+    request.user = user
+
+    middleware = SessionMiddleware(get_response=lambda x: x)
+    middleware.process_request(request)
+
+    mocked_state = "mocked_state"
+
+    request.session["oidc_states"] = {mocked_state: {}}
+    request.session.save()
+
+    callback_view = OIDCLogoutCallbackView.as_view()
+
+    with mock.patch("mozilla_django_oidc.views.auth.logout") as mock_logout:
+
+        def clear_user(request):
+            # Assert state is cleared prior to logout
+            assert request.session["oidc_states"] == {}
+            request.user = AnonymousUser()
+
+        mock_logout.side_effect = clear_user
+        response = callback_view(request)
+        mock_logout.assert_called_once()
+
+    assert response.status_code == 302
+    assert response.url == "/example-logout"
@@ -52,8 +52,8 @@ def test_api_contacts_update_authenticated_owned(django_assert_num_queries):
    ).data
    new_contact_values["override"] = str(factories.ContactFactory().id)

-    with django_assert_num_queries(14):
-        # user, 2x contact, user, 3x check, update contact, 3x savepoint/release
+    with django_assert_num_queries(8):
+        # user, 2x contact, user, 3x check, update contact
        response = client.put(
            f"/api/v1.0/contacts/{contact.id!s}/",
            new_contact_values,
@@ -1 +0,0 @@
-"""Test fixtures."""
@@ -1,123 +0,0 @@
-"""Define here some fake responses from Matrix API, useful to mock responses in tests."""
-
-from rest_framework import status
-
-
-# SEARCH
-def mock_search_empty():
-    """Mock response when no Matrix user has been found through search."""
-    return {
-        "message": {"limited": "false", "results": []},
-        "status_code": status.HTTP_200_OK,
-    }
-
-
-def mock_search_successful(user):
-    """Mock response when exactly one user has been found through search."""
-    return {
-        "message": {
-            "limited": "false",
-            "results": [
-                {
-                    "user_id": f"@{user.email.replace('@', '-')}:user_server.com",
-                    "display_name": f"@{user.name} [Fake]",
-                    "avatar_url": "null",
-                },
-            ],
-        },
-        "status_code": status.HTTP_200_OK,
-    }
-
-
-def mock_search_successful_multiple(user):
-    """Mock response when more than one user has been found through search."""
-    return {
-        "message": {
-            "limited": "false",
-            "results": [
-                {
-                    "user_id": f"@{user.email.replace('@', '-')}:user_server1.com",
-                    "display_name": f"@{user.name} [Fake]",
-                    "avatar_url": "null",
-                },
-                {
-                    "user_id": f"@{user.email.replace('@', '-')}:user_server2.com",
-                    "display_name": f"@{user.name} [Other Fake]",
-                    "avatar_url": "null",
-                },
-            ],
-        },
-        "status_code": status.HTTP_200_OK,
-    }
-
-
-# JOIN ROOMS
-def mock_join_room_successful(room_id):
-    """Mock response when succesfully joining room. Same response if already in room."""
-    return {"message": {"room_id": str(room_id)}, "status_code": status.HTTP_200_OK}
-
-
-def mock_join_room_no_known_servers():
-    """Mock response when room to join cannot be found."""
-    return {
-        "message": {"errcode": "M_UNKNOWN", "error": "No known servers"},
-        "status_code": status.HTTP_404_NOT_FOUND,
-    }
-
-
-def mock_join_room_forbidden():
-    """Mock response when room cannot be joined."""
-    return {
-        "message": {
-            "errcode": "M_FORBIDDEN",
-            "error": "You do not belong to any of the required rooms/spaces to join this room.",
-        },
-        "status_code": status.HTTP_403_FORBIDDEN,
-    }
-
-
-# INVITE USER
-def mock_invite_successful():
-    """Mock response when invite request was succesful. Does not check the user exists."""
-    return {"message": {}, "status_code": status.HTTP_200_OK}
-
-
-def mock_invite_user_already_in_room(user):
-    """Mock response when invitation forbidden for People user."""
-    return {
-        "message": {
-            "errcode": "M_FORBIDDEN",
-            "error": f"{user.email.replace('@', '-')}:home_server.fr is already in the room.",
-        },
-        "status_code": status.HTTP_403_FORBIDDEN,
-    }
-
-
-# KICK USER
-def mock_kick_successful():
-    """Mock response when succesfully joining room."""
-    return {"message": {}, "status_code": status.HTTP_200_OK}
-
-
-def mock_kick_user_forbidden(user):
-    """Mock response when kick request is forbidden (i.e. wrong permission or user is room admin."""
-    return {
-        "message": {
-            "errcode": "M_FORBIDDEN",
-            "error": f"You cannot kick user @{user.email.replace('@', '-')}.",
-        },
-        "status_code": status.HTTP_403_FORBIDDEN,
-    }
-
-
-def mock_kick_user_not_in_room():
-    """
-    Mock response when trying to kick a user who isn't in the room. Don't check the user exists.
-    """
-    return {
-        "message": {
-            "errcode": "M_FORBIDDEN",
-            "error": "The target user is not in the room",
-        },
-        "status_code": status.HTTP_403_FORBIDDEN,
-    }
@@ -1 +0,0 @@
-"""Test module for the JSON schema validation."""
@@ -1,53 +0,0 @@
-"""Test module for the JSON schema validation."""
-
-import json
-import os
-
-import pytest
-
-
-def test_all_json_schemas_load_correctly(settings):
-    """Test that all JSON schema files in the jsonschema directory load correctly."""
-    # Get the base directory for jsonschema files
-    schema_dir = os.path.join(settings.BASE_DIR, "core", "jsonschema")
-
-    # List to store any errors encountered
-    errors = []
-    loaded_schemas = 0
-
-    # Walk through the jsonschema directory and its subdirectories
-    for root, _, files in os.walk(schema_dir):
-        for file in files:
-            if file.endswith(".json"):
-                schema_path = os.path.join(root, file)
-                rel_path = os.path.relpath(schema_path, schema_dir)
-
-                try:
-                    # Try to load the schema
-                    with open(schema_path, "r", encoding="utf-8") as schema_file:
-                        schema = json.load(schema_file)
-
-                    # Verify it's a dictionary (basic schema validation)
-                    assert isinstance(schema, dict), (
-                        f"Schema in {rel_path} is not a dictionary"
-                    )
-
-                    # Check for common schema properties
-                    if "$schema" not in schema:
-                        errors.append(
-                            f"Warning: {rel_path} does not contain a $schema property"
-                        )
-
-                    loaded_schemas += 1
-
-                except json.JSONDecodeError as e:
-                    errors.append(f"Failed to decode {rel_path}: {e}")
-                except Exception as e:  # noqa: BLE001 pylint: disable=broad-except
-                    errors.append(f"Error loading {rel_path}: {e}")
-
-    # Ensure we found and loaded at least one schema
-    assert loaded_schemas > 0, "No JSON schema files were found"
-
-    # If any errors were encountered, fail the test
-    if errors:
-        pytest.fail("\n".join(errors))
@@ -1 +0,0 @@
-"""Test for management commands for core app."""
@@ -1,94 +0,0 @@
-"""Tests for the fill_organization_metadata management command."""
-
-from io import StringIO
-from unittest.mock import patch
-
-from django.core.management import call_command
-
-import pytest
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-@pytest.fixture(name="command_output")
-def command_output_fixture():
-    """Capture command output."""
-    out = StringIO()
-    return out
-
-
-@pytest.mark.django_db
-def test_fill_organization_metadata_no_schema(command_output):
-    """Test command behavior when no schema is available."""
-    organization_1 = factories.OrganizationFactory(
-        name="Org with empty metadata",
-        metadata={},
-        with_registration_id=True,
-    )
-    organization_2 = factories.OrganizationFactory(
-        name="Org with partial metadata",
-        metadata={"existing_key": "existing_value"},
-        with_registration_id=True,
-    )
-
-    # Mock the schema function to return None (no schema)
-    with patch("core.models.get_organization_metadata_schema") as mock_get_schema:
-        mock_get_schema.return_value = None
-
-        # Call the command
-        call_command("fill_organization_metadata", stdout=command_output)
-
-    # Check the command output
-    assert "No organization metadata schema defined" in command_output.getvalue()
-
-    organization_1.refresh_from_db()
-    assert organization_1.metadata == {}
-
-    organization_2.refresh_from_db()
-    assert organization_2.metadata == {"existing_key": "existing_value"}
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize(
-    "existing_metadata,expected_result",
-    [
-        ({}, {"field1": "default_value"}),  # Empty metadata gets defaults
-        ({"field1": "custom"}, {"field1": "custom"}),  # Existing values preserved
-        (
-            {"other_field": "value"},
-            {"other_field": "value", "field1": "default_value"},
-        ),  # Mixed case
-    ],
-)
-def test_metadata_merging_scenarios(existing_metadata, expected_result):
-    """Test various metadata merging scenarios."""
-    # Create a simple schema with one field
-    simple_schema = {
-        "type": "object",
-        "properties": {
-            "field1": {"type": "string", "default": "default_value"},
-        },
-    }
-
-    # Create an organization with the specified metadata
-    organization = factories.OrganizationFactory(
-        name="Test organization",
-        metadata=existing_metadata,
-        with_registration_id=True,
-    )
-
-    # Mock the schema function to return our simple schema
-    with patch("core.models.get_organization_metadata_schema") as mock_get_schema:
-        mock_get_schema.return_value = simple_schema
-
-        # Call the command
-        call_command("fill_organization_metadata")
-
-    # Refresh from DB and check
-    organization.refresh_from_db()
-
-    # Check that the metadata has been merged correctly
-    for key, value in expected_result.items():
-        assert organization.metadata[key] == value
@@ -9,37 +9,18 @@ from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 from joserfc import jwe as jose_jwe
 from joserfc import jwt as jose_jwt
-from joserfc.jwk import RSAKey
+from joserfc.rfc7518.rsa_key import RSAKey
 from jwt.utils import to_base64url_uint
-from lasuite.oidc_resource_server.authentication import (
-    ResourceServerAuthentication,
-    get_resource_server_backend,
-)
 from rest_framework.request import Request as DRFRequest
 from rest_framework.status import HTTP_200_OK, HTTP_401_UNAUTHORIZED

 from core.factories import UserFactory
 from core.models import ServiceProvider
+from core.resource_server.authentication import ResourceServerAuthentication

 pytestmark = pytest.mark.django_db


-@pytest.fixture(name="jwt_resource_server_backend")
-def jwt_resource_server_backend_fixture(settings):
-    """Fixture to switch the backend to the JWTResourceServerBackend."""
-    _original_backend = str(settings.OIDC_RS_BACKEND_CLASS)
-
-    settings.OIDC_RS_BACKEND_CLASS = (
-        "lasuite.oidc_resource_server.backend.JWTResourceServerBackend"
-    )
-    get_resource_server_backend.cache_clear()
-
-    yield
-
-    settings.OIDC_RS_BACKEND_CLASS = _original_backend
-    get_resource_server_backend.cache_clear()
-
-
 def build_authorization_bearer(token):
    """
    Build an Authorization Bearer header value from a token.
@@ -66,88 +47,6 @@ def test_resource_server_authentication_class(client, settings):
    `resource_server_token_audience` attribute which is used in
    the resource server views.

-    This test uses the `/resource-server/v1.0/teams/` URL as an example
-    because we don't want to create a new URL just for this test.
-    """
-    assert (
-        settings.OIDC_RS_BACKEND_CLASS
-        == "lasuite.oidc_resource_server.backend.ResourceServerBackend"
-    )
-
-    settings.OIDC_RS_CLIENT_ID = "some_client_id"
-    settings.OIDC_RS_CLIENT_SECRET = "some_client_secret"
-
-    settings.OIDC_OP_URL = "https://oidc.example.com"
-    settings.OIDC_VERIFY_SSL = False
-    settings.OIDC_TIMEOUT = 5
-    settings.OIDC_PROXY = None
-    settings.OIDC_OP_JWKS_ENDPOINT = "https://oidc.example.com/jwks"
-    settings.OIDC_OP_INTROSPECTION_ENDPOINT = "https://oidc.example.com/introspect"
-
-    responses.add(
-        responses.POST,
-        "https://oidc.example.com/introspect",
-        json={
-            "iss": "https://oidc.example.com",
-            "aud": "some_client_id",  # settings.OIDC_RS_CLIENT_ID
-            "sub": "very-specific-sub",
-            "client_id": "some_service_provider",
-            "scope": "openid groups",
-            "active": True,
-        },
-    )
-
-    # Try to authenticate while the user does not exist => 401
-    response = client.get(
-        "/resource-server/v1.0/teams/",  # use an exising URL here
-        format="json",
-        HTTP_AUTHORIZATION=f"Bearer {build_authorization_bearer('some_token')}",
-    )
-    assert response.status_code == HTTP_401_UNAUTHORIZED
-    assert ServiceProvider.objects.count() == 0
-
-    # Create a user with the specific sub, the access is authorized
-    UserFactory(sub="very-specific-sub")
-
-    response = client.get(
-        "/resource-server/v1.0/teams/",  # use an exising URL here
-        format="json",
-        HTTP_AUTHORIZATION=f"Bearer {build_authorization_bearer('some_token')}",
-    )
-
-    assert response.status_code == HTTP_200_OK
-
-    response_request = response.renderer_context.get("request")
-    assert isinstance(response_request, DRFRequest)
-    assert isinstance(
-        response_request.successful_authenticator, ResourceServerAuthentication
-    )
-
-    # Check that the user is authenticated
-    assert response_request.user.is_authenticated
-
-    # Check the request contains the resource server token audience
-    assert response_request.resource_server_token_audience == "some_service_provider"
-
-    # Check that no service provider is created here
-    assert ServiceProvider.objects.count() == 0
-
-
-@responses.activate
-def test_jwt_resource_server_authentication_class(  # pylint: disable=unused-argument
-    client, jwt_resource_server_backend, settings
-):
-    """
-    Defines the settings for the resource server
-    for a full authentication with introspection process.
-
-    This is an integration test that checks the authentication process
-    when using the ResourceServerAuthentication class.
-
-    This test asserts the DRF request object contains the
-    `resource_server_token_audience` attribute which is used in
-    the resource server views.
-
    This test uses the `/resource-server/v1.0/teams/` URL as an example
    because we don't want to create a new URL just for this test.
    """
@@ -235,8 +134,7 @@ def test_jwt_resource_server_authentication_class(  # pylint: disable=unused-arg
                "token_introspection": {
                    "sub": "very-specific-sub",
                    "iss": "https://oidc.example.com",
-                    "aud": "some_client_id",
-                    "client_id": "some_service_provider",
+                    "aud": "some_service_provider",
                    "scope": "openid groups",
                    "active": True,
                },
@@ -0,0 +1,447 @@
+"""
+Test for the Resource Server (RS) Backend.
+"""
+
+
+# pylint: disable=W0212
+
+from logging import Logger
+from unittest.mock import Mock, patch
+
+from django.contrib import auth
+from django.core.exceptions import SuspiciousOperation
+from django.test.utils import override_settings
+
+import pytest
+from joserfc.errors import InvalidClaimError, InvalidTokenError
+from joserfc.jwt import JWTClaimsRegistry
+from requests.exceptions import HTTPError
+
+from core.resource_server.backend import ResourceServerBackend
+
+
+@pytest.fixture(name="mock_authorization_server")
+def fixture_mock_authorization_server():
+    """Mock an Authorization Server client."""
+    mock_server = Mock()
+    mock_server.url = "https://auth.server.com"
+    return mock_server
+
+
+@pytest.fixture(name="mock_token")
+def fixture_mock_token():
+    """Mock a token"""
+    mock_token = Mock()
+    mock_token.claims = {"sub": "user123", "iss": "https://auth.server.com"}
+    return mock_token
+
+
+@pytest.fixture(name="resource_server_backend")
+def fixture_resource_server_backend(settings, mock_authorization_server):
+    """Generate a Resource Server backend."""
+
+    settings.OIDC_RS_CLIENT_ID = "client_id"
+    settings.OIDC_RS_CLIENT_SECRET = "client_secret"
+    settings.OIDC_RS_ENCRYPTION_ENCODING = "A256GCM"
+    settings.OIDC_RS_ENCRYPTION_ALGO = "RSA-OAEP"
+    settings.OIDC_RS_SIGNING_ALGO = "ES256"
+    settings.OIDC_RS_SCOPES = ["groups"]
+
+    return ResourceServerBackend(mock_authorization_server)
+
+
+@override_settings(OIDC_RS_CLIENT_ID="client_id")
+@override_settings(OIDC_RS_CLIENT_SECRET="client_secret")
+@override_settings(OIDC_RS_ENCRYPTION_ENCODING="A256GCM")
+@override_settings(OIDC_RS_ENCRYPTION_ALGO="RSA-OAEP")
+@override_settings(OIDC_RS_SIGNING_ALGO="RS256")
+@override_settings(OIDC_RS_SCOPES=["scopes"])
+@patch.object(auth, "get_user_model", return_value="foo")
+def test_backend_initialization(mock_get_user_model, mock_authorization_server):
+    """Test the ResourceServerBackend initialization."""
+
+    backend = ResourceServerBackend(mock_authorization_server)
+
+    mock_get_user_model.assert_called_once()
+    assert backend.UserModel == "foo"
+
+    assert backend._client_id == "client_id"
+    assert backend._client_secret == "client_secret"
+    assert backend._encryption_encoding == "A256GCM"
+    assert backend._encryption_algorithm == "RSA-OAEP"
+    assert backend._signing_algorithm == "RS256"
+    assert backend._scopes == ["scopes"]
+
+    assert backend._authorization_server_client == mock_authorization_server
+    assert isinstance(backend._claims_registry, JWTClaimsRegistry)
+
+    assert backend._claims_registry.options == {
+        "iss": {"essential": True, "value": "https://auth.server.com"},
+        "aud": {"essential": True, "value": "client_id"},
+        "token_introspection": {"essential": True},
+    }
+
+
+@patch.object(ResourceServerBackend, "get_user", return_value="user")
+def test_get_or_create_user(mock_get_user, resource_server_backend):
+    """Test 'get_or_create_user' method."""
+
+    access_token = "access_token"
+    res = resource_server_backend.get_or_create_user(access_token, None, None)
+
+    mock_get_user.assert_called_once_with(access_token)
+    assert res == "user"
+
+
+def test_verify_claims_success(resource_server_backend, mock_token):
+    """Test '_verify_claims' method with a successful response."""
+
+    with patch.object(
+        resource_server_backend._claims_registry, "validate"
+    ) as mock_validate:
+        resource_server_backend._verify_claims(mock_token)
+        mock_validate.assert_called_once_with(mock_token.claims)
+
+
+def test_verify_claims_invalid_claim_error(resource_server_backend, mock_token):
+    """Test '_verify_claims' method with an invalid claim error."""
+
+    with patch.object(
+        resource_server_backend._claims_registry, "validate"
+    ) as mock_validate:
+        mock_validate.side_effect = InvalidClaimError("claim_name")
+
+        expected_message = "Failed to validate token's claims"
+        with patch.object(Logger, "debug") as mock_logger_debug:
+            with pytest.raises(SuspiciousOperation, match=expected_message):
+                resource_server_backend._verify_claims(mock_token)
+            mock_logger_debug.assert_called_once_with(
+                "%s. Exception:", expected_message, exc_info=True
+            )
+
+
+def test_verify_claims_invalid_token_error(resource_server_backend, mock_token):
+    """Test '_verify_claims' method with an invalid token error."""
+
+    with patch.object(
+        resource_server_backend._claims_registry, "validate"
+    ) as mock_validate:
+        mock_validate.side_effect = InvalidTokenError
+
+        expected_message = "Failed to validate token's claims"
+        with patch.object(Logger, "debug") as mock_logger_debug:
+            with pytest.raises(SuspiciousOperation, match=expected_message):
+                resource_server_backend._verify_claims(mock_token)
+            mock_logger_debug.assert_called_once_with(
+                "%s. Exception:", expected_message, exc_info=True
+            )
+
+
+def test_decode_success(resource_server_backend):
+    """Test '_decode' method with a successful response."""
+
+    encoded_token = Mock()
+    encoded_token.plaintext = "valid_encoded_token"
+    public_key_set = Mock()
+
+    expected_decoded_token = {"sub": "user123"}
+
+    with patch(
+        "joserfc.jwt.decode", return_value=expected_decoded_token
+    ) as mock_decode:
+        decoded_token = resource_server_backend._decode(encoded_token, public_key_set)
+
+        mock_decode.assert_called_once_with(
+            "valid_encoded_token", public_key_set, algorithms=["ES256"]
+        )
+
+        assert decoded_token == expected_decoded_token
+
+
+def test_decode_failure(resource_server_backend):
+    """Test '_decode' method with a ValueError"""
+    encoded_token = Mock()
+    encoded_token.plaintext = "invalid_encoded_token"
+    public_key_set = Mock()
+
+    with patch("joserfc.jwt.decode", side_effect=ValueError):
+        with patch.object(Logger, "debug") as mock_logger_debug:
+            with pytest.raises(SuspiciousOperation, match="Token decoding failed"):
+                resource_server_backend._decode(encoded_token, public_key_set)
+
+            mock_logger_debug.assert_called_once_with(
+                "%s. Exception:", "Token decoding failed", exc_info=True
+            )
+
+
+def test_decrypt_success(resource_server_backend):
+    """Test '_decrypt' method with a successful response."""
+    encrypted_token = "valid_encrypted_token"
+    private_key = "private_key"
+
+    expected_decrypted_token = {"sub": "user123"}
+
+    with patch(
+        "joserfc.jwe.decrypt_compact", return_value=expected_decrypted_token
+    ) as mock_decrypt:
+        decrypted_token = resource_server_backend._decrypt(encrypted_token, private_key)
+        mock_decrypt.assert_called_once_with(
+            encrypted_token, private_key, algorithms=["RSA-OAEP", "A256GCM"]
+        )
+
+        assert decrypted_token == expected_decrypted_token
+
+
+def test_decrypt_failure(resource_server_backend):
+    """Test '_decrypt' method with an Exception."""
+    encrypted_token = "invalid_encrypted_token"
+    private_key = "private_key"
+
+    with patch(
+        "joserfc.jwe.decrypt_compact", side_effect=Exception("Decryption error")
+    ):
+        expected_message = "Token decryption failed"
+        with patch.object(Logger, "debug") as mock_logger_debug:
+            with pytest.raises(SuspiciousOperation, match=expected_message):
+                resource_server_backend._decrypt(encrypted_token, private_key)
+            mock_logger_debug.assert_called_once_with(
+                "%s. Exception:", expected_message, exc_info=True
+            )
+
+
+@patch(
+    "core.resource_server.utils.import_private_key_from_settings",
+    return_value="private_key",
+)
+# pylint: disable=unused-argument
+def test_introspect_success(
+    mock_import_private_key_from_settings, resource_server_backend
+):
+    """Test '_introspect' method with a successful response."""
+    token = "valid_token"
+    jwe = "valid_jwe"
+    jws = "valid_jws"
+    jwt = {"sub": "user123"}
+
+    resource_server_backend._authorization_server_client.get_introspection = Mock(
+        return_value=jwe
+    )
+    resource_server_backend._decrypt = Mock(return_value=jws)
+    resource_server_backend._authorization_server_client.import_public_keys = Mock(
+        return_value="public_key_set"
+    )
+    resource_server_backend._decode = Mock(return_value=jwt)
+
+    result = resource_server_backend._introspect(token)
+
+    assert result == jwt
+    resource_server_backend._authorization_server_client.get_introspection.assert_called_once_with(
+        "client_id", "client_secret", token
+    )
+    resource_server_backend._decrypt.assert_called_once_with(
+        jwe, private_key="private_key"
+    )
+    resource_server_backend._authorization_server_client.import_public_keys.assert_called_once()
+    resource_server_backend._decode.assert_called_once_with(jws, "public_key_set")
+
+
+def test_introspect_introspection_failure(resource_server_backend):
+    """Test '_introspect' method when introspection to the AS fails."""
+    token = "invalid_token"
+    resource_server_backend._authorization_server_client.get_introspection.side_effect = HTTPError(
+        "Introspection error"
+    )
+
+    with patch.object(Logger, "debug") as mock_logger_debug:
+        expected_message = "Could not fetch introspection"
+        with pytest.raises(SuspiciousOperation, match=expected_message):
+            resource_server_backend._introspect(token)
+
+        mock_logger_debug.assert_called_once_with(
+            "%s. Exception:", expected_message, exc_info=True
+        )
+
+
+@patch(
+    "core.resource_server.utils.import_private_key_from_settings",
+    return_value="private_key",
+)
+# pylint: disable=unused-argument
+def test_introspect_public_key_import_failure(
+    mock_import_private_key_from_settings, resource_server_backend
+):
+    """Test '_introspect' method when fetching AS's jwks fails."""
+    token = "valid_token"
+    jwe = "valid_jwe"
+    jws = "valid_jws"
+
+    resource_server_backend._authorization_server_client.get_introspection = Mock(
+        return_value=jwe
+    )
+    resource_server_backend._decrypt = Mock(return_value=jws)
+
+    resource_server_backend._authorization_server_client.import_public_keys.side_effect = HTTPError(
+        "Public key error"
+    )
+
+    with patch.object(Logger, "debug") as mock_logger_debug:
+        expected_message = "Could get authorization server JWKS"
+        with pytest.raises(SuspiciousOperation, match=expected_message):
+            resource_server_backend._introspect(token)
+
+        mock_logger_debug.assert_called_once_with(
+            "%s. Exception:", expected_message, exc_info=True
+        )
+
+
+def test_verify_user_info_success(resource_server_backend):
+    """Test '_verify_user_info' with a successful response."""
+    introspection_response = {"active": True, "scope": "groups", "aud": "123"}
+
+    result = resource_server_backend._verify_user_info(introspection_response)
+    assert result == introspection_response
+
+
+def test_verify_user_info_inactive(resource_server_backend):
+    """Test '_verify_user_info' with an inactive introspection response."""
+
+    introspection_response = {"active": False, "scope": "groups"}
+
+    expected_message = "Introspection response is not active."
+    with patch.object(Logger, "debug") as mock_logger_debug:
+        with pytest.raises(SuspiciousOperation, match=expected_message):
+            resource_server_backend._verify_user_info(introspection_response)
+
+        mock_logger_debug.assert_called_once_with(expected_message)
+
+
+def test_verify_user_info_wrong_scopes(resource_server_backend):
+    """Test '_verify_user_info' with wrong requested scopes."""
+
+    introspection_response = {"active": True, "scope": "wrong-scopes"}
+
+    expected_message = "Introspection response contains any required scopes."
+    with patch.object(Logger, "debug") as mock_logger_debug:
+        with pytest.raises(SuspiciousOperation, match=expected_message):
+            resource_server_backend._verify_user_info(introspection_response)
+
+        mock_logger_debug.assert_called_once_with(expected_message)
+
+
+def test_get_user_success(resource_server_backend):
+    """Test '_get_user' with a successful response."""
+
+    access_token = "valid_access_token"
+    mock_jwt = Mock()
+    mock_claims = {"token_introspection": {"sub": "user123", "aud": "123"}}
+    mock_user = Mock()
+
+    resource_server_backend._introspect = Mock(return_value=mock_jwt)
+    resource_server_backend._verify_claims = Mock(return_value=mock_claims)
+    resource_server_backend._verify_user_info = Mock(
+        return_value=mock_claims["token_introspection"]
+    )
+    resource_server_backend.UserModel.objects.get = Mock(return_value=mock_user)
+
+    user = resource_server_backend.get_user(access_token)
+
+    assert user == mock_user
+    resource_server_backend._introspect.assert_called_once_with(access_token)
+    resource_server_backend._verify_claims.assert_called_once_with(mock_jwt)
+    resource_server_backend._verify_user_info.assert_called_once_with(
+        mock_claims["token_introspection"]
+    )
+    resource_server_backend.UserModel.objects.get.assert_called_once_with(sub="user123")
+
+
+def test_get_user_could_not_introspect(resource_server_backend):
+    """Test '_get_user' with introspection failing."""
+
+    access_token = "valid_access_token"
+
+    resource_server_backend._introspect = Mock(
+        side_effect=SuspiciousOperation("Invalid jwt")
+    )
+    resource_server_backend._verify_claims = Mock()
+    resource_server_backend._verify_user_info = Mock()
+
+    with pytest.raises(SuspiciousOperation, match="Invalid jwt"):
+        resource_server_backend.get_user(access_token)
+
+    resource_server_backend._introspect.assert_called_once_with(access_token)
+    resource_server_backend._verify_claims.assert_not_called()
+    resource_server_backend._verify_user_info.assert_not_called()
+
+
+def test_get_user_invalid_introspection_response(resource_server_backend):
+    """Test '_get_user' with an invalid introspection response."""
+
+    access_token = "valid_access_token"
+    mock_jwt = Mock()
+
+    resource_server_backend._introspect = Mock(return_value=mock_jwt)
+    resource_server_backend._verify_claims = Mock(
+        side_effect=SuspiciousOperation("Invalid claims")
+    )
+    resource_server_backend._verify_user_info = Mock()
+
+    with pytest.raises(SuspiciousOperation, match="Invalid claims"):
+        resource_server_backend.get_user(access_token)
+
+    resource_server_backend._introspect.assert_called_once_with(access_token)
+    resource_server_backend._verify_claims.assert_called_once_with(mock_jwt)
+    resource_server_backend._verify_user_info.assert_not_called()
+
+
+def test_get_user_user_not_found(resource_server_backend):
+    """Test '_get_user' if the user is not found."""
+
+    access_token = "valid_access_token"
+    mock_jwt = Mock()
+    mock_claims = {"token_introspection": {"sub": "user123"}}
+
+    resource_server_backend._introspect = Mock(return_value=mock_jwt)
+    resource_server_backend._verify_claims = Mock(return_value=mock_claims)
+    resource_server_backend._verify_user_info = Mock(
+        return_value=mock_claims["token_introspection"]
+    )
+    resource_server_backend.UserModel.objects.get = Mock(
+        side_effect=resource_server_backend.UserModel.DoesNotExist
+    )
+
+    with patch.object(Logger, "debug") as mock_logger_debug:
+        user = resource_server_backend.get_user(access_token)
+        assert user is None
+        resource_server_backend._introspect.assert_called_once_with(access_token)
+        resource_server_backend._verify_claims.assert_called_once_with(mock_jwt)
+        resource_server_backend._verify_user_info.assert_called_once_with(
+            mock_claims["token_introspection"]
+        )
+        resource_server_backend.UserModel.objects.get.assert_called_once_with(
+            sub="user123"
+        )
+
+        mock_logger_debug.assert_called_once_with(
+            "Login failed: No user with %s found", "user123"
+        )
+
+
+def test_get_user_no_user_identification(resource_server_backend):
+    """Test '_get_user' if the response miss a user identification."""
+
+    access_token = "valid_access_token"
+    mock_jwt = Mock()
+    mock_claims = {"token_introspection": {}}
+
+    resource_server_backend._introspect = Mock(return_value=mock_jwt)
+    resource_server_backend._verify_claims = Mock(return_value=mock_claims)
+    resource_server_backend._verify_user_info = Mock(
+        return_value=mock_claims["token_introspection"]
+    )
+
+    expected_message = "User info contained no recognizable user identification"
+    with patch.object(Logger, "debug") as mock_logger_debug:
+        with pytest.raises(SuspiciousOperation, match=expected_message):
+            resource_server_backend.get_user(access_token)
+
+        mock_logger_debug.assert_called_once_with(expected_message)
@@ -0,0 +1,187 @@
+"""
+Test for the Resource Server (RS) clients classes.
+"""
+
+# pylint: disable=W0212
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from joserfc.jwk import KeySet, RSAKey
+from requests.exceptions import HTTPError
+
+from core.resource_server.clients import AuthorizationServerClient
+
+
+@pytest.fixture(name="client")
+def fixture_client():
+    """Generate an Authorization Server client."""
+    return AuthorizationServerClient(
+        url="https://auth.example.com/api/v2",
+        url_jwks="https://auth.example.com/api/v2/jwks",
+        url_introspection="https://auth.example.com/api/v2/introspect",
+        verify_ssl=True,
+        timeout=5,
+        proxy=None,
+    )
+
+
+def test_authorization_server_client_initialization():
+    """Test the AuthorizationServerClient initialization."""
+
+    new_client = AuthorizationServerClient(
+        url="https://auth.example.com/api/v2",
+        url_jwks="https://auth.example.com/api/v2/jwks",
+        url_introspection="https://auth.example.com/api/v2/checktoken/foo",
+        verify_ssl=True,
+        timeout=5,
+        proxy=None,
+    )
+
+    assert new_client.url == "https://auth.example.com/api/v2"
+    assert (
+        new_client._url_introspection
+        == "https://auth.example.com/api/v2/checktoken/foo"
+    )
+    assert new_client._url_jwks == "https://auth.example.com/api/v2/jwks"
+    assert new_client._verify_ssl is True
+    assert new_client._timeout == 5
+    assert new_client._proxy is None
+
+
+def test_introspection_headers(client):
+    """Test the introspection headers to ensure they match the expected values."""
+    assert client._introspection_headers == {
+        "Content-Type": "application/x-www-form-urlencoded",
+        "Accept": "application/token-introspection+jwt",
+    }
+
+
+@patch("requests.post")
+def test_get_introspection_success(mock_post, client):
+    """Test 'get_introspection' method with a successful response."""
+
+    mock_response = MagicMock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.text = "introspection response"
+    mock_post.return_value = mock_response
+
+    result = client.get_introspection("client_id", "client_secret", "token")
+    assert result == "introspection response"
+
+    mock_post.assert_called_once_with(
+        "https://auth.example.com/api/v2/introspect",
+        data={
+            "client_id": "client_id",
+            "client_secret": "client_secret",
+            "token": "token",
+        },
+        headers={
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Accept": "application/token-introspection+jwt",
+        },
+        verify=True,
+        timeout=5,
+        proxies=None,
+    )
+
+
+@patch("requests.post", side_effect=HTTPError())
+# pylint: disable=(unused-argument
+def test_get_introspection_error(mock_post, client):
+    """Test 'get_introspection' method with an HTTPError."""
+    with pytest.raises(HTTPError):
+        client.get_introspection("client_id", "client_secret", "token")
+
+
+@patch("requests.get")
+def test_get_jwks_success(mock_get, client):
+    """Test 'get_jwks' method with a successful response."""
+
+    mock_response = MagicMock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.json.return_value = {"jwks": "foo"}
+    mock_get.return_value = mock_response
+
+    result = client.get_jwks()
+    assert result == {"jwks": "foo"}
+
+    mock_get.assert_called_once_with(
+        "https://auth.example.com/api/v2/jwks",
+        verify=client._verify_ssl,
+        timeout=client._timeout,
+        proxies=client._proxy,
+    )
+
+
+@patch("requests.get")
+def test_get_jwks_error(mock_get, client):
+    """Test 'get_jwks' method with an HTTPError."""
+
+    mock_response = MagicMock()
+    mock_response.raise_for_status.side_effect = HTTPError(
+        response=MagicMock(status=500)
+    )
+    mock_get.return_value = mock_response
+
+    with pytest.raises(HTTPError):
+        client.get_jwks()
+
+
+@patch("requests.get")
+def test_import_public_keys_valid(mock_get, client):
+    """Test 'import_public_keys' method with a successful response."""
+
+    mocked_key = RSAKey.generate_key(2048)
+
+    mock_response = MagicMock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.json.return_value = {"keys": [mocked_key.as_dict()]}
+    mock_get.return_value = mock_response
+
+    response = client.import_public_keys()
+
+    assert isinstance(response, KeySet)
+    assert response.as_dict() == KeySet([mocked_key]).as_dict()
+
+
+@patch("requests.get")
+def test_import_public_keys_http_error(mock_get, client):
+    """Test 'import_public_keys' method with an HTTPError."""
+
+    mock_response = MagicMock()
+    mock_response.raise_for_status.side_effect = HTTPError(
+        response=MagicMock(status=500)
+    )
+    mock_get.return_value = mock_response
+
+    with pytest.raises(HTTPError):
+        client.import_public_keys()
+
+
+@patch("requests.get")
+def test_import_public_keys_empty_jwks(mock_get, client):
+    """Test 'import_public_keys' method with empty keys response."""
+
+    mock_response = MagicMock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.json.return_value = {"keys": []}
+    mock_get.return_value = mock_response
+
+    response = client.import_public_keys()
+
+    assert isinstance(response, KeySet)
+    assert response.as_dict() == {"keys": []}
+
+
+@patch("requests.get")
+def test_import_public_keys_invalid_jwks(mock_get, client):
+    """Test 'import_public_keys' method with invalid keys response."""
+
+    mock_response = MagicMock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.json.return_value = {"keys": [{"foo": "foo"}]}
+    mock_get.return_value = mock_response
+
+    with pytest.raises(ValueError):
+        client.import_public_keys()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jacques ROUSSEL	607dfe71b3	wip	2025-02-10 12:06:47 +01:00
Jacques ROUSSEL	6b7d7c0555	🔧(helm) add pdbs to deployments In order to avoid a service interruption during a Kubernetes (k8s)upgrade, we add a Pod Disruption Budget (PDB) to deployments.	2025-02-10 11:24:23 +01:00
				`@@ -1 +0,0 @@`
				`"""SCIM compliant API for resource server"""`
				`@@ -1 +0,0 @@`
				`"""Test module for the JSON schema validation."""`
				`@@ -1 +0,0 @@`
				`"""Test for management commands for core app."""`