Fix typo

✨(ci) add docker layer caching
2024-10-25 13:00:37 +02:00 · 2024-10-24 16:32:13 +02:00
269 changed files with 13226 additions and 23263 deletions
@@ -9,9 +9,9 @@ We primarily use GitHub as an issue tracker. If however you're encountering an i

 ---

-Please make sure you have read our [main Readme](https://github.com/suitenumerique/people).
+Please make sure you have read our [main Readme](https://github.com/numerique-gouv/people).

-Also make sure it was not already answered in [an open or close issue](https://github.com/suitenumerique/people/issues).
+Also make sure it was not already answered in [an open or close issue](https://github.com/numerique-gouv/people/issues).

 If your question was not covered, and you feel like it should be, fire away! We'd love to improve our docs! 👌

@@ -11,9 +11,26 @@ jobs:
  notify-argocd:
    runs-on: ubuntu-latest
    steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "people,secrets"
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/people/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
      -
        name: Call argocd github webhook
        run: |
@@ -1,5 +1,4 @@
 name: Docker Hub Workflow
-run-name: Docker Hub Workflow

 on:
  workflow_dispatch:
@@ -16,59 +15,42 @@ env:
  DOCKER_USER: 1001:127

 jobs:
-  trivy-scan:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout repository
-        uses: actions/checkout@v4
-      -
-        name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            lasuite/people-backend
-            lasuite/people-frontend
-      -
-        name: Run trivy scan (backend)
-        uses: numerique-gouv/action-trivy-cache@main
-        with:
-          docker-build-args: '--target backend-production -f Dockerfile'
-          docker-image-name: 'docker.io/lasuite/people-backend:${{ github.sha }}'
-      -
-        name: Run trivy scan (frontend)
-        uses: numerique-gouv/action-trivy-cache@main
-        with:
-          docker-build-args: '--target frontend-production -f Dockerfile'
-          docker-image-name: 'docker.io/lasuite/people-frontend:${{ github.sha }}'
-
  build-and-push-backend:
    runs-on: ubuntu-latest
    steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "people,secrets"
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
      -
        name: Docker meta
        id: meta
        uses: docker/metadata-action@v5
        with:
          images: lasuite/people-backend
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/people/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
      -
        name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        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
-        with:
-          name: "version.json"
-          json: '{"source":"${{github.repository}}", "version":"${{github.ref_name}}", "commit":"${{github.sha}}", "build": "NA"}'
-          dir: 'src/backend'
+        run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
      -
        name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
        with:
          context: .
          target: backend-production
@@ -80,29 +62,39 @@ jobs:
  build-and-push-frontend:
    runs-on: ubuntu-latest
    steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "people,secrets"
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
      -
        name: Docker meta
        id: meta
        uses: docker/metadata-action@v5
        with:
          images: lasuite/people-frontend
-      - name: create-version-json
-        id: create-version-json
-        uses: jsdaniell/create-json@v1.2.3
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
        with:
-          name: "version.json"
-          json: '{"source":"${{github.repository}}", "version":"${{github.ref_name}}", "commit":"${{github.sha}}", "build": "NA"}'
-          dir: 'src/frontend/apps/desk'
+          secret-file: secrets/numerique-gouv/people/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
      -
        name: Login to DockerHub
        if: github.event_name != 'pull_request'
-        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USER }}" --password-stdin
+        run: echo "$DOCKER_HUB_PASSWORD" | docker login -u "$DOCKER_HUB_USER" --password-stdin
      -
        name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
        with:
          context: .
          target: frontend-production
@@ -118,12 +110,29 @@ jobs:
    runs-on: ubuntu-latest
    if: github.event_name != 'pull_request'
    steps:
+      -
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+          repositories: "people,secrets"
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ steps.app-token.outputs.token }}
+      -
+        name: Load sops secrets
+        uses: rouja/actions-sops@main
+        with:
+          secret-file: secrets/numerique-gouv/people/secrets.enc.env
+          age-key: ${{ secrets.SOPS_PRIVATE }}
      -
        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 }}
+          data='{"ref": "'$GITHUB_REF'","repository": {"html_url":"'$GITHUB_SERVER_URL'/'$GITHUB_REPOSITORY'"}}'
+          sig=$(echo -n ${data} | openssl dgst -sha1 -hmac ''${ARGOCD_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}" $ARGOCD_WEBHOOK_URL
@@ -0,0 +1,22 @@
+name: Helmfile lint
+run-name: Helmfile lint
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+
+jobs:
+  helmfile-lint:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/helmfile/helmfile:latest
+    steps:
+      -
+        uses: numerique-gouv/action-helmfile-lint@main
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          age-key: ${{ secrets.SOPS_PRIVATE }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+          helmfile-src: "src/helm"
+          repositories: "people,secrets"
@@ -16,7 +16,7 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+            fetch-depth: 0
      - name: show
        run: git log
      - name: Enforce absence of print statements in code
@@ -39,7 +39,7 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v4
        with:
-          fetch-depth: 0
+            fetch-depth: 0
      - name: Check that the CHANGELOG has been modified in the current branch
        run: git whatchanged --name-only --pretty="" origin/${{ github.event.pull_request.base.ref }}..HEAD | grep CHANGELOG

@@ -139,7 +139,7 @@ jobs:
        with:
          path: 'src/frontend/**/node_modules'
          key: front-node_modules-${{ hashFiles('src/frontend/**/yarn.lock') }}
-
+        
      - name: Check linting
        run: cd src/frontend/ && yarn lint

@@ -147,11 +147,6 @@ jobs:
    runs-on: ubuntu-latest
    needs: [build-mails, build-front]
    timeout-minutes: 10
-    strategy:
-      fail-fast: false
-      matrix:
-        shardIndex: [1, 2, 3, 4]
-        shardTotal: [4]
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
@@ -181,14 +176,28 @@ jobs:
          path: src/frontend/apps/desk/out/
          key: build-front-${{ github.run_id }}

+      # Pull the latest image to build, and avoid caching pull-only images.
+      # (docker pull is faster than caching in most cases.)
+      - run: docker compose pull
+
+      # In this step, this action saves a list of existing images,
+      # the cache is created without them in the post run.
+      # It also restores the cache if it exists.
+      - uses: satackey/action-docker-layer-caching@v0.0.11
+        # Ignore the failure of a step and avoid terminating the job.
+        continue-on-error: true
+
      - name: Build and Start Docker Servers
        env:
          DOCKER_BUILDKIT: 1
          COMPOSE_DOCKER_CLI_BUILD: 1
        run: |
-          docker compose build --pull --build-arg BUILDKIT_INLINE_CACHE=1
+          docker compose build --build-arg BUILDKIT_INLINE_CACHE=1
          make run

+      # Finally, "Post Run satackey/action-docker-layer-caching@v0.0.11",
+      # which is the process of saving the cache, will be executed.
+
      - name: Apply DRF migrations
        run: |
          make migrate
@@ -197,43 +206,19 @@ 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 }}
-
-      - name: Save logs
-        if: always()
-        run: docker compose logs > src/frontend/apps/e2e/report/logs.txt
-
-      - name: Save Dimail logs
-        if: always()
-        run: docker compose logs dimail > src/frontend/apps/e2e/report/dimail-logs.txt
+        run: cd src/frontend/ && yarn e2e:test

      - uses: actions/upload-artifact@v4
        if: always()
        with:
-          name: playwright-report-${{ matrix.shardIndex }}
+          name: playwright-report
          path: src/frontend/apps/e2e/report/
          retention-days: 7

-  tests-e2e-feedback:
-    runs-on: ubuntu-latest
-    needs: [test-e2e]
-    if: always()
-    steps:
-      - name: All tests ok
-        if: ${{ !(contains(needs.*.result, 'failure')) }}
-        run: exit 0
-      - name: Some tests failed
-        if: ${{ contains(needs.*.result, 'failure') }}
-        run: exit 1
-
  build-mails:
    runs-on: ubuntu-latest
    defaults:
@@ -255,8 +240,8 @@ jobs:
      - name: Persist mails' templates
        uses: actions/upload-artifact@v4
        with:
-          name: mails-templates
-          path: src/backend/core/templates/mail
+            name: mails-templates
+            path: src/backend/core/templates/mail

  lint-back:
    runs-on: ubuntu-latest
@@ -1,35 +0,0 @@
-name: Release Chart
-run-name: Release Chart
-
-on:
-  push:
-
-jobs:
-  release:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Cleanup
-        run: |
-          rm -rf ./src/helm/extra
-          rm -rf ./src/helm/dimail
-          rm -rf ./src/helm/mailcatcher
-
-
-      - name: Install Helm
-        uses: azure/setup-helm@v4
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-
-      - name: Publish Helm charts
-        uses: numerique-gouv/helm-gh-pages@add-overwrite-option
-        with:
-          charts_dir: ./src/helm
-          linting: on
-          token: ${{ secrets.GITHUB_TOKEN }}
@@ -42,6 +42,7 @@ env.bak/
 venv.bak/
 env.d/development/*
 !env.d/development/*.dist
+env.d/terraform

 # npm
 node_modules
@@ -58,6 +59,11 @@ src/frontend/tsclient
 # Logs
 *.log

+# Terraform
+.terraform
+*.tfstate
+*.tfstate.backup
+
 # Test & lint
 .coverage
 coverage.json
@@ -8,4 +8,3 @@ creation_rules:
      - age12g6f5fse25tgrwweleh4jls3qs52hey2edh759smulwmk5lnzadslu2cp3 # Antoine Lebaud
      - age1hnhuzj96ktkhpyygvmz0x9h8mfvssz7ss6emmukags644mdhf4msajk93r # Samuel Paccoud
      - age1tl80n23wq6zxegupwn70ew0yp225ua5v4dk800x7g2w6pvlxz46qk592pa # Marie Pupo Jeammet
-      - age1rjchule5sncn8r8gfph07muee6vzx4wqfrtldt5jjzke4vlfxy2qqplfvc # Quentin Bey
@@ -8,159 +8,6 @@ and this project adheres to

 ## [Unreleased]

-## [1.11.0] - 2025-02-07
-
-### Added
-
- ✨(api) add count mailboxes to MailDomain serializer
- ✨(dimail) manage 'action required' status for MailDomain
- ✨(domains) add action required status on MailDomain
- ✨(dimail) send pending mailboxes upon domain activation
-
-### Fixed
-
- 🚑️(teams) do not display add button when disallowed #676
- 🚑️(plugins) fix name from SIRET specific case #674
- 🐛(api) restrict mailbox sync to enabled domains
-
-## [1.10.1] - 2025-01-27
-
-### Added
-
- ✨(dimail) management command to fetch domain status
-
-### Changed
-
- ✨(scripts) adapts release script after moving the deployment part
-
-### Fixed
-
- 🐛(dimail) fix imported mailboxes should be enabled instead of pending #659 
- ⚡️(api) add missing cache for stats endpoint
-
-## [1.10.0] - 2025-01-21
-
-### Added
-
- ✨(api) create stats endpoint
- ✨(teams) add Team dependencies #560
- ✨(organization) add admin action for plugin #640
- ✨(anct) fetch and display organization names of communes #583
- ✨(frontend) display email if no username #562
- 🧑‍💻(oidc) add ability to pull registration ID (e.g. SIRET) from OIDC #577
-
-### Fixed
-
- 🐛(frontend) improve e2e tests avoiding race condition from mocks #641
- 🐛(backend) fix flaky test with search contact #605
- 🐛(backend) fix flaky test with team access #646
- 🧑‍💻(dimail) remove 'NoneType: None' log in debug mode
- 🐛(frontend) fix flaky e2e test #636
- 🐛(frontend) fix disable mailbox button display #631
- 🐛(backend) fix dimail call despite mailbox creation failure on our side
- 🧑‍💻(user) fix the User.language infinite migration #611
-
-## [1.9.1] - 2024-12-18
-
-## [1.9.0] - 2024-12-17
-
-### Fixed
-
- 🐛(backend) fix manage roles on domain admin view
-
-### Added
-
- ✨(backend) add admin action to check domain health
- ✨(dimail) check domain health
- ✨(frontend) disable mailbox and allow to create pending mailbox
- ✨(organizations) add siret to name conversion #584
- 💄(frontend) redirect home according to abilities #588
- ✨(maildomain_access) add API endpoint to search users #508
-
-## [1.8.0] - 2024-12-12
-
-### Added
-
- ✨(contacts) add "abilities" to API endpoint data #585
- ✨(contacts) allow filter list API with email
- ✨(contacts) return profile contact from same organization
- ✨(dimail) automate allows requests to dimail
- ✨(contacts) add notes & force full_name #565
-
-### Changed
-
- ♻️(contacts) move user profile to contact #572
- ♻️(contacts) split api test module in actions #573
-
-### Fixed
-
- 🐛(backend) fix manage roles on domain admin view
- 🐛(mailbox) fix activate mailbox feature
- 🔧(helm) fix the configuration environment #579
-
-## [1.7.1] - 2024-11-28
-
-## [1.7.0] - 2024-11-28
-
-### Added
-
- ✨(mailbox) allow to activate mailbox
- ✨(mailbox) allow to disable mailbox
- ✨(backend) add ServiceProvider #522
- 💄(admin) allow header color customization #552 
- ✨(organization) add API endpoints #551
-
-### Fixed
-
-  🐛(admin) add organization on user #555
-
-## [1.6.1] - 2024-11-22
-
-### Fixed
-
- 🩹(mailbox) fix status of current mailboxes
- 🚑️(backend) fix claim contains non-user field #548
-
-## [1.6.0] - 2024-11-20
-
-### Removed
-
- 🔥(teams) remove search by trigram for team access and contact
-
-### Added
-
- ✨(domains) allow creation of "pending" mailboxes
- ✨(teams) allow team management for team admins/owners #509
-
-### Fixed
-
-  🔊(backend) update logger config to info #542
-
-## [1.5.0] - 2024-11-14
-
-### Removed
-
- ⬆️(dependencies) remove unneeded dependencies
- 🔥(teams) remove pagination of teams listing
- 🔥(teams) remove search users by trigram
- 🗃️(teams) remove `slug` field
-
-### Added
-
- ✨(dimail) send domain creation requests to dimail #454
- ✨(dimail) synchronize mailboxes from dimail to our db #453
- ✨(ci) add security scan #429
- ✨(teams) register contacts on admin views
-
-### Fixed
-
- 🐛(mail) fix display button on outlook
- 💚(ci) improve E2E tests #492
- 🔧(sentry) restore default integrations
- 🔇(backend) remove Sentry duplicated warning/errors
- 👷(ci) add sharding e2e tests  #467
- 🐛(dimail) fix unexpected status_code for proper debug #454
-
 ## [1.4.1] - 2024-10-23

 ### Fixed
@@ -188,7 +35,6 @@ and this project adheres to
 - ✨(api) add RELEASE version on config endpoint #459
 - ✨(backend) manage roles on domain admin view
 - ✨(frontend) show version number in footer #369
- 👔(backend) add Organization model

 ### Changed

@@ -278,25 +124,14 @@ 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.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.9.1]: https://github.com/suitenumerique/people/releases/v1.9.1
-[1.9.0]: https://github.com/suitenumerique/people/releases/v1.9.0
-[1.8.0]: https://github.com/suitenumerique/people/releases/v1.8.0
-[1.7.1]: https://github.com/suitenumerique/people/releases/v1.7.1
-[1.7.0]: https://github.com/suitenumerique/people/releases/v1.7.0
-[1.6.1]: https://github.com/suitenumerique/people/releases/v1.6.1
-[1.6.0]: https://github.com/suitenumerique/people/releases/v1.6.0
-[1.5.0]: https://github.com/suitenumerique/people/releases/v1.5.0
-[1.4.1]: https://github.com/suitenumerique/people/releases/v1.4.1
-[1.4.0]: https://github.com/suitenumerique/people/releases/v1.4.0
-[1.3.1]: https://github.com/suitenumerique/people/releases/v1.3.1
-[1.3.0]: https://github.com/suitenumerique/people/releases/v1.3.0
-[1.2.1]: https://github.com/suitenumerique/people/releases/v1.2.1
-[1.2.0]: https://github.com/suitenumerique/people/releases/v1.2.0
-[1.1.0]: https://github.com/suitenumerique/people/releases/v1.1.0
-[1.0.2]: https://github.com/suitenumerique/people/releases/v1.0.2
-[1.0.1]: https://github.com/suitenumerique/people/releases/v1.0.1
-[1.0.0]: https://github.com/suitenumerique/people/releases/v1.0.0
+[unreleased]: https://github.com/numerique-gouv/people/compare/v1.4.1...main
+[1.4.1]: https://github.com/numerique-gouv/people/releases/v1.4.1
+[1.4.0]: https://github.com/numerique-gouv/people/releases/v1.4.0
+[1.3.1]: https://github.com/numerique-gouv/people/releases/v1.3.1
+[1.3.0]: https://github.com/numerique-gouv/people/releases/v1.3.0
+[1.2.1]: https://github.com/numerique-gouv/people/releases/v1.2.1
+[1.2.0]: https://github.com/numerique-gouv/people/releases/v1.2.0
+[1.1.0]: https://github.com/numerique-gouv/people/releases/v1.1.0
+[1.0.2]: https://github.com/numerique-gouv/people/releases/v1.0.2
+[1.0.1]: https://github.com/numerique-gouv/people/releases/v1.0.1
+[1.0.0]: https://github.com/numerique-gouv/people/releases/v1.0.0
@@ -1,17 +1,18 @@
 # Django People

 # ---- base image to inherit from ----
-FROM python:3.12.6-alpine3.20 AS base
+FROM python:3.10-slim-bullseye as base

 # Upgrade pip to its latest release to speed up dependencies installation
-RUN python -m pip install --upgrade pip setuptools
+RUN python -m pip install --upgrade pip

 # Upgrade system packages to install security updates
-RUN apk update && \
-  apk upgrade
+RUN apt-get update && \
+  apt-get -y upgrade && \
+  rm -rf /var/lib/apt/lists/*

 ### ---- Front-end dependencies image ----
-FROM node:20 AS frontend-deps
+FROM node:20 as frontend-deps

 WORKDIR /deps

@@ -24,7 +25,7 @@ COPY ./src/frontend/packages/eslint-config-people/package.json ./packages/eslint
 RUN yarn --frozen-lockfile

 ### ---- Front-end builder dev image ----
-FROM node:20 AS frontend-builder-dev
+FROM node:20 as frontend-builder-dev

 WORKDIR /builder

@@ -34,12 +35,12 @@ COPY ./src/frontend .
 WORKDIR ./apps/desk

 ### ---- Front-end builder image ----
-FROM frontend-builder-dev AS frontend-builder
+FROM frontend-builder-dev as frontend-builder

 RUN yarn build

 # ---- Front-end image ----
-FROM nginxinc/nginx-unprivileged:1.26-alpine AS frontend-production
+FROM nginxinc/nginx-unprivileged:1.25 as frontend-production

 # Un-privileged user running the application
 ARG DOCKER_USER
@@ -60,7 +61,7 @@ CMD ["nginx", "-g", "daemon off;"]


 # ---- Back-end builder image ----
-FROM base AS back-builder
+FROM base as back-builder

 WORKDIR /builder

@@ -72,7 +73,7 @@ RUN mkdir /install && \


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

 COPY ./src/mail /mail/app

@@ -83,13 +84,15 @@ RUN yarn install --frozen-lockfile && \


 # ---- static link collector ----
-FROM base AS link-collector
+FROM base as link-collector
 ARG PEOPLE_STATIC_ROOT=/data/static

 # Install libpangocairo & rdfind
-RUN apk add \
-  pango \
-  rdfind
+RUN apt-get update && \
+    apt-get install -y \
+      libpangocairo-1.0-0 \
+      rdfind && \
+    rm -rf /var/lib/apt/lists/*

 # Copy installed python dependencies
 COPY --from=back-builder /install /usr/local
@@ -108,18 +111,21 @@ RUN DJANGO_CONFIGURATION=Build DJANGO_JWT_PRIVATE_SIGNING_KEY=Dummy \
 RUN rdfind -makesymlinks true -followsymlinks true -makeresultsfile false ${PEOPLE_STATIC_ROOT}

 # ---- Core application image ----
-FROM base AS core
+FROM base as core

 ENV PYTHONUNBUFFERED=1

 # Install required system libs
-RUN apk add \
-  gettext \
-  cairo \
-  libffi-dev \
-  gdk-pixbuf \
-  pango \
-  shared-mime-info
+RUN apt-get update && \
+    apt-get install -y \
+      gettext \
+      libcairo2 \
+      libffi-dev \
+      libgdk-pixbuf2.0-0 \
+      libpango-1.0-0 \
+      libpangocairo-1.0-0 \
+      shared-mime-info && \
+  rm -rf /var/lib/apt/lists/*

 # Copy entrypoint
 COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
@@ -143,13 +149,15 @@ WORKDIR /app
 ENTRYPOINT [ "/usr/local/bin/entrypoint" ]

 # ---- Development image ----
-FROM core AS backend-development
+FROM core as backend-development

 # Switch back to the root user to install development dependencies
 USER root:root

 # Install psql
-RUN apk add postgresql-client
+RUN apt-get update && \
+    apt-get install -y postgresql-client && \
+    rm -rf /var/lib/apt/lists/*

 # Uninstall people and re-install it in editable mode along with development
 # dependencies
@@ -169,7 +177,7 @@ ENV DB_HOST=postgresql \
 CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]

 # ---- Production image ----
-FROM core AS backend-production
+FROM core as backend-production

 ARG PEOPLE_STATIC_ROOT=/data/static

@@ -131,6 +131,11 @@ demo: ## flush db then create a demo for load testing purpose
 	@$(MANAGE) create_demo
 .PHONY: demo

+reset-dimail-container:
+	@$(COMPOSE) up --force-recreate -d dimail
+	@$(MAKE) setup-dimail-db
+.PHONY: reset-dimail-container
+

 # Nota bene: Black should come after isort just in case they don't agree...
 lint: ## lint back-end python sources
@@ -278,10 +283,6 @@ i18n-generate-and-upload: \
 # -- INTEROPERABILTY
 # -- Dimail configuration

-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
@@ -354,56 +355,10 @@ start-kind: ## Create the kubernetes cluster
 	./bin/start-kind.sh
 .PHONY: start-kind

-install-external-secrets: ## install the kubernetes secrets from Vaultwarden
-	./bin/install-external-secrets.sh
-.PHONY: build-k8s-cluster
-
 tilt-up: ## start tilt - k8s local development
 	tilt up -f ./bin/Tiltfile
 .PHONY: tilt-up

-start-tilt-keycloak: ## start the kubernetes cluster using kind, without Pro Connect for authentication, use keycloak
-	DEV_ENV=dev-keycloak tilt up -f ./bin/Tiltfile
-.PHONY: build-k8s-cluster
-
 release:  ## helper for release and deployment
 	python scripts/release.py
 .PHONY: release
-
-install-secret: ## install the kubernetes secrets from Vaultwarden
-	if kubectl -n desk get secrets bitwarden-cli-desk; then \
-		echo "Secret already present"; \
-	else \
-		echo "Please provide the following information:"; \
-		read -p "Enter your vaultwarden email login: " LOGIN; \
-		read -p "Enter your vaultwarden password: " PASSWORD; \
-		read -p "Enter your vaultwarden server url: " URL; \
-		echo "\nCreate vaultwarden secret"; \
-		echo "apiVersion: v1" > /tmp/secret.yaml; \
-		echo "kind: Secret" >> /tmp/secret.yaml; \
-		echo "metadata:" >> /tmp/secret.yaml; \
-		echo "  name: bitwarden-cli-desk" >> /tmp/secret.yaml; \
-		echo "  namespace: desk" >> /tmp/secret.yaml; \
-		echo "type: Opaque" >> /tmp/secret.yaml; \
-		echo "stringData:" >> /tmp/secret.yaml; \
-		echo "  BW_HOST: $$URL" >> /tmp/secret.yaml; \
-		echo "  BW_PASSWORD: $$PASSWORD" >> /tmp/secret.yaml; \
-		echo "  BW_USERNAME: $$LOGIN" >> /tmp/secret.yaml; \
-		kubectl -n desk apply -f /tmp/secret.yaml;\
-		rm -f /tmp/secret.yaml; \
-	fi; \
-	if kubectl get ns external-secrets; then \
-		echo "External secret already deployed"; \
-	else \
-		helm repo add external-secrets https://charts.external-secrets.io; \
-		helm upgrade --install external-secrets \
-      external-secrets/external-secrets \
-       -n external-secrets \
-       --create-namespace \
-       --set installCRDs=true; \
-	fi
-.PHONY: build-k8s-cluster
-
-fetch-domain-status:
-	@$(MANAGE) fetch_domain_status
-.PHONY: fetch-domain-status
@@ -29,9 +29,7 @@ docker_build(
    ]
 )

-# helmfile in docker mount the current working directory and the helmfile.yaml
-# requires the keycloak config in another directory
-k8s_yaml(local('cd .. && helmfile -n desk -e ${DEV_ENV:-dev} template --file ./src/helm/helmfile.yaml'))
+k8s_yaml(local('cd ../src/helm && helmfile -n desk -e dev template .'))

 migration = '''
 set -eu
@@ -58,17 +56,3 @@ cmd_button('Migrate db',
           icon_name='developer_board',
           text='Run database migration',
 )
-
-# Command to created domain/users/access from people to dimail
-populate_dimail_from_people = '''
-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 setup_dimail_db --populate-from-people
-'''
-cmd_button('Populate dimail from people',
-           argv=['sh', '-c', populate_dimail_from_people],
-           resource='desk-backend',
-           icon_name='developer_board',
-           text='Populate dimail from people',
-)
@@ -5,6 +5,7 @@ set -eo pipefail
 REPO_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd)"
 UNSET_USER=0

+TERRAFORM_DIRECTORY="./env.d/terraform"
 COMPOSE_FILE="${REPO_DIR}/docker-compose.yml"
 COMPOSE_PROJECT="people"

@@ -91,3 +92,66 @@ function _dc_exec() {
 function _django_manage() {
    _dc_run "app-dev" python manage.py "$@"
 }
+
+# _set_openstack_project: select an OpenStack project from the openrc files defined in the
+# terraform directory.
+#
+# usage: _set_openstack_project
+#
+# If necessary the script will prompt the user to choose a project from those available
+function _set_openstack_project() {
+
+    declare prompt
+    declare -a projects
+    declare -i default=1
+    declare -i choice=0
+    declare -i n_projects
+
+    # List projects by looking in the "./env.d/terraform" directory
+    # and store them in an array
+    read -r -a projects <<< "$(
+        find "${TERRAFORM_DIRECTORY}" -maxdepth 1 -mindepth 1 -type d |
+        sed 's|'"${TERRAFORM_DIRECTORY}\/"'||' |
+        xargs
+    )"
+    nb_projects=${#projects[@]}
+
+    if [[ ${nb_projects} -le 0 ]]; then
+        echo "There are no OpenStack projects defined..." >&2
+        echo "To add one, create a subdirectory in \"${TERRAFORM_DIRECTORY}\" with the name" \
+            "of your project and copy your \"openrc.sh\" file into it." >&2
+        exit 10
+    fi
+
+    if [[ ${nb_projects} -gt 1 ]]; then
+        prompt="Select an OpenStack project to target:\\n"
+        for (( i=0; i<nb_projects; i++ )); do
+            prompt+="[$((i+1))] ${projects[$i]}"
+            if [[ $((i+1)) -eq ${default} ]]; then
+                prompt+=" (default)"
+            fi
+            prompt+="\\n"
+        done
+        prompt+="If your OpenStack project is not listed, add it to the \"env.d/terraform\" directory.\\n"
+        prompt+="Your choice: "
+        read -r -p "$(echo -e "${prompt}")" choice
+
+        if [[ ${choice} -gt nb_projects ]]; then
+            (>&2 echo "Invalid choice ${choice} (should be <= ${nb_projects})")
+            exit 11
+        fi
+
+        if [[ ${choice} -le 0 ]]; then
+            choice=${default}
+        fi
+    fi
+
+    project=${projects[$((choice-1))]}
+    # Check that the openrc.sh file exists for this project
+    if [ ! -f "${TERRAFORM_DIRECTORY}/${project}/openrc.sh" ]; then
+        (>&2 echo "Missing \"openrc.sh\" file in \"${TERRAFORM_DIRECTORY}/${project}\". Check documentation.")
+        exit 12
+    fi
+
+    echo "${project}"
+}
@@ -1,90 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit
-
-CURRENT_DIR=$(pwd)
-NAMESPACE=${1:-desk}
-SECRET_NAME=${2:-bitwarden-cli-desk}
-TEMP_SECRET_FILE=$(mktemp)
-
-
-cleanup() {
-    rm -f "${TEMP_SECRET_FILE}"
-}
-trap cleanup EXIT
-
-
-# Check if kubectl is available
-check_prerequisites() {
-    if ! command -v kubectl &> /dev/null; then
-        echo "Error: kubectl is not installed or not in PATH"
-        exit 1
-    fi
-}
-
-# Check if secret already exists
-check_secret_exists() {
-    kubectl -n "${NAMESPACE}" get secrets "${SECRET_NAME}" &> /dev/null
-}
-
-
-# Collect user input securely
-get_user_input() {
-    echo "Please provide the following information:"
-    read -p "Enter your Vaultwarden email login: " LOGIN
-    read -s -p "Enter your Vaultwarden password: " PASSWORD
-    echo
-    read -p "Enter your Vaultwarden server url: " URL
-}
-
-# Create and apply the secret
-create_secret() {
-    cat > "${TEMP_SECRET_FILE}" << EOF
-apiVersion: v1
-kind: Secret
-metadata:
-  name: ${SECRET_NAME}
-  namespace: ${NAMESPACE}
-type: Opaque
-stringData:
-  BW_HOST: ${URL}
-  BW_PASSWORD: ${PASSWORD}
-  BW_USERNAME: ${LOGIN}
-EOF
-
-    kubectl -n "${NAMESPACE}" apply -f "${TEMP_SECRET_FILE}"
-}
-
-# Install external-secrets using Helm
-install_external_secrets() {
-    if ! kubectl get ns external-secrets &>/dev/null; then
-        echo "Installing external-secrets…"
-        helm repo add external-secrets https://charts.external-secrets.io
-        helm upgrade --install external-secrets \
-            external-secrets/external-secrets \
-            -n external-secrets \
-            --create-namespace \
-            --set installCRDs=true
-    else
-        echo "External secrets already deployed"
-    fi
-}
-
-main() {
-    check_prerequisites
-
-    if check_secret_exists; then
-        echo "Secret '${SECRET_NAME}' already present in namespace '${NAMESPACE}'"
-        exit 0
-    fi
-
-    echo -e ${TEMP_SECRET_FILE}
-
-    get_user_input
-    echo -e "\nCreating Vaultwarden secret…"
-    create_secret
-    install_external_secrets
-
-    echo "Secret installation completed successfully"
-}
-
-main "$@"
@@ -1,3 +1,102 @@
-#!/usr/bin/env bash
+#!/bin/sh
+set -o errexit

-curl https://raw.githubusercontent.com/numerique-gouv/tools/refs/heads/main/kind/create_cluster.sh | bash -s -- desk
+CURRENT_DIR=$(pwd)
+
+# 0. Create ca
+echo "0. Create ca"
+mkcert -install
+cd /tmp
+mkcert "127.0.0.1.nip.io" "*.127.0.0.1.nip.io"
+cd $CURRENT_DIR
+
+# 1. Create registry container unless it already exists
+echo "1. Create registry container unless it already exists"
+reg_name='kind-registry'
+reg_port='5001'
+if [ "$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)" != 'true' ]; then
+	docker run \
+		-d --restart=always -p "127.0.0.1:${reg_port}:5000" --network bridge --name "${reg_name}" \
+		registry:2
+fi
+
+# 2. Create kind cluster with containerd registry config dir enabled
+echo "2. Create kind cluster with containerd registry config dir enabled"
+# TODO: kind will eventually enable this by default and this patch will
+# be unnecessary.
+#
+# See:
+# https://github.com/kubernetes-sigs/kind/issues/2875
+# https://github.com/containerd/containerd/blob/main/docs/cri/config.md#registry-configuration
+# See: https://github.com/containerd/containerd/blob/main/docs/hosts.md
+cat <<EOF | kind create cluster --config=-
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+containerdConfigPatches:
+- |-
+  [plugins."io.containerd.grpc.v1.cri".registry]
+    config_path = "/etc/containerd/certs.d"
+nodes:
+- role: control-plane
+  image: kindest/node:v1.27.3
+  kubeadmConfigPatches:
+  - |
+    kind: InitConfiguration
+    nodeRegistration:
+      kubeletExtraArgs:
+        node-labels: "ingress-ready=true"
+  extraPortMappings:
+  - containerPort: 80
+    hostPort: 80
+    protocol: TCP
+  - containerPort: 443
+    hostPort: 443
+    protocol: TCP
+- role: worker
+  image: kindest/node:v1.27.3
+- role: worker
+  image: kindest/node:v1.27.3
+EOF
+
+# 3. Add the registry config to the nodes
+echo "3. Add the registry config to the nodes"
+#
+# This is necessary because localhost resolves to loopback addresses that are
+# network-namespace local.
+# In other words: localhost in the container is not localhost on the host.
+#
+# We want a consistent name that works from both ends, so we tell containerd to
+# alias localhost:${reg_port} to the registry container when pulling images
+REGISTRY_DIR="/etc/containerd/certs.d/localhost:${reg_port}"
+for node in $(kind get nodes); do
+	docker exec "${node}" mkdir -p "${REGISTRY_DIR}"
+	cat <<EOF | docker exec -i "${node}" cp /dev/stdin "${REGISTRY_DIR}/hosts.toml"
+[host."http://${reg_name}:5000"]
+EOF
+done
+
+# 4. Connect the registry to the cluster network if not already connected
+echo "4. Connect the registry to the cluster network if not already connected"
+# This allows kind to bootstrap the network but ensures they're on the same network
+if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' "${reg_name}")" = 'null' ]; then
+	docker network connect "kind" "${reg_name}"
+fi
+
+# 5. Document the local registry
+echo "5. Document the local registry"
+# https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/generic/1755-communicating-a-local-registry
+cat <<EOF | kubectl apply -f -
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: local-registry-hosting
+  namespace: kube-public
+data:
+  localRegistryHosting.v1: |
+    host: "localhost:${reg_port}"
+    help: "https://kind.sigs.k8s.io/docs/user/local-registry/"
+EOF
+
+kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml
+kubectl -n ingress-nginx create secret tls mkcert --key /tmp/127.0.0.1.nip.io+1-key.pem --cert /tmp/127.0.0.1.nip.io+1.pem
+kubectl -n ingress-nginx patch deployments.apps ingress-nginx-controller --type 'json' -p '[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value":"--default-ssl-certificate=ingress-nginx/mkcert"}]'
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+source "$(dirname "${BASH_SOURCE[0]}")/_config.sh"
+
+project=$(_set_openstack_project)
+echo "Using \"${project}\" project..."
+
+source "${TERRAFORM_DIRECTORY}/${project}/openrc.sh"
+
+# Run Terraform commands in the Hashicorp docker container via docker compose
+# shellcheck disable=SC2068
+DOCKER_USER="$(id -u):$(id -g)" \
+    PROJECT="${project}" \
+    docker compose run --rm \
+    -e OS_AUTH_URL \
+    -e OS_IDENTITY_API_VERSION \
+    -e OS_USER_DOMAIN_NAME \
+    -e OS_PROJECT_DOMAIN_NAME \
+    -e OS_TENANT_ID \
+    -e OS_TENANT_NAME \
+    -e OS_USERNAME \
+    -e OS_PASSWORD \
+    -e OS_REGION_NAME \
+    terraform-state "$@"
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+source "$(dirname "${BASH_SOURCE[0]}")/_config.sh"
+
+project=$(_set_openstack_project)
+echo "Using \"${project}\" project..."
+
+source "${TERRAFORM_DIRECTORY}/${project}/openrc.sh"
+
+# Run Terraform commands in the Hashicorp docker container via docker compose
+# shellcheck disable=SC2068
+DOCKER_USER="$(id -u):$(id -g)" \
+    PROJECT="${project}" \
+    docker compose run --rm \
+    -e OS_AUTH_URL \
+    -e OS_IDENTITY_API_VERSION \
+    -e OS_USER_DOMAIN_NAME \
+    -e OS_PROJECT_DOMAIN_NAME \
+    -e OS_TENANT_ID \
+    -e OS_TENANT_NAME \
+    -e OS_USERNAME \
+    -e OS_PASSWORD \
+    -e OS_REGION_NAME \
+    -e TF_VAR_user_name \
+    terraform "$@"
@@ -35,7 +35,6 @@ services:
      - ./data/media:/data/media
      - ./data/static:/data/static
    depends_on:
-        - dimail
        - postgresql
        - mailcatcher
        - redis
@@ -117,6 +116,22 @@ services:
    volumes:
      - ".:/app"

+  terraform-state:
+    image: hashicorp/terraform:1.6
+    environment:
+      - TF_WORKSPACE=${PROJECT:-} # avoid env conflict in local state
+    user: ${DOCKER_USER:-1000}
+    working_dir: /app
+    volumes:
+      - ./src/terraform/create_state_bucket:/app
+
+  terraform:
+    image: hashicorp/terraform:1.6
+    user: ${DOCKER_USER:-1000}
+    working_dir: /app
+    volumes:
+      - ./src/terraform:/app
+
  kc_postgresql:
      image: postgres:14.3
      ports:
@@ -153,9 +168,7 @@ services:
      - kc_postgresql

  dimail: 
-    entrypoint: /opt/dimail-api/start-dev.sh
-    image: registry.mim-libre.fr/dimail/dimail-api:v0.1.1
-    pull_policy: always
+    image: registry.mim-libre.fr/dimail/dimail-api:latest
    environment:
      DIMAIL_MODE: FAKE
      DIMAIL_JWT_SECRET: fake_jwt_secret
@@ -58,23 +58,6 @@
      ],
      "realmRoles": ["user"]
    },
-    {
-      "username": "e2e.marie",
-      "email": "marie.varzy@gmail.com",
-      "firstName": "Marie",
-      "lastName": "Delamairie",
-      "enabled": true,
-      "attributes": {
-          "siret": "21580304000017"
-      },
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.marie"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
    {
      "username": "user-e2e-chromium",
      "email": "user@chromium.e2e",
@@ -116,216 +99,6 @@
        }
      ],
      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-member",
-      "email": "e2e.team-member@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Member",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-member"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-        {
-      "username": "e2e.team-administrator",
-      "email": "e2e.team-administrator@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Administrator",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-administrator"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-        {
-      "username": "e2e.team-owner",
-      "email": "e2e.team-owner@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Owner",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-owner"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.mail-member",
-      "email": "e2e.mail-member@example.com",
-      "firstName": "E2E",
-      "lastName": "Mailbox Member",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.mail-member"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.mail-administrator",
-      "email": "e2e.mail-administrator@example.com",
-      "firstName": "E2E",
-      "lastName": "Mailbox Administrator",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.mail-administrator"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.mail-owner",
-      "email": "e2e.mail-owner@example.com",
-      "firstName": "E2E",
-      "lastName": "Mailbox Owner",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.mail-owner"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-member-mail-member",
-      "email": "e2e.team-member-mail-member@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Member Mailbox Member",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-member-mail-member"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-member-mail-administrator",
-      "email": "e2e.team-member-mail-administrator@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Member Mailbox Administrator",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-member-mail-administrator"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-member-mail-owner",
-      "email": "e2e.team-member-mail-owner@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Member Mailbox Owner",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-member-mail-owner"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-administrator-mail-member",
-      "email": "e2e.team-administrator-mail-member@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Administrator Mailbox Member",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-administrator-mail-member"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-administrator-mail-administrator",
-      "email": "e2e.team-administrator-mail-administrator@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Administrator Mailbox Administrator",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-administrator-mail-administrator"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-administrator-mail-owner",
-      "email": "e2e.team-administrator-mail-owner@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Administrator Mailbox Owner",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-administrator-mail-owner"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-owner-mail-member",
-      "email": "e2e.team-owner-mail-member@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Owner Mailbox Member",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-owner-mail-member"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-owner-mail-administrator",
-      "email": "e2e.team-owner-mail-administrator@example.com",
-      "firstName": "E2E",
-      "lastName": "Group Owner Mailbox Administrator",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-owner-mail-administrator"
-        }
-      ],
-      "realmRoles": ["user"]
-    },
-    {
-      "username": "e2e.team-owner-mail-owner",
-      "email": "e2e.team-owner-mail-owner@example.com",
-      "firstName": "E2E",
-      "lastName": "Mailbox Owner",
-      "enabled": true,
-      "credentials": [
-        {
-          "type": "password",
-          "value": "password-e2e.team-owner-mail-owner"
-        }
-      ],
-      "realmRoles": ["user"]
    }
  ],
  "roles": {
@@ -712,17 +485,9 @@
  "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
  "webAuthnPolicyPasswordlessAcceptableAaguids": [],
  "scopeMappings": [
-    {
-      "clientScope": "siret",
-      "roles": [
-        "user"
-      ]
-    },
    {
      "clientScope": "offline_access",
-      "roles": [
-        "offline_access"
-      ]
+      "roles": ["offline_access"]
    }
  ],
  "clientScopeMappings": {
@@ -972,7 +737,6 @@
        "acr",
        "roles",
        "profile",
-        "siret",
        "email"
      ],
      "optionalClientScopes": [
@@ -1133,35 +897,6 @@
        }
      ]
    },
-    {
-      "id": "eb220fbb-02ac-4105-95a3-727954f6565d",
-      "name": "siret",
-      "description": "siret",
-      "protocol": "openid-connect",
-      "attributes": {
-        "include.in.token.scope": "true",
-        "display.on.consent.screen": "false",
-        "gui.order": ""
-      },
-      "protocolMappers": [
-        {
-          "id": "333a4e89-9363-4c36-b56f-79c6b019c6c6",
-          "name": "siret",
-          "protocol": "openid-connect",
-          "protocolMapper": "oidc-usermodel-attribute-mapper",
-          "consentRequired": false,
-          "config": {
-            "aggregate.attrs": "false",
-            "userinfo.token.claim": "true",
-            "multivalued": "false",
-            "user.attribute": "siret",
-            "id.token.claim": "true",
-            "access.token.claim": "true",
-            "claim.name": "siret"
-          }
-        }
-      ]
-    },
    {
      "id": "af52ccc3-4ecb-49b4-9a67-5d4172f16070",
      "name": "role_list",
@@ -1628,8 +1363,7 @@
    "email",
    "roles",
    "web-origins",
-    "acr",
-    "siret"
+    "acr"
  ],
  "defaultOptionalClientScopes": [
    "offline_access",
@@ -9,29 +9,19 @@ API and its documentation can be found [here](https://api.dev.ox.numerique.gouv.

 ## Architectural links of dimail

-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.
+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 and accesses.

 ### 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". 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 activation.
-On disabled domains, mailboxes creation is not allowed.
+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 valid and mailboxes can be created on it. 

 ### 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
+### Accesses

-As for People, an access - a permissions (or an "allow" in dimail) - grants an user permission to create objects on a domain.
+As for People, an access - a permissions (or "allows" in dimail) - grants an user permission to create objects on a domain.

 Permissions requests are sent automatically upon : 
 - dimail database initialisation: 
@@ -1,131 +0,0 @@
-# Local development with Kubernetes
-
-We use tilt to provide a local development environment for Kubernetes. 
-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.
-
-
-## Prerequisites
-
-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) 
- [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.
-
-
-### 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 "$@"
-```
-
-
-## Getting started
-
-### Create the kubernetes cluster
-
-Run the following command to create a kubernetes cluster using kind:
-
-```bash
-./bin/start-kind.sh
-```
-
-**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.
-
-You can access the application at https://desk.127.0.0.1.nip.io
-
-## Management
-
-To manage the cluster, you can use k9s.
-
-## Next steps
-
- Add dimail to the local development environment
- Add a reset demo `cmd_button` to Tilt
@@ -6,56 +6,16 @@ interact efficiently.

 Let's see how we could interact with Django's shell to recreate David's environment in the app.

-## Profile contact
+## Base contacts from the organization records

-The system identifies Dave through the `sub` associated with his OIDC session.
-The OIDC should also provide his email address.
-
-Note: as some Identity Providers do not provide a constant `sub`, the system should be able to
-fallback to the email address to find it the user is already in the database.
-
-When Dave logs in for the first time, the system checks if he is already in the database. If not
-a new user is created for him.
-
-Users needs to be linked to an Organization (see [organizations.md](./organizations.md)).
+David Bowman is an exemplary employee at Space Odyssey Corporation. His email is
+`david.bowman@spaceodyssey.com` and he is registered in the organization's records via a base
+contact as follows:

 ```python
-space_odyssey, _created = Organization.objects.get_or_create(...)
-
-david_user = User.objects.create(
-    organization=space_odyssey,
-    language="en-us",
-    timezone="America/Los_Angeles",
-    name="David Bowman",
-    sub="1234567890",
-    email="david.bowman@spaceodyssey.com",
-)
-```
-
-The system then creates a profile contact for Dave, based on the information provided by the OIDC:
-
-```python
-david_profile_contact = Contact.objects.create(
-    owner=david_user,
-    user=david_user,  # this means it's the user's profile contact
+david_base_contact = Contact.objects.create(
    full_name="David Bowman",
-    data={
-        "emails": [
-            {"type": "Work", "value": "david.bowman@spaceodyssey.com"},
-        ],
-    },
-)
-```
-
-**Future feature:**
-Dave will be prompted to confirm the details of the base contact stored in the database
-and fill the details for a better profile.
-
-His profile contact will be updated with the new information.
-
-```python
-Contact.objects.filter(user=david_user, owner=david_user).update(
-    short_name="Dave",
+    short_name="David",
    data={
        "emails": [
            {"type": "Work", "value": "david.bowman@spaceodyssey.com"},
@@ -88,81 +48,91 @@ Contact.objects.filter(user=david_user, owner=david_user).update(
 )
 ```

-David's profile contact is available to all users of his company/organization.
+When David logs-in to the People application for the first time using the corporation's OIDC
+Single Sign-On service. A user is created for him on the fly by the system, together with an
+identity record representing the OIDC session:

+```python
+david_user = User.objects.create(
+    language="en-us",
+    timezone="America/Los_Angeles",
+)
+david_identity = Identity.objects.create(
+  "user": david_user,
+  "sub": "2a1b3c4d-5e6f-7a8b-9c0d-1e2f3a4b5c6d",
+  "email" : "david.bowman@spaceodyssey.com",
+  "is_main": True,
+)
+```
+
+## Profile contact
+
+The system identifies Dave through the email associated with his OIDC session and prompts him to
+confirm the details of the base contact stored in the database.
+
+When David confirms, giving an alternative short name that he prefers, a contact override is
+created on top of the organization's base contact. This new contact is marked as David's profile
+on the user:
+
+```python
+david_contact = Contact.objects.create(
+    base=david_base_contact,
+    owner=david_user,
+    full_name="David Bowman",
+    short_name="Dave",
+    data={}
+)
+david_user.profile_contact = david_contact
+david_user.save()
+```
+
+If Dave had not had any existing contact in the organization's records, the profile contact would
+have been created independently, without any connection to a base contact:
+
+```python
+david_contact = Contact.objects.create(
+    base=None,
+    owner=david_user,
+    full_name="David Bowman",
+    short_name="Dave",
+    data={}
+)
+```
+
+Now, Dave feels like sharing his mobile phone number with his colleagues. He can do this
+by editing his contact in the application:
+
+```python
+contact.data["phones"] = [
+    {"type": "Mobile", "value": "(123) 456-7890"},
+]
+contact.save()
+```

 ## Contact override

 During a Space conference he attended, Dave met Dr Ryan Stone, a medical engineer who gave him
-her personal email address (because she will quit the company she works for). Ryan is already 
-present in the system.
-
+her professional email address. Ryan is already present in the system but her email is missing.
 Dave can add it to his private version of the contact:

 ```python
-ryan_user = User.objects.create(
-    organization=space_odyssey,
-    language="en-us",
-    timezone="America/Los_Angeles",
-    name="Ryan Stone",
-    sub="0987654321",
-    email="ryan.stone@spaceodyssey.com",
+ryan_base_contact = Contact.objects.create(
+    full_name="Ryan Stone",
+    data={}
 )
-
-ryan_profile_contact = Contact.objects.create(
-    user=ryan_user,
-    owner=ryan_user,
+ryan_contact = Contact.objects.create(
+    base=ryan_base_contact,
+    owner=david_user,
    full_name="Ryan Stone",
    short_name="Dr Ryan",
    data={
        "emails": [
            {"type": "Work", "value": "ryan.stone@hubblestation.com"},
        ],
-    },
-)
-
-david_ryan_contact = Contact.objects.create(
-    override=ryan_profile_contact,
-    owner=david_user,
-    full_name="Ryan Stone",
-    short_name="Dr Ryan",
-    data={
-        "emails": [
-            {"type": "Home", "value": "ryan@stone.com"},
-        ],
-    },
+    }
 )
 ```

-## Personal contacts
-
-Dave met a lot of people during the last Opensource Experience event. He can add them to his personal contacts:
-
-```python
-julie_personal_contact = Contact.objects.create(
-    owner=david_user,
-    full_name="Julie Powell",
-    short_name="Julie",
-    data={
-        "emails": [
-            {"type": "Work", "value": "julie.powell@example.com"},
-        ],
-        "phones": [
-            {"type": "Work", "value": "(123) 456-7890"},
-        ],
-    },
-)
-```
-
-These contacts are only available to Dave.
-
-
-## Contacts from shared directories
-
-This is a future feature that will allow Dave to access contacts from shared directories.
-Shared directories will provide contacts for all users from several organizations.
-
-
 ## Team Collaboration

 Dave wants to form a team with Ryan and other colleagues to work together better on using the organization's digital tools for their projects.
@@ -1,41 +0,0 @@
-# Organization model
-
-## Purpose
-
-The initial `Organization` model allows to regroup `User` and `Team` under a same object.
-
-While the purpose was purely technical in the first place, few features emerged afterward.
-
-
-## Link with the `User` model
-
-Each user must have a "default" organization. 
-
-When a user logs in:
-
- The backend tries to get an existing organization from a "registration ID" or from the user's mail domain
- If the organization does not exist, it is created using the "registration ID" and fallbacks on the user's mail domain
- The user organization is set to this organization.
-
-**Note:** While deploying the new code, we allow the already existing user to not have one.
-
-
-## Link with the `Team` model
-
-Each team must have an organization. This organization is not defined by the user, but automatically set
-using the user's organization.
-
-The team's organization does not restrict the users who can be added to the team.
-
-There is currently no feature relying on the team organization.
-
-**Note:** While deploying the new code, we allow the teams to not have one.
-
-
-## Organization-related features
-
-### Organization UI
-
-A new interface can be created to allow users to see all members of an organization. 
-This could be used along with the contacts.
-
@@ -1,28 +0,0 @@
-# ServiceProvider model
-
-## Purpose
-
-The `ServiceProvider` model represents a ... service provider, also known as "tools using some data from this project".
-
-
-## Link with the `Organization` model
-
-An organization can be linked to several service providers. 
-The goal here, is to allow users of an organization to have access, to a service provider or not.
-The first implementation does not have any feature related, but the first feature will probably be
-to list applications visible in the "all application menu" (aka "la gaufre").
-
-
-## Link with the `Team` model
-
-A team can be linked to several service providers.
-This is used as a filter when a service provider calls the resource server, only the teams linked to
-this service provider are returned. This is mandatory for data segregation: we don't want all service
-providers to be able to list all data regarding other service providers.
-
-
-## Limitations
-
-There is currently no way to provision all the service providers automatically. So when a service provider
-creates a team via the resource server, we create the `ServiceProvider` on the fly, without any understandable name.
-This will need to be improved later.
@@ -1,51 +0,0 @@
-# E2E tests
-
-## Run E2E tests
-
-``` bash
-# you need the dockers to be up and running
-make bootstrap
-
-# you will need to have few accounts in the database
-make demo FLUSH_ARGS='--no-input'
-
-# run the tests
-cd src/frontend/apps/e2e
-yarn test:ui --workers=1
-```
-
-A new browser window will open and you will be able to run the tests.
-
-## Available accounts
-
-The `make demo` command creates the following accounts:
- - `e2e.team-<role>@example.com` where `<role>` is one of `administrator`, `member`, `owner`:
-    this account only belong to a team with the specified role.
- - `e2e.mail-<role>@example.com` where `<role>` is one of `administrator`, `member`, `owner`:
-    this account only have a mailbox with the specified role access.
- - `e2e.team-<team_role>-mail-<domain_role>@example.com` with a combination of roles as for the
-    previous accounts.
-
-For each account, the password is `password-e2e.<role>`, for instance `password-e2e.team-member`.
-
-In the E2E tests you can use these accounts to benefit from there accesses, 
-using the `keyCloakSignIn(page, browserName, <account_name>)`. The account name is the 
-username without the prefix `e2e.`.
-
-``` typescript jsx
-await keyCloakSignIn(page, browserName, 'mail-owner');
-```
-
-The `keyCloakSignIn` function will sign in the user on Keycloak using the proper username and password.
-
-.. note::
-    This only works because the OIDC setting is set to fallback on user email.
-
-## Add a new account
-
-In case you need to add a new account for specific tests you need:
- to create a new user with the same format in the backend database: 
-  update `[create_demo.py](../src/backend/demo/management/commands/create_demo.py)`
- to create a new account in Keycloak: update [realm.json](../docker/auth/realm.json)
- if the keycloak was running locally, you need to destroy its database and 
-  restart the database and the keycloak containers.
@@ -1,10 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/bash

 mkdir -p "$(dirname -- "${BASH_SOURCE[0]}")/../.git/hooks/"
 PRE_COMMIT_FILE="$(dirname -- "${BASH_SOURCE[0]}")/../.git/hooks/pre-commit"

 cat <<'EOF' >$PRE_COMMIT_FILE
-#!/usr/bin/env bash
+#!/bin/bash

 # directories containing potential secrets
 DIRS="."
@@ -1,5 +1,3 @@
-# pylint: disable=line-too-long
-
 import datetime
 import os
 import re
@@ -24,6 +22,18 @@ def update_files(version):
    with open(path, 'w+') as file:
        file.writelines(lines)

+    # helm files
+    sys.stdout.write("Update helm files...\n")
+    for env in ["preprod", "production"]:
+        path = f"src/helm/env.d/{env}/values.desk.yaml.gotmpl"
+        with open(path, 'r') as file:
+            lines = file.readlines()
+            for index, line in enumerate(lines):
+                if "tag:" in line:
+                    lines[index] = re.sub(r'\"(.*?)\"', f'"v{version}"', line)
+        with open(path, 'w+') as file:
+            file.writelines(lines)
+
    # frontend package.json
    sys.stdout.write("Update package.json...\n")
    files_to_modify = []
@@ -43,17 +53,6 @@ def update_files(version):
    return


-def update_helm_files(path):
-    sys.stdout.write("Update helm files...\n")
-    with open(path, 'r') as file:
-        lines = file.readlines()
-        for index, line in enumerate(lines):
-            if "tag:" in line:
-                lines[index] = re.sub(r'\"(.*?)\"', f'"v{version}"', line)
-    with open(path, 'w+') as file:
-        file.writelines(lines)
-
-
 def update_changelog(path, version):
    """Update changelog file with release info
    """
@@ -76,43 +75,7 @@ def update_changelog(path, version):
        file.writelines(lines)


-def deployment_part(version, kind):
-    """ Update helm file of preprod on deployment repository numerique-gouv/lasuite-deploiement
-    """
-    # Move to lasuite-deploiement repository
-    try:
-        os.chdir('../lasuite-deploiement')
-    except FileNotFoundError:
-        sys.stdout.write("\033[1;31m[Error] You must have a clone of https://github.com/numerique-gouv/lasuite-deploiement\x1b[0m")
-        sys.stdout.write("\033[0;32mPlease clone it and re-run script with option --only-deployment-part\x1b[0m")
-        sys.stdout.write("  >>> python scripts/release.py --only-deployment-part \x1b[0m")
-    else:
-        run_command("git checkout main", shell=True)
-        run_command("git pull", shell=True)
-        deployment_branch = f"regie/{version}/preprod"
-        run_command(f"git checkout -b {deployment_branch}", shell=True)
-        run_command("git pull --rebase origin main", shell=True)
-        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"""🔖({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""")
-        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: 
--> Please submit PR {deployment_branch} and merge code to main
-\x1b[0m""")
-
-
-def project_part(version, kind):
-    """Manage only la regie part with update of CHANGELOG, version files and tag"""
+def prepare_release(version, kind):
    sys.stdout.write('Let\'s go to create branch to release\n')
    branch_to_release = f"release/{version}"
    run_command(f"git checkout -b {branch_to_release}", shell=True)
@@ -125,29 +88,22 @@ 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""")
+    confirm = input(f"\nNEXT COMMAND: \n>> git push origin {branch_to_release}\nContinue ? (y,n) ")
    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:
--> Please submit PR {branch_to_release} and merge code to main 
--> Then do:
-    >> git checkout main
-    >> git pull
-    >> git tag v{version} 
+    PLEASE DO THE FOLLOWING INSTRUCTIONS:
+    --> Please submit PR and merge code to main than tag version
+    >> git tag -a v{version} 
    >> git push origin v{version} 
--> Please check and wait for the docker image v{version} to be published here:
- - https://hub.docker.com/r/lasuite/people-backend/tags 
- - https://hub.docker.com/r/lasuite/people-frontend/tags
--> Now please generate release on github interface for the current tag v{version}
- \x1b[0m""")
+    --> Please check docker image: https://hub.docker.com/r/lasuite/people-backend/tags
+    >> git tag -d preprod
+    >> git tag preprod
+    >> git push -f origin preprod
+    --> Now please generate release on github interface for the current tag v{version}
+""")


 if __name__ == "__main__":
@@ -156,6 +112,4 @@ if __name__ == "__main__":
        version = input("Enter your release version:")
    while kind not in RELEASE_KINDS:
        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, kind)
+    prepare_release(version, kind)
@@ -363,8 +363,7 @@ name-group=

 # Regular expression which should only match function or class names that do
 # not require a docstring.
-# Ignore: private stuff and `Params` class from FactoryBoy
-no-docstring-rgx=(^_|^Params$)
+no-docstring-rgx=^_

 # List of decorators that produce properties, such as abc.abstractproperty. Add
 # to this list to register other decorators that produce valid properties.
@@ -1 +0,0 @@
-"""Root module."""
@@ -1 +0,0 @@
-"""People custom admin site."""
@@ -1,9 +0,0 @@
-"""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"
@@ -1,15 +0,0 @@
-"""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,
-        }
@@ -1,13 +0,0 @@
-{% 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 +0,0 @@
-"""Core root module."""
@@ -1,19 +1,12 @@
 """Admin classes and registrations for People's core app."""

-from django.contrib import admin, messages
+from django.contrib import admin
 from django.contrib.auth import admin as auth_admin
 from django.utils.translation import gettext_lazy as _

-from treebeard.admin import TreeAdmin
-from treebeard.forms import movenodeform_factory
-
 from mailbox_manager.admin import MailDomainAccessInline

 from . import models
-from .plugins.loader import (
-    get_organization_plugins,
-    organization_plugins_run_after_create,
-)


 class TeamAccessInline(admin.TabularInline):
@@ -25,15 +18,6 @@ class TeamAccessInline(admin.TabularInline):
    readonly_fields = ("created_at", "updated_at")


-class OrganizationAccessInline(admin.TabularInline):
-    """Inline admin class for organization accesses."""
-
-    autocomplete_fields = ["user", "organization"]
-    extra = 0
-    model = models.OrganizationAccess
-    readonly_fields = ("created_at", "updated_at")
-
-
 class TeamWebhookInline(admin.TabularInline):
    """Inline admin class for team webhooks."""

@@ -47,7 +31,6 @@ class TeamWebhookInline(admin.TabularInline):
 class UserAdmin(auth_admin.UserAdmin):
    """Admin class for the User model"""

-    autocomplete_fields = ["organization"]
    fieldsets = (
        (
            None,
@@ -56,7 +39,6 @@ class UserAdmin(auth_admin.UserAdmin):
                    "id",
                    "sub",
                    "password",
-                    "organization",
                )
            },
        ),
@@ -85,10 +67,9 @@ class UserAdmin(auth_admin.UserAdmin):
            },
        ),
    )
-    inlines = (TeamAccessInline, MailDomainAccessInline, OrganizationAccessInline)
+    inlines = (TeamAccessInline, MailDomainAccessInline)
    list_display = (
        "get_user",
-        "organization",
        "created_at",
        "updated_at",
        "is_active",
@@ -116,28 +97,18 @@ class UserAdmin(auth_admin.UserAdmin):
    get_user.short_description = _("User")


-class TeamServiceProviderInline(admin.TabularInline):
-    """Inline admin class for service providers."""
-
-    can_delete = False
-    model = models.Team.service_providers.through
-    extra = 0
-
-
@admin.register(models.Team)
-class TeamAdmin(TreeAdmin):
+class TeamAdmin(admin.ModelAdmin):
    """Team admin interface declaration."""

-    form = movenodeform_factory(models.Team)
-    inlines = (TeamAccessInline, TeamWebhookInline, TeamServiceProviderInline)
-    exclude = ("service_providers",)  # Handled by the inline
+    inlines = (TeamAccessInline, TeamWebhookInline)
    list_display = (
        "name",
+        "slug",
        "created_at",
        "updated_at",
    )
    search_fields = ("name",)
-    readonly_fields = ("path", "depth", "numchild")


@admin.register(models.TeamAccess)
@@ -177,8 +148,8 @@ class InvitationAdmin(admin.ModelAdmin):
    )

    def get_readonly_fields(self, request, obj=None):
-        """Mark all fields read only, i.e. disable update."""
        if obj:
+            # all fields read only = disable update
            return self.fields
        return self.readonly_fields

@@ -191,87 +162,5 @@ class InvitationAdmin(admin.ModelAdmin):
        return super().change_view(request, object_id, extra_context=extra_context)

    def save_model(self, request, obj, form, change):
-        """Fill in current logged-in user as issuer."""
        obj.issuer = request.user
        obj.save()
-
-
-@admin.register(models.Contact)
-class ContactAdmin(admin.ModelAdmin):
-    """Contact admin interface declaration."""
-
-    list_display = (
-        "full_name",
-        "owner",
-        "override",
-    )
-
-
-class OrganizationServiceProviderInline(admin.TabularInline):
-    """Inline admin class for service providers."""
-
-    can_delete = False
-    model = models.Organization.service_providers.through
-    extra = 0
-
-
-@admin.action(description=_("Run post creation plugins"), permissions=["change"])
-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:
-        organization_plugins_run_after_create(organization)
-
-    messages.success(
-        request,
-        _("Post creation plugins have been run for the selected organizations."),
-    )
-
-
-@admin.register(models.Organization)
-class OrganizationAdmin(admin.ModelAdmin):
-    """Admin interface for organizations."""
-
-    actions = [run_post_creation_plugins]
-    list_display = (
-        "name",
-        "created_at",
-        "updated_at",
-    )
-    search_fields = ("name",)
-    inlines = (OrganizationAccessInline, OrganizationServiceProviderInline)
-    exclude = ("service_providers",)  # Handled by the inline
-
-    def get_actions(self, request):
-        """Adapt actions list to the context."""
-        actions = super().get_actions(request)
-        if not get_organization_plugins():
-            actions.pop("run_post_creation_plugins", None)
-        return actions
-
-
-@admin.register(models.OrganizationAccess)
-class OrganizationAccessAdmin(admin.ModelAdmin):
-    """Organization access admin interface declaration."""
-
-    autocomplete_fields = ("user", "organization")
-    list_display = (
-        "user",
-        "organization",
-        "role",
-        "created_at",
-        "updated_at",
-    )
-
-
-@admin.register(models.ServiceProvider)
-class ServiceProviderAdmin(admin.ModelAdmin):
-    """Admin interface for service providers."""
-
-    list_display = (
-        "name",
-        "audience_id",
-        "created_at",
-        "updated_at",
-    )
-    search_fields = ("name", "audience_id")
-    readonly_fields = ("created_at", "updated_at")
@@ -1 +0,0 @@
-"""People core client API endpoints"""
@@ -12,13 +12,13 @@ class IsAuthenticated(permissions.BasePermission):
    """

    def has_permission(self, request, view):
-        """Check auth token first."""
        return bool(request.auth) if request.auth else request.user.is_authenticated


 class IsSelf(IsAuthenticated):
    """
-    Allows access only to user's own data.
+    Allows access only to authenticated users. Alternative method checking the presence
+    of the auth token to avoid hitting the database.
    """

    def has_object_permission(self, request, view, obj):
@@ -53,18 +53,3 @@ class AccessPermission(IsAuthenticated):
        """Check permission for a given object."""
        abilities = obj.get_abilities(request.user)
        return abilities.get(request.method.lower(), False)
-
-
-class TeamPermission(IsAuthenticated):
-    """Permission class for team objects viewset."""
-
-    def has_permission(self, request, view):
-        """Check permission only when the user tries to create a new team."""
-        if not super().has_permission(request, view):
-            return False
-
-        if request.method != "POST":
-            return True
-
-        abilities = request.user.get_abilities()
-        return abilities["teams"]["can_create"]
@@ -1 +0,0 @@
-"""People core resource server API endpoints"""
@@ -1,52 +0,0 @@
-"""Client serializers for the People core app resource server API."""
-
-from rest_framework import serializers
-
-from core import models
-
-
-class TeamSerializer(serializers.ModelSerializer):
-    """Serialize teams."""
-
-    class Meta:
-        model = models.Team
-        fields = [
-            "id",
-            "created_at",
-            "depth",
-            "name",
-            "numchild",
-            "path",
-            "updated_at",
-        ]
-        read_only_fields = [
-            "id",
-            "created_at",
-            "depth",
-            "numchild",
-            "path",
-            "updated_at",
-        ]
-
-    def create(self, validated_data):
-        """
-        Create a new team with organization enforcement.
-
-        In this context, called as a resource server,
-        the team service provider is enforced.
-
-        When the service provider audience is unknown it is created on the fly.
-        """
-        sp_audience = self.context["from_service_provider_audience"]
-        service_provider, _created = models.ServiceProvider.objects.get_or_create(
-            audience_id=sp_audience
-        )
-
-        # Note: this is not the purpose of this API to check the user has an organization
-        return super().create(
-            validated_data=validated_data
-            | {
-                "organization_id": self.context["request"].user.organization_id,
-                "service_providers": [service_provider],
-            },
-        )
@@ -1,125 +0,0 @@
-"""Resource server API endpoints"""
-
-import operator
-from functools import reduce
-
-from django.db.models import OuterRef, Prefetch, Q, Subquery, Value
-from django.db.models.functions import Coalesce
-
-from rest_framework import (
-    filters,
-    mixins,
-    viewsets,
-)
-
-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
-
-
-class TeamViewSet(  # pylint: disable=too-many-ancestors
-    ResourceServerMixin,
-    mixins.CreateModelMixin,
-    mixins.ListModelMixin,
-    mixins.RetrieveModelMixin,
-    mixins.UpdateModelMixin,
-    viewsets.GenericViewSet,
-):
-    """
-    Team ViewSet dedicated to the resource server.
-
-    The DELETE method is not allowed for now, because the use case is
-    not clear yet and it comes with complexity to know if we can delete
-    a team or not (eg. if a team has other SP, it might not be deleted
-    but what do we do then, only remove the current SP?).
-
-    GET /resource-server/v1.0/teams/
-        Return list of Teams of the user and available for the audience.
-
-    POST /resource-server/v1.0/teams/
-        Create a new Team for the user for the audience.
-
-    GET /resource-server/v1.0/teams/{team_id}/
-        Return the Team details if available for the audience.
-
-    PUT /resource-server/v1.0/teams/{team_id}/
-        Update the Team details (only name for now).
-
-    """
-
-    permission_classes = [permissions.AccessPermission]
-    serializer_class = serializers.TeamSerializer
-    filter_backends = [filters.OrderingFilter]
-    ordering_fields = ["created_at"]
-    ordering = ["-created_at"]
-    queryset = models.Team.objects.all()
-    pagination_class = Pagination
-
-    def get_queryset(self):
-        """Custom queryset to get user related teams."""
-        teams_queryset = models.Team.objects.filter(
-            accesses__user=self.request.user,
-        )
-        depth_path = teams_queryset.values("depth", "path")
-
-        if not depth_path:
-            return models.Team.objects.none()
-
-        user_role_query = models.TeamAccess.objects.filter(
-            user=self.request.user, team=OuterRef("pk")
-        ).values("role")[:1]
-
-        service_provider_audience = self._get_service_provider_audience()
-        service_provider_prefetch = Prefetch(
-            "service_providers",
-            queryset=models.ServiceProvider.objects.filter(
-                audience_id=service_provider_audience
-            ),
-        )
-
-        return (
-            models.Team.objects.prefetch_related(
-                "accesses",
-                service_provider_prefetch,
-            )
-            .filter(
-                reduce(
-                    operator.or_,
-                    (
-                        Q(
-                            # The team the user has access to
-                            depth=d["depth"],
-                            path=d["path"],
-                        )
-                        | Q(
-                            # The parent team the user has access to
-                            depth__lt=d["depth"],
-                            path__startswith=d["path"][: models.Team.steplen],
-                            organization_id=self.request.user.organization_id,
-                        )
-                        for d in depth_path
-                    ),
-                ),
-                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
-            # because it's a parent team.
-            .annotate(
-                user_role=Coalesce(
-                    Subquery(user_role_query), Value(models.RoleChoices.MEMBER.value)
-                )
-            )
-        )
-
-    def perform_create(self, serializer):
-        """Set the current user as owner of the newly created team."""
-        team = serializer.save()
-        models.TeamAccess.objects.create(
-            team=team,
-            user=self.request.user,
-            role=models.RoleChoices.OWNER,
-        )
@@ -4,43 +4,28 @@ from rest_framework import exceptions, serializers
 from timezone_field.rest_framework import TimeZoneSerializerField

 from core import models
-from core.models import ServiceProvider


 class ContactSerializer(serializers.ModelSerializer):
    """Serialize contacts."""

-    abilities = serializers.SerializerMethodField()
-
    class Meta:
        model = models.Contact
        fields = [
            "id",
-            "abilities",
-            "override",
+            "base",
            "data",
            "full_name",
-            "notes",
            "owner",
            "short_name",
        ]
-        read_only_fields = ["id", "owner", "abilities"]
-        extra_kwargs = {
-            "override": {"required": False},
-        }
+        read_only_fields = ["id", "owner"]

    def update(self, instance, validated_data):
-        """Make "override" field readonly but only for update/patch."""
-        validated_data.pop("override", None)
+        """Make "base" field readonly but only for update/patch."""
+        validated_data.pop("base", None)
        return super().update(instance, validated_data)

-    def get_abilities(self, contact) -> dict:
-        """Return abilities of the logged-in user on the instance."""
-        request = self.context.get("request")
-        if request:
-            return contact.get_abilities(request.user)
-        return {}
-

 class DynamicFieldsModelSerializer(serializers.ModelSerializer):
    """
@@ -49,8 +34,6 @@ class DynamicFieldsModelSerializer(serializers.ModelSerializer):
    """

    def __init__(self, *args, **kwargs):
-        """Pass arguments to superclass except 'fields', then drop fields not listed therein."""
-
        # Don't pass the 'fields' arg up to the superclass
        fields = kwargs.pop("fields", None)

@@ -65,40 +48,12 @@ class DynamicFieldsModelSerializer(serializers.ModelSerializer):
                self.fields.pop(field_name)


-class OrganizationSerializer(serializers.ModelSerializer):
-    """Serialize organizations."""
-
-    abilities = serializers.SerializerMethodField()
-
-    class Meta:
-        model = models.Organization
-        fields = ["id", "name", "registration_id_list", "domain_list", "abilities"]
-        read_only_fields = ["id", "registration_id_list", "domain_list"]
-
-    def get_abilities(self, organization) -> dict:
-        """Return abilities of the logged-in user on the instance."""
-        request = self.context.get("request")
-        if request:
-            return organization.get_abilities(request.user)
-        return {}
-
-
-class UserOrganizationSerializer(serializers.ModelSerializer):
-    """Serialize organizations for users."""
-
-    class Meta:
-        model = models.Organization
-        fields = ["id", "name", "registration_id_list"]
-        read_only_fields = ["id", "name", "registration_id_list"]
-
-
 class UserSerializer(DynamicFieldsModelSerializer):
    """Serialize users."""

    timezone = TimeZoneSerializerField(use_pytz=False, required=True)
    email = serializers.ReadOnlyField()
    name = serializers.ReadOnlyField()
-    organization = UserOrganizationSerializer(read_only=True)

    class Meta:
        model = models.User
@@ -107,7 +62,6 @@ class UserSerializer(DynamicFieldsModelSerializer):
            "email",
            "language",
            "name",
-            "organization",
            "timezone",
            "is_device",
            "is_staff",
@@ -115,41 +69,6 @@ class UserSerializer(DynamicFieldsModelSerializer):
        read_only_fields = ["id", "name", "email", "is_device", "is_staff"]


-class UserMeSerializer(UserSerializer):
-    """
-    Serialize the current user.
-
-    Same as the `UserSerializer` but with abilities.
-    """
-
-    abilities = serializers.SerializerMethodField()
-    organization = UserOrganizationSerializer(read_only=True)
-
-    class Meta:
-        model = models.User
-        fields = [
-            "email",
-            "id",
-            "is_device",
-            "is_staff",
-            "language",
-            "name",
-            "organization",
-            "timezone",
-            # added fields
-            "abilities",
-        ]
-        read_only_fields = ["id", "name", "email", "is_device", "is_staff"]
-
-    def get_abilities(self, user: models.User) -> dict:
-        """Return abilities of the logged-in user on the instance."""
-        if user != self.context["request"].user:  # Should not happen
-            raise RuntimeError(
-                "UserMeSerializer.get_abilities: user is not the same as the request user",
-            )
-        return user.get_abilities()
-
-
 class TeamAccessSerializer(serializers.ModelSerializer):
    """Serialize team accesses."""

@@ -251,50 +170,28 @@ class TeamSerializer(serializers.ModelSerializer):
    """Serialize teams."""

    abilities = serializers.SerializerMethodField(read_only=True)
-    service_providers = serializers.PrimaryKeyRelatedField(
-        queryset=ServiceProvider.objects.all(), many=True, required=False
-    )
+    slug = serializers.SerializerMethodField()

    class Meta:
        model = models.Team
        fields = [
            "id",
-            "abilities",
-            "accesses",
-            "created_at",
-            "depth",
            "name",
-            "numchild",
-            "path",
-            "service_providers",
+            "accesses",
+            "abilities",
+            "slug",
+            "created_at",
            "updated_at",
        ]
        read_only_fields = [
            "id",
-            "abilities",
            "accesses",
+            "abilities",
+            "slug",
            "created_at",
-            "depth",
-            "numchild",
-            "path",
            "updated_at",
        ]

-    def create(self, validated_data):
-        """Create a new team with organization enforcement."""
-        # When called as a resource server, we enforce the team service provider
-        if sp_audience := self.context.get("from_service_provider_audience", None):
-            service_provider, _created = models.ServiceProvider.objects.get_or_create(
-                audience_id=sp_audience
-            )
-            validated_data["service_providers"] = [service_provider]
-
-        # Note: this is not the purpose of this API to check the user has an organization
-        return super().create(
-            validated_data=validated_data
-            | {"organization_id": self.context["request"].user.organization_id}
-        )
-
    def get_abilities(self, team) -> dict:
        """Return abilities of the logged-in user on the instance."""
        request = self.context.get("request")
@@ -302,6 +199,10 @@ class TeamSerializer(serializers.ModelSerializer):
            return team.get_abilities(request.user)
        return {}

+    def get_slug(self, instance):
+        """Return slug from the team's name."""
+        return instance.get_slug()
+

 class InvitationSerializer(serializers.ModelSerializer):
    """Serialize invitations."""
@@ -336,12 +237,3 @@ class InvitationSerializer(serializers.ModelSerializer):
        attrs["team_id"] = team_id
        attrs["issuer"] = user
        return attrs
-
-
-class ServiceProviderSerializer(serializers.ModelSerializer):
-    """Serialize service providers."""
-
-    class Meta:
-        model = models.ServiceProvider
-        fields = ["id", "audience_id", "name"]
-        read_only_fields = ["id", "audience_id"]
@@ -1,14 +1,9 @@
 """API endpoints"""

-import datetime
-import operator
-from functools import reduce
-
 from django.conf import settings
-from django.db.models import OuterRef, Q, Subquery, Value
+from django.contrib.postgres.search import TrigramSimilarity
+from django.db.models import Func, Max, OuterRef, Q, Subquery, Value
 from django.db.models.functions import Coalesce
-from django.utils.decorators import method_decorator
-from django.views.decorators.cache import cache_page

 from rest_framework import (
    decorators,
@@ -24,11 +19,10 @@ from rest_framework import (
 from rest_framework.permissions import AllowAny

 from core import models
-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 models as domains_models
+from . import permissions, serializers
+
+SIMILARITY_THRESHOLD = 0.04


 class NestedGenericViewSet(viewsets.GenericViewSet):
@@ -91,23 +85,16 @@ class SerializerPerActionMixin:

    This mixin is useful to avoid to define a serializer class for each action in the
    `get_serializer_class` method.
-
-    Example:
-    ```
-    class MyViewSet(SerializerPerActionMixin, viewsets.GenericViewSet):
-        serializer_class = MySerializer
-        list_serializer_class = MyListSerializer
-        retrieve_serializer_class = MyRetrieveSerializer
-    ```
    """

+    serializer_classes: dict[str, type] = {}
+    default_serializer_class: type = None
+
    def get_serializer_class(self):
        """
        Return the serializer class to use depending on the action.
        """
-        if serializer_class := getattr(self, f"{self.action}_serializer_class", None):
-            return serializer_class
-        return super().get_serializer_class()
+        return self.serializer_classes.get(self.action, self.default_serializer_class)


 class Pagination(pagination.PageNumberPagination):
@@ -143,46 +130,39 @@ class ContactViewSet(
 ):
    """Contact ViewSet"""

-    permission_classes = [permissions.AccessPermission]
-    queryset = models.Contact.objects.select_related("user").all()
+    permission_classes = [permissions.IsOwnedOrPublic]
+    queryset = models.Contact.objects.all()
    serializer_class = serializers.ContactSerializer
    throttle_classes = [BurstRateThrottle, SustainedRateThrottle]
-    ordering_fields = ["full_name", "short_name", "created_at"]
-    ordering = ["full_name"]

    def list(self, request, *args, **kwargs):
        """Limit listed users by a query with throttle protection."""
        user = self.request.user
        queryset = self.filter_queryset(self.get_queryset())

-        # List only contacts that:
+        # Exclude contacts that:
        queryset = queryset.filter(
-            # - is public (owner is None)
-            Q(owner__isnull=True)
-            # - are owned by the user
-            | Q(owner=user)
-            # - are profile contacts for a user from the same organization
-            | Q(user__organization_id=user.organization_id),
-            # - are not overriden by another contact
-            overridden_by__isnull=True,
+            # - belong to another user (keep public and owned contacts)
+            Q(owner__isnull=True) | Q(owner=user),
+            # - are profile contacts for a user
+            user__isnull=True,
+            # - are overriden base contacts
+            overriding_contacts__isnull=True,
        )

-        # Search by case-insensitive and accent-insensitive on:
-        # - full name
-        # - short name
-        # - email (from data `emails` field)
+        # Search by case-insensitive and accent-insensitive trigram similarity
        if query := self.request.GET.get("q", ""):
-            queryset = queryset.filter(
-                Q(full_name__unaccent__icontains=query)
-                | Q(short_name__unaccent__icontains=query)
-                | Q(
-                    id__in=gen_sql_filter_json_array(
-                        queryset.model,
-                        "data->'emails'",
-                        "value",
-                        query,
-                    )
-                )
+            query = Func(Value(query), function="unaccent")
+            similarity = TrigramSimilarity(
+                Func("full_name", function="unaccent"),
+                query,
+            ) + TrigramSimilarity(Func("short_name", function="unaccent"), query)
+            queryset = (
+                queryset.annotate(similarity=similarity)
+                .filter(
+                    similarity__gte=0.05
+                )  # Value determined by testing (test_api_contacts.py)
+                .order_by("-similarity")
            )

        serializer = self.get_serializer(queryset, many=True)
@@ -195,64 +175,21 @@ class ContactViewSet(
        return super().perform_create(serializer)


-class OrganizationViewSet(
-    mixins.RetrieveModelMixin,
-    mixins.UpdateModelMixin,
-    viewsets.GenericViewSet,
-):
-    """
-    Organization ViewSet
-
-    GET /api/organizations/<organization_id>/
-        Return the organization details for the given id.
-
-    PUT /api/organizations/<organization_id>/
-        Update the organization details for the given id.
-
-    PATCH /api/organizations/<organization_id>/
-        Partially update the organization details for the given id.
-    """
-
-    permission_classes = [permissions.AccessPermission]
-    queryset = models.Organization.objects.all()
-    serializer_class = serializers.OrganizationSerializer
-    throttle_classes = [BurstRateThrottle, SustainedRateThrottle]
-
-    def get_queryset(self):
-        """Limit listed organizations to the one the user belongs to."""
-        return (
-            super()
-            .get_queryset()
-            .filter(pk=self.request.user.organization_id)
-            .annotate(
-                user_role=Subquery(
-                    models.OrganizationAccess.objects.filter(
-                        user=self.request.user, organization=OuterRef("pk")
-                    ).values("role")[:1]
-                )
-            )
-        )
-
-
 class UserViewSet(
-    SerializerPerActionMixin,
-    mixins.UpdateModelMixin,
-    viewsets.GenericViewSet,
-    mixins.ListModelMixin,
+    mixins.UpdateModelMixin, viewsets.GenericViewSet, mixins.ListModelMixin
 ):
    """
    User viewset for all interactions with user infos and teams.

    GET /api/users/&q=query
-        Return a list of users whose email or name matches the query.
+        Return a list of users whose email matches the query. Similarity is
+        calculated using trigram similarity, allowing for partial,
+        case-insensitive matches and accented queries.
    """

    permission_classes = [permissions.IsSelf]
-    queryset = (
-        models.User.objects.select_related("organization").all().order_by("-created_at")
-    )
+    queryset = models.User.objects.all().order_by("-created_at")
    serializer_class = serializers.UserSerializer
-    get_me_serializer_class = serializers.UserMeSerializer
    throttle_classes = [BurstRateThrottle, SustainedRateThrottle]
    pagination_class = Pagination

@@ -270,11 +207,22 @@ class UserViewSet(
            if team_id := self.request.GET.get("team_id", ""):
                queryset = queryset.exclude(teams__id=team_id)

-            # Search by case-insensitive and accent-insensitive
+            # Search by case-insensitive and accent-insensitive trigram similarity
            if query := self.request.GET.get("q", ""):
-                queryset = queryset.filter(
-                    Q(name__unaccent__icontains=query)
-                    | Q(email__unaccent__icontains=query)
+                similarity = Max(
+                    TrigramSimilarity(
+                        Coalesce(Func("email", function="unaccent"), Value("")),
+                        Func(Value(query), function="unaccent"),
+                    )
+                    + TrigramSimilarity(
+                        Coalesce(Func("name", function="unaccent"), Value("")),
+                        Func(Value(query), function="unaccent"),
+                    )
+                )
+                queryset = (
+                    queryset.annotate(similarity=similarity)
+                    .filter(similarity__gte=SIMILARITY_THRESHOLD)
+                    .order_by("-similarity")
                )

        return queryset
@@ -290,7 +238,9 @@ class UserViewSet(
        Return information on currently logged user
        """
        user = request.user
-        return response.Response(self.get_serializer(user).data)
+        return response.Response(
+            self.serializer_class(user, context={"request": request}).data
+        )


 class TeamViewSet(
@@ -303,57 +253,20 @@ class TeamViewSet(
 ):
    """Team ViewSet"""

-    permission_classes = [permissions.TeamPermission, permissions.AccessPermission]
+    permission_classes = [permissions.AccessPermission]
    serializer_class = serializers.TeamSerializer
    filter_backends = [filters.OrderingFilter]
-    ordering_fields = ["created_at", "name", "path"]
+    ordering_fields = ["created_at"]
    ordering = ["-created_at"]
    queryset = models.Team.objects.all()
-    pagination_class = None

    def get_queryset(self):
        """Custom queryset to get user related teams."""
-        teams_queryset = models.Team.objects.filter(
-            accesses__user=self.request.user,
-        )
-        depth_path = teams_queryset.values("depth", "path")
-
-        if not depth_path:
-            return models.Team.objects.none()
-
        user_role_query = models.TeamAccess.objects.filter(
            user=self.request.user, team=OuterRef("pk")
        ).values("role")[:1]
-
-        return (
-            models.Team.objects.prefetch_related("accesses", "service_providers")
-            .filter(
-                reduce(
-                    operator.or_,
-                    (
-                        Q(
-                            # The team the user has access to
-                            depth=d["depth"],
-                            path=d["path"],
-                        )
-                        | Q(
-                            # The parent team the user has access to
-                            depth__lt=d["depth"],
-                            path__startswith=d["path"][: models.Team.steplen],
-                            organization_id=self.request.user.organization_id,
-                        )
-                        for d in depth_path
-                    ),
-                ),
-            )
-            # 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
-            # because it's a parent team.
-            .annotate(
-                user_role=Coalesce(
-                    Subquery(user_role_query), Value(models.RoleChoices.MEMBER.value)
-                )
-            )
+        return models.Team.objects.filter(accesses__user=self.request.user).annotate(
+            user_role=Subquery(user_role_query)
        )

    def perform_create(self, serializer):
@@ -427,7 +340,6 @@ class TeamAccessViewSet(
        return context

    def get_serializer_class(self):
-        """Chooses list or detail serializer according to the action."""
        if self.action in {"list", "retrieve"}:
            return self.list_serializer_class
        return self.detail_serializer_class
@@ -439,9 +351,20 @@ class TeamAccessViewSet(

        if self.action in {"list", "retrieve"}:
            if query := self.request.GET.get("q", ""):
-                queryset = queryset.filter(
-                    Q(user__email__unaccent__icontains=query)
-                    | Q(user__name__unaccent__icontains=query)
+                similarity = Max(
+                    TrigramSimilarity(
+                        Coalesce(Func("user__email", function="unaccent"), Value("")),
+                        Func(Value(query), function="unaccent"),
+                    )
+                    + TrigramSimilarity(
+                        Coalesce(Func("user__name", function="unaccent"), Value("")),
+                        Func(Value(query), function="unaccent"),
+                    )
+                )
+                queryset = (
+                    queryset.annotate(similarity=similarity)
+                    .filter(similarity__gte=SIMILARITY_THRESHOLD)
+                    .order_by("-similarity")
                )

            # Determine which role the logged-in user has in the team
@@ -583,79 +506,9 @@ class ConfigView(views.APIView):
        GET /api/v1.0/config/
            Return a dictionary of public settings.
        """
-        array_settings = ["LANGUAGES", "FEATURES", "RELEASE", "COMMIT"]
+        array_settings = ["LANGUAGES", "FEATURES", "RELEASE"]
        dict_settings = {}
        for setting in array_settings:
            dict_settings[setting] = getattr(settings, setting)

        return response.Response(dict_settings)
-
-
-class StatView(views.APIView):
-    """API ViewSet for sharing some public metrics."""
-
-    permission_classes = [AllowAny]
-
-    @method_decorator(cache_page(3600))
-    def get(self, request):
-        """
-        GET /api/v1.0/stats/
-            Return a dictionary of public metrics.
-        """
-        context = {
-            "total_users": models.User.objects.count(),
-            "mau": models.User.objects.filter(
-                last_login__gte=datetime.datetime.now() - datetime.timedelta(30)
-            ).count(),
-            "teams": models.Team.objects.count(),
-            "domains": domains_models.MailDomain.objects.count(),
-            "mailboxes": domains_models.Mailbox.objects.count(),
-        }
-        return response.Response(context)
-
-
-class ServiceProviderFilter(filters.BaseFilterBackend):
-    """
-    Filter service providers.
-    """
-
-    def filter_queryset(self, request, queryset, view):
-        """
-        Filter service providers by audience or name.
-        """
-        if name := request.GET.get("name"):
-            queryset = queryset.filter(name__icontains=name)
-        if audience_id := request.GET.get("audience_id"):
-            queryset = queryset.filter(audience_id=audience_id)
-        return queryset
-
-
-class ServiceProviderViewSet(
-    mixins.ListModelMixin,
-    mixins.RetrieveModelMixin,
-    viewsets.GenericViewSet,
-):
-    """
-    API ViewSet for all interactions with service providers.
-
-    GET /api/v1.0/service-providers/
-        Return a list of service providers.
-
-    GET /api/v1.0/service-providers/<service_provider_id>/
-        Return a service provider.
-    """
-
-    permission_classes = [permissions.IsAuthenticated]
-    queryset = models.ServiceProvider.objects.all()
-    serializer_class = serializers.ServiceProviderSerializer
-    throttle_classes = [BurstRateThrottle, SustainedRateThrottle]
-    pagination_class = Pagination
-    filter_backends = [filters.OrderingFilter, ServiceProviderFilter]
-    ordering = ["name"]
-    ordering_fields = ["name", "created_at"]
-
-    def get_queryset(self):
-        """Filter the queryset to limit results to user's organization."""
-        queryset = super().get_queryset()
-        queryset = queryset.filter(organizations__id=self.request.user.organization_id)
-        return queryset
@@ -1 +0,0 @@
-"""Authentication module."""
@@ -1,9 +1,5 @@
 """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
@@ -14,26 +10,9 @@ from mozilla_django_oidc.auth import (
    OIDCAuthenticationBackend as MozillaOIDCAuthenticationBackend,
 )

-from core.models import (
-    Contact,
-    Organization,
-    OrganizationAccess,
-    OrganizationRoleChoices,
-)
-
-logger = logging.getLogger(__name__)
-
 User = get_user_model()


-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.

@@ -88,24 +67,19 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):

        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")
-            )
-
        # Get user's full name from OIDC fields defined in settings
        full_name = self.compute_full_name(user_info)
        email = user_info.get("email")

        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
+
+        sub = user_info.get("sub")
+        if not sub:
+            raise SuspiciousOperation(
+                _("User info contained no recognizable user identification")
            )

        # if sub is absent, try matching on email
@@ -116,41 +90,7 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
                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
-        if not user.organization_id:
-            organization_registration_id = claims.get(
-                settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD
-            )
-            domain = get_domain_from_email(email)
-            try:
-                organization, organization_created = (
-                    Organization.objects.get_or_create_from_user_claims(
-                        registration_id=organization_registration_id,
-                        domain=domain,
-                    )
-                )
-                if organization_created:
-                    logger.info("Organization %s created", organization)
-                    # For this case, we don't create an OrganizationAccess we will
-                    # manage this manually later, because we don't want the first
-                    # user who log in after the release to be the admin of their
-                    # organization. We will keep organization without admin, and
-                    # we will have to manually clean things up (while there is
-                    # not that much organization in the database).
-            except ValueError as exc:
-                # Raised when there is no recognizable organization
-                # identifier (domain or registration_id)
-                logger.warning("Unable to update user organization: %s", exc)
-            else:
-                user.organization = organization
-                user.save()
-                logger.info(
-                    "User %s updated with organization %s", user.pk, organization
-                )
+            user = User.objects.create(sub=sub, password="!", **claims)  # noqa: S106

        return user

@@ -161,60 +101,13 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):
            raise SuspiciousOperation(
                _("Claims contained no recognizable user identification")
            )
-        email = claims.get("email")
-        name = claims.get("name")

-        # Extract or create the organization from the data
-        organization_registration_id = claims.get(
-            settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD
-        )
-        domain = get_domain_from_email(email)
-        try:
-            organization, organization_created = (
-                Organization.objects.get_or_create_from_user_claims(
-                    registration_id=organization_registration_id,
-                    domain=domain,
-                )
-            )
-        except ValueError as exc:
-            raise SuspiciousOperation(
-                _("Claims contained no recognizable organization identification")
-            ) from exc
-
-        if organization_created:
-            logger.info("Organization %s created", organization)
-
-        logger.info("Creating user %s / %s", sub, email)
-
-        user = self.UserModel.objects.create(
-            organization=organization,
+        return self.UserModel.objects.create(
            password="!",  # noqa: S106
            sub=sub,
-            email=email,
-            name=name,
+            email=claims.get("email"),
+            name=claims.get("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(
-            owner=user,
-            user=user,
-            full_name=name or email,
-            data={
-                "emails": [
-                    {"type": "Work", "value": email},
-                ],
-            },
-        )
-
-        return user

    def compute_full_name(self, user_info):
        """Compute user's full name based on OIDC fields in settings."""
@@ -238,11 +131,9 @@ class OIDCAuthenticationBackend(MozillaOIDCAuthenticationBackend):

    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:
+        has_changed = any(
+            value and value != getattr(user, key) for key, value in claims.items()
+        )
+        if has_changed:
+            updated_claims = {key: value for key, value in claims.items() if value}
            self.UserModel.objects.filter(sub=user.sub).update(**updated_claims)
@@ -115,62 +115,8 @@ class ContactFactory(BaseContactFactory):
    class Meta:
        model = models.Contact

-    owner = factory.SubFactory("core.factories.UserFactory")
-
-
-class ProfileContactFactory(BaseContactFactory):
-    """A factory to create profile contacts for a user"""
-
-    class Meta:
-        model = models.Contact
-
-    owner = factory.SelfAttribute(".user")
-    user = factory.SubFactory("core.factories.UserFactory")
-
-
-class OverrideContactFactory(BaseContactFactory):
-    """A factory to create contacts for a user"""
-
-    class Meta:
-        model = models.Contact
-
-    override = factory.SubFactory("core.factories.ContactFactory", owner=None)
-    owner = factory.SubFactory("core.factories.UserFactory")
-
-
-class OrganizationFactory(factory.django.DjangoModelFactory):
-    """Factory to create organizations for testing purposes."""
-
-    name = factory.Faker("company")
-
-    class Meta:
-        model = models.Organization
-
-    class Params:  # pylint: disable=missing-class-docstring
-        with_registration_id = factory.Trait(
-            registration_id_list=factory.List(
-                [factory.Sequence(lambda n: f"{n:014d}")]
-            ),
-        )
-        with_domain = factory.Trait(
-            domain_list=factory.List([factory.Faker("domain_name")]),
-        )
-
-
-class OrganizationAccessFactory(factory.django.DjangoModelFactory):
-    """Factory to create organization accesses for testing purposes."""
-
-    class Meta:
-        model = models.OrganizationAccess
-
-    user = factory.SubFactory(
-        "core.factories.UserFactory",
-        organization=factory.SelfAttribute("..organization"),
-    )
-    organization = factory.SubFactory(
-        "core.factories.OrganizationFactory", with_registration_id=True
-    )
-    role = factory.fuzzy.FuzzyChoice(models.OrganizationRoleChoices.values)
+    base = factory.SubFactory("core.factories.ContactFactory", base=None, owner=None)
+    owner = factory.SubFactory("core.factories.UserFactory", profile_contact=None)


 class UserFactory(factory.django.DjangoModelFactory):
@@ -180,13 +126,6 @@ class UserFactory(factory.django.DjangoModelFactory):
        model = models.User
        django_get_or_create = ("sub",)

-    class Params:
-        with_organization = factory.Trait(
-            organization=factory.SubFactory(
-                OrganizationFactory, with_registration_id=True
-            ),
-        )
-
    sub = factory.Sequence(lambda n: f"user{n!s}")
    email = factory.Faker("email")
    name = factory.Faker("name")
@@ -199,6 +138,7 @@ class TeamFactory(factory.django.DjangoModelFactory):

    class Meta:
        model = models.Team
+        django_get_or_create = ("name",)
        skip_postgeneration_save = True

    name = factory.Sequence(lambda n: f"team{n}")
@@ -214,13 +154,6 @@ class TeamFactory(factory.django.DjangoModelFactory):
            else:
                TeamAccessFactory(team=self, user=user_entry[0], role=user_entry[1])

-    @factory.post_generation
-    def service_providers(self, create, extracted, **kwargs):
-        """Add service providers to team from a given list of service providers."""
-        if not create or not extracted:
-            return
-        self.service_providers.set(extracted)
-

 class TeamAccessFactory(factory.django.DjangoModelFactory):
    """Create fake team user accesses for testing."""
@@ -253,27 +186,3 @@ class InvitationFactory(factory.django.DjangoModelFactory):
    email = factory.Faker("email")
    role = factory.fuzzy.FuzzyChoice([role[0] for role in models.RoleChoices.choices])
    issuer = factory.SubFactory(UserFactory)
-
-
-class ServiceProviderFactory(factory.django.DjangoModelFactory):
-    """A factory to create service providers for testing purposes."""
-
-    class Meta:
-        model = models.ServiceProvider
-        skip_postgeneration_save = True
-
-    audience_id = factory.Faker("uuid4")
-
-    @factory.post_generation
-    def teams(self, create, extracted, **kwargs):
-        """Add teams to service provider from a given list."""
-        if not create or not extracted:
-            return
-        self.teams.set(extracted)
-
-    @factory.post_generation
-    def organizations(self, create, extracted, **kwargs):
-        """Add organization to service provider from a given list."""
-        if not create or not extracted:
-            return
-        self.organizations.set(extracted)
@@ -48,7 +48,7 @@ class Migration(migrations.Migration):
                ('sub', models.CharField(help_text='Required. 255 characters or fewer. Letters, numbers, and @/./+/-/_ characters only.', max_length=255, unique=True, validators=[django.core.validators.RegexValidator(message='Enter a valid sub. This value may contain only letters, numbers, and @/./+/-/_ characters.', regex='^[\\w.@+-]+\\Z')], verbose_name='sub')),
                ('email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='email address')),
                ('name', models.CharField(blank=True, max_length=100, null=True, verbose_name='name')),
-                ('language', models.CharField(choices=settings.LANGUAGES, default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language')),
+                ('language', models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language')),
                ('timezone', timezone_field.fields.TimeZoneField(choices_display='WITH_GMT_OFFSET', default='UTC', help_text='The timezone in which the user wants to see times.', use_pytz=False)),
                ('is_device', models.BooleanField(default=False, help_text='Whether the user is a device or a real user.', verbose_name='device')),
                ('is_staff', models.BooleanField(default=False, help_text='Whether the user can log into this admin site.', verbose_name='staff status')),
@@ -1,62 +0,0 @@
-# Generated by Django 5.1.1 on 2024-10-22 10:07
-
-import core.models
-import django.contrib.postgres.fields
-import django.db.models.deletion
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Organization',
-            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=100, verbose_name='name')),
-                ('registration_id_list', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=128), blank=True, default=list, size=None, verbose_name='registration ID list')),
-                ('domain_list', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=256), blank=True, default=list, size=None, verbose_name='domain list')),
-            ],
-            options={
-                'verbose_name': 'organization',
-                'verbose_name_plural': 'organizations',
-                'db_table': 'people_organization',
-                'constraints': [models.CheckConstraint(condition=models.Q(('registration_id_list__len__gt', 0), ('domain_list__len__gt', 0), _connector='OR'), name='registration_id_or_domain', violation_error_message='An organization must have at least a registration ID or a domain.')],
-            },
-        ),
-        migrations.AddField(
-            model_name='team',
-            name='organization',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='teams', to='core.organization'),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='organization',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='users', to='core.organization'),
-        ),
-        migrations.CreateModel(
-            name='OrganizationAccess',
-            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')),
-                ('role', models.CharField(choices=[('administrator', 'Administrator')], default='administrator', max_length=20)),
-                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='organization_accesses', to='core.organization')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='organization_accesses', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Organization/user relation',
-                'verbose_name_plural': 'Organization/user relations',
-                'db_table': 'people_organization_access',
-                'constraints': [models.UniqueConstraint(fields=('user', 'organization'), name='unique_organization_user', violation_error_message='This user is already in this organization.')],
-            },
-        ),
-    ]
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-04 14:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0002_add_organization_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='team',
-            name='slug',
-            field=models.SlugField(max_length=100, null=True),
-        ),
-    ]
@@ -1,17 +0,0 @@
-# Generated by Django 5.1.3 on 2024-11-20 10:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0003_team_slug_nullable'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='team',
-            name='slug',
-        ),
-    ]
@@ -1,39 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-07 16:24
-
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0004_remove_team_slug'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ServiceProvider',
-            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=256, unique=True, verbose_name='name')),
-                ('audience_id', models.CharField(db_index=True, max_length=256, unique=True, verbose_name='audience id')),
-            ],
-            options={
-                'verbose_name': 'service provider',
-                'verbose_name_plural': 'service providers',
-                'db_table': 'people_service_provider',
-            },
-        ),
-        migrations.AddField(
-            model_name='organization',
-            name='service_providers',
-            field=models.ManyToManyField(blank=True, related_name='organizations', to='core.serviceprovider'),
-        ),
-        migrations.AddField(
-            model_name='team',
-            name='service_providers',
-            field=models.ManyToManyField(blank=True, related_name='teams', to='core.serviceprovider'),
-        ),
-    ]
@@ -1,24 +0,0 @@
-# Generated by Django 5.1.3 on 2024-11-28 09:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0005_add_serviceprovider'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contact',
-            name='notes',
-            field=models.TextField(blank=True, default='', verbose_name='notes'),
-        ),
-        migrations.AlterField(
-            model_name='contact',
-            name='full_name',
-            field=models.CharField(default='-', max_length=150, verbose_name='full name'),
-            preserve_default=False,
-        ),
-    ]
@@ -1,47 +0,0 @@
-# Generated by Django 5.1.3 on 2024-12-02 10:04
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0006_contact_notes_alter_contact_full_name'),
-    ]
-
-    operations = [
-        migrations.RemoveConstraint(
-            model_name='contact',
-            name='base_owner_constraint',
-        ),
-        migrations.RemoveConstraint(
-            model_name='contact',
-            name='base_not_self',
-        ),
-        migrations.AlterUniqueTogether(
-            name='contact',
-            unique_together=set(),
-        ),
-        migrations.AddField(
-            model_name='contact',
-            name='override',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='overridden_by', to='core.contact'),
-        ),
-        migrations.AddConstraint(
-            model_name='contact',
-            constraint=models.CheckConstraint(condition=models.Q(('override__isnull', False), ('owner__isnull', True), _negated=True), name='override_owner_constraint', violation_error_message='A contact overriding a base contact must be owned.'),
-        ),
-        migrations.AddConstraint(
-            model_name='contact',
-            constraint=models.CheckConstraint(condition=models.Q(('override', models.F('id')), _negated=True), name='override_not_self', violation_error_message='A contact cannot override itself.'),
-        ),
-        migrations.RemoveField(
-            model_name='contact',
-            name='base',
-        ),
-        migrations.AlterUniqueTogether(
-            name='contact',
-            unique_together={('owner', 'override')},
-        ),
-    ]
@@ -1,47 +0,0 @@
-# Generated by Django 5.1.3 on 2024-12-02 10:58
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-def init_profile_contact(apps, schema_editor):
-    """Create a Contact for each User to be used as their profile."""
-    User = apps.get_model("core", "User")
-    Contact = apps.get_model("core", "Contact")
-
-    for user in User.objects.all():  # This is a small table for now
-        Contact.objects.create(
-            owner=user,
-            user=user,
-            full_name=user.name or user.email,
-            data={
-                "emails": [
-                    {"type": "Work", "value": user.email},
-                ],
-            },
-        )
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0007_rename_contact_base_to_override'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='user',
-            name='profile_contact',
-        ),
-        migrations.AddField(
-            model_name='contact',
-            name='user',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='profile_contact', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddConstraint(
-            model_name='contact',
-            constraint=models.CheckConstraint(condition=models.Q(('user__isnull', True), models.Q(('owner', models.F('user')), ('owner__isnull', False)), _connector='OR'), name='profile_contact_owner_constraint', violation_error_message='Users can only declare as profile a contact they own.'),
-        ),
-        migrations.RunPython(init_profile_contact, reverse_code=migrations.RunPython.noop),
-    ]
@@ -1,18 +0,0 @@
-# Generated by Django 5.1.3 on 2024-12-05 13:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0008_change_user_profile_to_contact'),
-    ]
-
-    operations = [
-        # From 100ms to 78ms for 5 000 contacts on my computer
-        # This is not a big improvement and may need further investigation
-        migrations.RunSQL(
-           "CREATE INDEX json_field_index_emails_value ON people_contact USING GIN ((data->'emails'->'value') jsonb_path_ops);"
-        )
-    ]
@@ -1,58 +0,0 @@
-# Generated by Django 5.1.3 on 2024-11-26 13:55
-
-from django.db import migrations, models
-
-from treebeard.numconv import NumConv
-
-
-def update_team_paths(apps, schema_editor):
-    Team = apps.get_model("core", "Team")
-    alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-    steplen = 5
-
-    # Initialize NumConv with the specified custom alphabet
-    converter = NumConv(len(alphabet), alphabet)
-
-    nodes = Team.objects.all().order_by("created_at")
-    for i, node in enumerate(nodes, 1):
-        node.depth = 1  # root nodes are at depth 1
-
-        # Use NumConv to encode the index `i` to a base representation and
-        # pad it to the specified step length using the custom alphabet
-        node.path = converter.int2str(i).rjust(steplen, alphabet[0])
-
-    if nodes:
-        Team.objects.bulk_update(nodes, ["depth", "path"])
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0009_contacts_add_index_on_data_emails'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='team',
-            name='depth',
-            field=models.PositiveIntegerField(default=0),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='team',
-            name='numchild',
-            field=models.PositiveIntegerField(default=0),
-        ),
-        migrations.AddField(
-            model_name='team',
-            name='path',
-            field=models.CharField(default='', max_length=400, db_collation="C"),
-            preserve_default=False,
-        ),
-        migrations.RunPython(update_team_paths, migrations.RunPython.noop),
-        migrations.AlterField(
-            model_name="team",
-            name="path",
-            field=models.CharField(unique=True, max_length=400, db_collation="C"),
-        ),
-    ]
@@ -6,32 +6,27 @@ import json
 import os
 import smtplib
 import uuid
-from contextlib import suppress
 from datetime import timedelta
 from logging import getLogger
-from typing import Tuple

 from django.conf import settings
 from django.contrib.auth import models as auth_models
 from django.contrib.auth.base_user import AbstractBaseUser
-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, transaction
 from django.template.loader import render_to_string
 from django.utils import timezone
-from django.utils.translation import gettext, override
+from django.utils.functional import lazy
+from django.utils.text import slugify
 from django.utils.translation import gettext_lazy as _
+from django.utils.translation import override

 import jsonschema
 from timezone_field import TimeZoneField
-from treebeard.mp_tree import MP_Node, MP_NodeManager

 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__)

@@ -41,7 +36,7 @@ with open(contact_schema_path, "r", encoding="utf-8") as contact_schema_file:
    contact_schema = json.load(contact_schema_file)


-class RoleChoices(models.TextChoices):  # pylint: disable=too-many-ancestors
+class RoleChoices(models.TextChoices):
    """Defines the possible roles a user can have in a team."""

    MEMBER = "member", _("Member")
@@ -49,17 +44,6 @@ class RoleChoices(models.TextChoices):  # pylint: disable=too-many-ancestors
    OWNER = "owner", _("Owner")


-class OrganizationRoleChoices(models.TextChoices):  # pylint: disable=too-many-ancestors
-    """
-    Defines the possible roles a user can have in an organization.
-    For now, we only have one role, but we might add more in the future.
-
-    administrator: The user can manage the organization: change name, add/remove users.
-    """
-
-    ADMIN = "administrator", _("Administrator")
-
-
 class BaseModel(models.Model):
    """
    Serves as an abstract base model for other models, ensuring that records are validated
@@ -100,10 +84,10 @@ class BaseModel(models.Model):
 class Contact(BaseModel):
    """User contacts"""

-    override = models.ForeignKey(
+    base = models.ForeignKey(
        "self",
        on_delete=models.SET_NULL,
-        related_name="overridden_by",
+        related_name="overriding_contacts",
        null=True,
        blank=True,
    )
@@ -114,19 +98,11 @@ class Contact(BaseModel):
        null=True,
        blank=True,
    )
-    user = models.OneToOneField(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.SET_NULL,
-        related_name="profile_contact",
-        blank=True,
-        null=True,
-    )
-
-    full_name = models.CharField(_("full name"), max_length=150)
+    full_name = models.CharField(_("full name"), max_length=150, null=True, blank=True)
    short_name = models.CharField(_("short name"), max_length=30, null=True, blank=True)

    # avatar =
-    notes = models.TextField(_("notes"), blank=True, default="")
+    # notes =
    data = models.JSONField(
        _("contact information"),
        help_text=_("A JSON object containing the contact information"),
@@ -145,38 +121,31 @@ class Contact(BaseModel):
        ordering = ("full_name", "short_name")
        verbose_name = _("contact")
        verbose_name_plural = _("contacts")
-        unique_together = ("owner", "override")
+        unique_together = ("owner", "base")
        constraints = [
            models.CheckConstraint(
-                condition=~models.Q(override__isnull=False, owner__isnull=True),
-                name="override_owner_constraint",
+                condition=~models.Q(base__isnull=False, owner__isnull=True),
+                name="base_owner_constraint",
                violation_error_message="A contact overriding a base contact must be owned.",
            ),
            models.CheckConstraint(
-                condition=~models.Q(override=models.F("id")),
-                name="override_not_self",
-                violation_error_message="A contact cannot override itself.",
-            ),
-            # When a user is set, the owner must be the user
-            models.CheckConstraint(
-                condition=models.Q(user__isnull=True)
-                | models.Q(owner=models.F("user"), owner__isnull=False),
-                name="profile_contact_owner_constraint",
-                violation_error_message="Users can only declare as profile a contact they own.",
+                condition=~models.Q(base=models.F("id")),
+                name="base_not_self",
+                violation_error_message="A contact cannot be based on itself.",
            ),
        ]

    def __str__(self):
-        return self.full_name
+        return self.full_name or self.short_name

    def clean(self):
        """Validate fields."""
        super().clean()

-        # Check if the contact overrides a contact that itself overrides another base contact
-        if self.override_id and self.override.override_id:
+        # Check if the contact points to a base contact that itself points to another base contact
+        if self.base_id and self.base.base_id:
            raise exceptions.ValidationError(
-                "A contact cannot override a contact that itself overrides a contact."
+                "A contact cannot point to a base contact that itself points to a base contact."
            )

        # Validate the content of the "data" field against our jsonschema definition
@@ -188,234 +157,6 @@ class Contact(BaseModel):
            error_message = f"Validation error in '{field_path:s}': {e.message}"
            raise exceptions.ValidationError({"data": [error_message]}) from e

-    def get_abilities(self, user):
-        """
-        Compute and return abilities for a given user on the contact.
-
-        Beware that the model allows owner to be None, we are still not
-        sure about the use case for this and the API does not allow this.
-        For now, we still consider here, a contact without owner is "public"
-        so we allow access to it.
-        """
-        is_owner = user.pk == self.owner_id
-        is_profile_member_or_same_organization = bool(self.user_id) and (
-            self.user.organization_id == user.organization_id
-        )
-
-        return {
-            "get": is_owner or is_profile_member_or_same_organization or not self.owner,
-            "patch": is_owner,
-            "put": is_owner,
-            "delete": is_owner and not self.user,  # Can't delete a profile contact
-        }
-
-
-class ServiceProvider(BaseModel):
-    """
-    Represents a service provider that will consume our information.
-
-    Organization uses this model to define the list of SP available to their users.
-    Team uses this model to define their visibility to the various SP.
-    """
-
-    name = models.CharField(_("name"), max_length=256, unique=True)
-    audience_id = models.CharField(
-        _("audience id"), max_length=256, unique=True, db_index=True
-    )
-
-    class Meta:
-        db_table = "people_service_provider"
-        verbose_name = _("service provider")
-        verbose_name_plural = _("service providers")
-
-    def __str__(self):
-        return self.name
-
-    def save(self, *args, **kwargs):
-        """Enforce name (even if ugly) from the `audience_id` field."""
-        if not self.name:
-            self.name = self.audience_id  # ok, same length
-        return super().save(*args, **kwargs)
-
-
-class OrganizationManager(models.Manager):
-    """
-    Custom manager for the Organization model, to manage complexity/automation.
-    """
-
-    def get_or_create_from_user_claims(
-        self, registration_id: str = None, domain: str = None, **kwargs
-    ) -> Tuple["Organization", bool]:
-        """
-        Get or create an organization using the most fitting information from the user's claims.
-
-        We expect to have only one organization per registration_id, but
-        the registration_id might not be provided.
-        When the registration_id is not provided, we use the domain to identify the organization.
-
-        If both are provided, we use the registration_id first to create missing organization.
-
-        Dev note: When a registration_id is provided by the Identity Provider, we don't want
-        to use the domain to create the organization, because it is less reliable: for example,
-        a professional user, may have a personal email address, and the domain would be gmail.com
-        which is not a good identifier for an organization. The domain email is just a fallback
-        when the registration_id is not provided by the Identity Provider. We can use the domain
-        to create the organization manually when we are sure about the "safety" of it.
-        """
-        if not any([registration_id, domain]):
-            raise ValueError("You must provide either a registration_id or a domain.")
-
-        filters = models.Q()
-        if registration_id:
-            filters |= models.Q(registration_id_list__icontains=registration_id)
-        if domain:
-            filters |= models.Q(domain_list__icontains=domain)
-
-        with suppress(self.model.DoesNotExist):
-            # If there are several organizations, we must raise an error and fix the data
-            # If there is an organization, we return it
-            return self.get(filters, **kwargs), False
-
-        # Manage the case where the organization does not exist: we create one
-        if registration_id:
-            return self.create(
-                name=registration_id, registration_id_list=[registration_id], **kwargs
-            ), True
-
-        if domain:
-            return self.create(name=domain, domain_list=[domain], **kwargs), True
-
-        raise ValueError("Should never reach this point.")
-
-    def create(self, **kwargs):
-        """
-        Create an organization with the given kwargs.
-
-        This method is overridden to call the Organization plugins.
-        """
-        instance = super().create(**kwargs)
-        organization_plugins_run_after_create(instance)
-        return instance
-
-
-class Organization(BaseModel):
-    """
-    Organization model used to regroup Teams.
-
-    Each User have an Organization, which corresponds actually to a default organization
-    because a user can belong to a Team from another organization.
-    Each Team have an Organization, which is the Organization from the User who created
-    the Team.
-
-    Organization is managed automatically, the User should never choose their Organization.
-    When creating a User, you must use the `get_or_create` method from the
-    OrganizationManager to find the proper Organization.
-
-    An Organization can have several registration IDs and domains but during automatic
-    creation process, only one will be used. We may want to allow (manual) organization merge
-    later, to regroup several registration IDs or domain in the same Organization.
-    """
-
-    name = models.CharField(_("name"), max_length=100)
-    registration_id_list = ArrayField(
-        models.CharField(
-            max_length=128,
-            validators=get_field_validators_from_setting(
-                "ORGANIZATION_REGISTRATION_ID_VALIDATORS"
-            ),
-        ),
-        verbose_name=_("registration ID list"),
-        default=list,
-        blank=True,
-        # list overlap validation is done in the validate_unique method
-    )
-    domain_list = ArrayField(
-        models.CharField(max_length=256),
-        verbose_name=_("domain list"),
-        default=list,
-        blank=True,
-        # list overlap validation is done in the validate_unique method
-    )
-
-    service_providers = models.ManyToManyField(
-        ServiceProvider,
-        related_name="organizations",
-        blank=True,
-    )
-
-    objects = OrganizationManager()
-
-    class Meta:
-        db_table = "people_organization"
-        verbose_name = _("organization")
-        verbose_name_plural = _("organizations")
-        constraints = [
-            models.CheckConstraint(
-                name="registration_id_or_domain",
-                condition=models.Q(registration_id_list__len__gt=0)
-                | models.Q(domain_list__len__gt=0),
-                violation_error_message=_(
-                    "An organization must have at least a registration ID or a domain."
-                ),
-            ),
-            # Check a registration ID str can only be present in one
-            # organization registration ID list
-            # Check a domain str can only be present in one organization domain list
-            # Those checks cannot be done with Django constraints
-        ]
-
-    def __str__(self):
-        return f"{self.name} (# {self.pk})"
-
-    def validate_unique(self, exclude=None):
-        """
-        Validate Registration/Domain values in an array field are unique
-        across all instances.
-
-        This can't be done in the field validator because we need to
-        exclude the current object if already in database.
-        """
-        super().validate_unique(exclude=exclude)
-
-        if self.pk:
-            organization_qs = Organization.objects.exclude(pk=self.pk)
-        else:
-            organization_qs = Organization.objects.all()
-
-        # Check a registration ID can only be present in one organization
-        if (
-            self.registration_id_list
-            and organization_qs.filter(
-                registration_id_list__overlap=self.registration_id_list
-            ).exists()
-        ):
-            raise ValidationError(
-                "registration_id_list value must be unique across all instances."
-            )
-
-        # Check a domain can only be present in one organization
-        if (
-            self.domain_list
-            and organization_qs.filter(domain_list__overlap=self.domain_list).exists()
-        ):
-            raise ValidationError(
-                "domain_list value must be unique across all instances."
-            )
-
-    def get_abilities(self, user):
-        """
-        Compute and return abilities for a given user on the organization.
-        """
-        # Use the role from queryset annotation will raise on purpose if not used properly
-        is_admin = self.user_role == OrganizationRoleChoices.ADMIN  # pylint: disable=no-member
-
-        return {
-            "get": user.organization_id == self.pk,
-            "patch": is_admin,
-            "put": is_admin,
-            "delete": False,
-        }
-

 class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
    """User model to work with OIDC only authentication."""
@@ -439,9 +180,16 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
    )
    email = models.EmailField(_("email address"), null=True, blank=True)
    name = models.CharField(_("name"), max_length=100, null=True, blank=True)
+    profile_contact = models.OneToOneField(
+        Contact,
+        on_delete=models.SET_NULL,
+        related_name="user",
+        blank=True,
+        null=True,
+    )
    language = models.CharField(
        max_length=10,
-        choices=settings.LANGUAGES,
+        choices=lazy(lambda: settings.LANGUAGES, tuple)(),
        default=settings.LANGUAGE_CODE,
        verbose_name=_("language"),
        help_text=_("The language in which the user wants to see the interface."),
@@ -470,13 +218,6 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
            "Unselect this instead of deleting accounts."
        ),
    )
-    organization = models.ForeignKey(
-        Organization,
-        on_delete=models.PROTECT,
-        related_name="users",
-        null=True,  # Need to be set to False when everything is migrated
-        blank=True,  # Need to be set to False when everything is migrated
-    )

    objects = auth_models.UserManager()

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

+        if self.profile_contact_id and not self.profile_contact.owner == self:
+            raise exceptions.ValidationError(
+                "Users can only declare as profile a contact they own."
+            )
+
    def _convert_valid_invitations(self):
        """
        Convert valid invitations to team accesses.
@@ -538,146 +284,14 @@ class User(AbstractBaseUser, BaseModel, auth_models.PermissionsMixin):
            raise ValueError("You must first set an email for the user.")
        mail.send_mail(subject, message, from_email, [self.email], **kwargs)

-    def get_abilities(self):
-        """
-        Return the user permissions at the application level (ie feature availability).

-        Note: this is for display purposes only for now.
-
-        - Contacts view and creation is globally available (or not) for now.
-        - Teams view is available if the user is owner or admin of at least
-        one Team for now. It allows to restrict users knowing the existence of
-        this feature.
-        - Teams creation is globally available (or not) for now.
-        - Mailboxes view is available if the user has access to at least one
-        MailDomain for now. It allows to restrict users knowing the existence of
-        this feature.
-        - Mailboxes creation is globally available (or not) for now.
-        """
-        user_info = (
-            self._meta.model.objects.filter(pk=self.pk)
-            .annotate(
-                teams_can_view=models.Exists(
-                    self.accesses.model.objects.filter(  # pylint: disable=no-member
-                        user=models.OuterRef("pk"),
-                        role__in=[RoleChoices.OWNER, RoleChoices.ADMIN],
-                    )
-                ),
-                mailboxes_can_view=models.Exists(
-                    self.mail_domain_accesses.model.objects.filter(  # pylint: disable=no-member
-                        user=models.OuterRef("pk")
-                    )
-                ),
-            )
-            .only("id")
-            .get()
-        )
-
-        teams_can_view = user_info.teams_can_view or settings.FEATURES["TEAMS_DISPLAY"]
-        mailboxes_can_view = user_info.mailboxes_can_view
-
-        return {
-            "contacts": {
-                "can_view": settings.FEATURES["CONTACTS_DISPLAY"],
-                "can_create": (
-                    settings.FEATURES["CONTACTS_DISPLAY"]
-                    and settings.FEATURES["CONTACTS_CREATE"]
-                ),
-            },
-            "teams": {
-                "can_view": teams_can_view,
-                "can_create": teams_can_view and settings.FEATURES["TEAMS_CREATE"],
-            },
-            "mailboxes": {
-                "can_view": mailboxes_can_view,
-                "can_create": mailboxes_can_view
-                and settings.FEATURES["MAILBOXES_CREATE"],
-            },
-        }
-
-
-class OrganizationAccess(BaseModel):
-    """
-    Link table between organization and users,
-    only for user with specific rights on Organization.
-    """
-
-    organization = models.ForeignKey(
-        Organization,
-        on_delete=models.CASCADE,
-        related_name="organization_accesses",
-    )
-    user = models.ForeignKey(
-        User,
-        on_delete=models.CASCADE,
-        related_name="organization_accesses",
-    )
-    role = models.CharField(
-        max_length=20,
-        choices=OrganizationRoleChoices.choices,
-        default=OrganizationRoleChoices.ADMIN,
-    )
-
-    class Meta:
-        db_table = "people_organization_access"
-        verbose_name = _("Organization/user relation")
-        verbose_name_plural = _("Organization/user relations")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["user", "organization"],
-                name="unique_organization_user",
-                violation_error_message=_("This user is already in this organization."),
-            ),
-        ]
-
-    def __str__(self):
-        return f"{self.user!s} is {self.role:s} in organization {self.organization!s}"
-
-
-class TeamManager(MP_NodeManager):
-    """
-    Custom manager for the Team model, to manage complexity/automation.
-    """
-
-    def create(self, parent_id=None, **kwargs):
-        """
-        Replace the default create method to ease the Team creation process.
-
-        Notes:
-            - the `add_*` methods from django-treebeard does not support the "using db".
-              Which means it will always use the default db.
-            - the `add_*` methods from django-treebeard does not support the "force_insert".
-
-        """
-        if parent_id is None:
-            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
-        # 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.
-        # Beware the N+1 here.
-        return self.get(pk=parent_id).add_child(**kwargs)
-
-
-class Team(MP_Node, BaseModel):
+class Team(BaseModel):
    """
    Represents the link between teams and users, specifying the role a user has in a team.
-
-    When a team is created from here, the user have to choose which Service Providers
-    can see it.
-    When a team is created from a Service Provider this one is automatically set in the
-    Team `service_providers`.
    """

-    # Allow up to 80 nested teams with 62^5 (916_132_832) root nodes
-    alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
-    # Django treebeard does not allow max_length = None...
-    steplen = 5
-    path = models.CharField(max_length=5 * 80, unique=True, db_collation="C")
-
    name = models.CharField(max_length=100)
+    slug = models.SlugField(max_length=100, unique=True, null=False, editable=False)

    users = models.ManyToManyField(
        User,
@@ -685,20 +299,6 @@ class Team(MP_Node, BaseModel):
        through_fields=("team", "user"),
        related_name="teams",
    )
-    organization = models.ForeignKey(
-        Organization,
-        on_delete=models.PROTECT,
-        related_name="teams",
-        null=True,  # Need to be set to False when everything is migrated
-        blank=True,  # Need to be set to False when everything is migrated
-    )
-    service_providers = models.ManyToManyField(
-        ServiceProvider,
-        related_name="teams",
-        blank=True,
-    )
-
-    objects = TeamManager()

    class Meta:
        db_table = "people_team"
@@ -709,6 +309,15 @@ class Team(MP_Node, BaseModel):
    def __str__(self):
        return self.name

+    def save(self, *args, **kwargs):
+        """Override save function to compute the slug."""
+        self.slug = self.get_slug()
+        return super().save(*args, **kwargs)
+
+    def get_slug(self):
+        """Compute slug value from name."""
+        return slugify(self.name)
+
    def get_abilities(self, user):
        """
        Compute and return abilities for a given user on the team.
@@ -961,15 +570,14 @@ class Invitation(BaseModel):
        """Email invitation to the user."""
        try:
            with override(self.issuer.language):
-                subject = gettext("Invitation to join La Régie!")
                template_vars = {
-                    "title": subject,
+                    "title": _("Invitation to join Desk!"),
                    "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,
+                    _("Invitation to join Desk!"),
                    msg_plain,
                    settings.EMAIL_FROM,
                    [self.email],
@@ -1 +0,0 @@
-"""Core plugins package."""
@@ -1,13 +0,0 @@
-"""Base plugin class for organization plugins."""
-
-
-class BaseOrganizationPlugin:
-    """
-    Base class for organization plugins.
-
-    Plugins must implement all methods of this class even if it is only to "pass".
-    """
-
-    def run_after_create(self, organization) -> None:
-        """Method called after creating an organization."""
-        raise NotImplementedError("Plugins must implement the run_after_create method")
@@ -1,32 +0,0 @@
-"""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 +0,0 @@
-"""Backend resource server module."""
@@ -19,7 +19,6 @@ 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:
@@ -41,7 +40,7 @@ class ResourceServerAuthentication(OIDCAuthentication):
    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,
+        This method overcharges the 'get_access_token' method from the parent class,
        to support service providers that would base64 encode the bearer token.
        """

@@ -53,20 +52,3 @@ class ResourceServerAuthentication(OIDCAuthentication):
            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
@@ -33,7 +33,6 @@ class ResourceServerBackend:

    # 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()

@@ -61,10 +60,6 @@ class ResourceServerBackend:
            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
@@ -89,8 +84,6 @@ class ResourceServerBackend:
        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"])
@@ -106,8 +99,6 @@ class ResourceServerBackend:
            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):
@@ -135,12 +126,6 @@ class ResourceServerBackend:
            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):
@@ -233,8 +218,6 @@ class ResourceServerBackend:
 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")
@@ -19,7 +19,7 @@ class AuthorizationServerClient:
    - Setting appropriate headers for secure communication as recommended by RFC drafts.
    """

-    # ruff: noqa: PLR0913 PLR0917
+    # ruff: noqa: PLR0913 PLR017
    # pylint: disable=too-many-positional-arguments
    # pylint: disable=too-many-arguments
    def __init__(
@@ -31,8 +31,6 @@ class AuthorizationServerClient:
        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."
@@ -1,53 +0,0 @@
-"""
-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
@@ -1 +0,0 @@
-"""Core template tags module."""
@@ -1 +0,0 @@
-"""Core tests."""
@@ -1 +0,0 @@
-"""Core authentication tests."""
@@ -42,8 +42,7 @@ def test_authentication_getter_existing_user_with_email(
    When the user's info contains an email and targets an existing user,
    """
    klass = OIDCAuthenticationBackend()
-
-    user = factories.UserFactory(name="John Doe", with_organization=True)
+    user = factories.UserFactory(name="John Doe")

    def get_userinfo_mocked(*args):
        return {
@@ -80,9 +79,7 @@ def test_authentication_getter_existing_user_change_fields(
    It should update the email or name fields on the user when they change.
    """
    klass = OIDCAuthenticationBackend()
-    user = factories.UserFactory(
-        name="John Doe", email="john.doe@example.com", with_organization=True
-    )
+    user = factories.UserFactory(name="John Doe", email="john.doe@example.com")

    def get_userinfo_mocked(*args):
        return {
@@ -106,39 +103,6 @@ def test_authentication_getter_existing_user_change_fields(
    assert user.name == f"{first_name:s} {last_name:s}"


-def test_authentication_getter_existing_user_keep_fields(
-    django_assert_num_queries, monkeypatch
-):
-    """
-    Falsy values in claim should not update the user's fields.
-    """
-    klass = OIDCAuthenticationBackend()
-    user = factories.UserFactory(
-        name="John Doe", email="john.doe@example.com", with_organization=True
-    )
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": user.sub,
-            "email": None,
-            "first_name": "",
-            "last_name": "",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    # No field changed no more query
-    with django_assert_num_queries(1):
-        authenticated_user = klass.get_or_create_user(
-            access_token="test-token", id_token=None, payload=None
-        )
-
-    assert user == authenticated_user
-    user.refresh_from_db()
-    assert user.email == "john.doe@example.com"
-    assert user.name == "John Doe"
-
-
 def test_authentication_getter_existing_user_via_email(
    django_assert_num_queries, monkeypatch
 ):
@@ -148,7 +112,7 @@ def test_authentication_getter_existing_user_via_email(
    """

    klass = OIDCAuthenticationBackend()
-    db_user = factories.UserFactory(with_organization=True)
+    db_user = factories.UserFactory()

    def get_userinfo_mocked(*args):
        return {"sub": "123", "email": db_user.email}
@@ -194,23 +158,25 @@ def test_authentication_getter_existing_user_no_fallback_to_email(

 def test_authentication_getter_new_user_no_email(monkeypatch):
    """
-    If no user matches the user's info sub, a user should not be created without email
-    nor organization registration ID.
+    If no user matches the user's info sub, a user should be created.
+    User's info doesn't contain an email/name, created user's email/name should be empty.
    """
    klass = OIDCAuthenticationBackend()

    def get_userinfo_mocked(*args):
-        return {"sub": "123"}  # No email, no organization registration ID
+        return {"sub": "123"}

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

-    with (
-        pytest.raises(
-            SuspiciousOperation,
-            match="Claims contained no recognizable organization identification",
-        ),
-    ):
-        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)
+    user = klass.get_or_create_user(
+        access_token="test-token", id_token=None, payload=None
+    )
+
+    assert user.sub == "123"
+    assert user.email is None
+    assert user.name is None
+    assert user.password == "!"
+    assert models.User.objects.count() == 1


 def test_authentication_getter_new_user_with_email(monkeypatch):
@@ -318,138 +284,3 @@ def test_authentication_getter_existing_disabled_user_via_email(
        klass.get_or_create_user(access_token="test-token", id_token=None, payload=None)

    assert models.User.objects.count() == 1
-
-
-def test_authentication_getter_new_user_with_email_new_organization(monkeypatch):
-    """
-    If no user matches the user's info sub, a user should be created.
-    If the corresponding organization doesn't exist, it should be created.
-    """
-    klass = OIDCAuthenticationBackend()
-    email = "people@example.com"
-
-    def get_userinfo_mocked(*args):
-        return {"sub": "123", "email": email, "first_name": "John", "last_name": "Doe"}
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user(
-        access_token="test-token", id_token=None, payload=None
-    )
-
-    assert user.organization is not None
-    assert user.organization.domain_list == ["example.com"]
-    assert user.organization.registration_id_list == []
-
-
-@pytest.mark.parametrize(
-    "registration_id_setting,expected_registration_id_list,expected_domain_list",
-    [
-        (None, [], ["example.com"]),
-        ("missing-claim", [], ["example.com"]),
-        ("registration_number", ["12345678901234"], []),
-    ],
-)
-def test_authentication_getter_new_user_with_registration_id_new_organization(
-    monkeypatch,
-    settings,
-    registration_id_setting,
-    expected_registration_id_list,
-    expected_domain_list,
-):
-    """
-    If no user matches the user's info sub, a user should be created.
-    If the corresponding organization doesn't exist, it should be created.
-    """
-    settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD = registration_id_setting
-
-    klass = OIDCAuthenticationBackend()
-    email = "people@example.com"
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": "123",
-            "email": email,
-            "first_name": "John",
-            "last_name": "Doe",
-            "registration_number": "12345678901234",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user(
-        access_token="test-token", id_token=None, payload=None
-    )
-
-    assert user.organization is not None
-    assert user.organization.domain_list == expected_domain_list
-    assert user.organization.registration_id_list == expected_registration_id_list
-
-
-def test_authentication_getter_existing_user_via_email_update_organization(
-    django_assert_num_queries, monkeypatch
-):
-    """
-    If an existing user already exists without organization, the organization must be updated.
-    """
-
-    klass = OIDCAuthenticationBackend()
-    db_user = factories.UserFactory(name="John Doe", email="toto@my-domain.com")
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": db_user.sub,
-            "email": db_user.email,
-            "first_name": "John",
-            "last_name": "Doe",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    with django_assert_num_queries(9):
-        user = klass.get_or_create_user(
-            access_token="test-token", id_token=None, payload=None
-        )
-
-    assert user == db_user
-    assert user.organization is not None
-    assert user.organization.domain_list == ["my-domain.com"]
-
-
-def test_authentication_getter_existing_user_with_registration_id(
-    monkeypatch,
-    settings,
-):
-    """
-    Authenticate a user who already exists with an organization registration ID.
-
-    This asserts the "update_user_if_needed" does not fail when the claim
-    contains the organization registration ID (or any value not present in the
-    User model).
-    """
-    settings.OIDC_ORGANIZATION_REGISTRATION_ID_FIELD = "registration_number"
-
-    klass = OIDCAuthenticationBackend()
-    _existing_user = factories.UserFactory(
-        sub="123",
-        name="John Doe",
-        email="people@example.com",
-    )
-
-    def get_userinfo_mocked(*args):
-        return {
-            "sub": "123",
-            "email": "people@example.com",
-            "first_name": "John",
-            "last_name": "Doe",
-            "registration_number": "12345678901234",
-        }
-
-    monkeypatch.setattr(OIDCAuthenticationBackend, "get_userinfo", get_userinfo_mocked)
-
-    user = klass.get_or_create_user(
-        access_token="test-token", id_token=None, payload=None
-    )
-
-    assert user.organization is not None
-    assert user.organization.registration_id_list == ["12345678901234"]
@@ -1 +0,0 @@
-"""Contacts tests package."""
@@ -1,213 +0,0 @@
-"""
-Test contacts API endpoints in People's core app.
-"""
-
-from django.test.utils import override_settings
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories, models
-
-pytestmark = pytest.mark.django_db
-
-
-CONTACT_DATA = {
-    "emails": [
-        {"type": "Work", "value": "john.doe@work.com"},
-        {"type": "Home", "value": "john.doe@home.com"},
-    ],
-    "phones": [
-        {"type": "Work", "value": "(123) 456-7890"},
-        {"type": "Other", "value": "(987) 654-3210"},
-    ],
-    "addresses": [
-        {
-            "type": "Home",
-            "street": "123 Main St",
-            "city": "Cityville",
-            "state": "CA",
-            "zip": "12345",
-            "country": "USA",
-        }
-    ],
-    "links": [
-        {"type": "Blog", "value": "http://personalwebsite.com"},
-        {"type": "Website", "value": "http://workwebsite.com"},
-    ],
-    "customFields": {"custom_field_1": "value1", "custom_field_2": "value2"},
-    "organizations": [
-        {
-            "name": "ACME Corporation",
-            "department": "IT",
-            "jobTitle": "Software Engineer",
-        },
-        {
-            "name": "XYZ Ltd",
-            "department": "Marketing",
-            "jobTitle": "Marketing Specialist",
-        },
-    ],
-}
-
-
-def test_api_contacts_create_anonymous_forbidden():
-    """Anonymous users should not be able to create contacts via the API."""
-    response = APIClient().post(
-        "/api/v1.0/contacts/",
-        {
-            "full_name": "David",
-            "short_name": "Bowman",
-        },
-    )
-    assert response.status_code == 401
-    assert not models.Contact.objects.exists()
-
-
-def test_api_contacts_create_authenticated_missing_base():
-    """Authenticated user should be able to create contact without override."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        "/api/v1.0/contacts/",
-        {
-            "full_name": "David Bowman",
-            "short_name": "Dave",
-            "data": {},
-        },
-        format="json",
-    )
-    assert response.status_code == 201
-
-    new_contact = models.Contact.objects.get(owner=user)
-
-    assert response.json() == {
-        "override": None,
-        "abilities": {"delete": True, "get": True, "patch": True, "put": True},
-        "data": {},
-        "full_name": "David Bowman",
-        "id": str(new_contact.pk),
-        "notes": "",
-        "owner": str(user.pk),
-        "short_name": "Dave",
-    }
-
-
-def test_api_contacts_create_authenticated_successful():
-    """Authenticated users should be able to create contacts."""
-    user = factories.UserFactory()
-    base_contact = factories.BaseContactFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    # Existing override for another user should not interfere
-    factories.ContactFactory(override=base_contact)
-
-    response = client.post(
-        "/api/v1.0/contacts/",
-        {
-            "override": str(base_contact.id),
-            "full_name": "David Bowman",
-            "short_name": "Dave",
-            "data": CONTACT_DATA,
-        },
-        format="json",
-    )
-
-    assert response.status_code == 201
-    assert models.Contact.objects.count() == 3
-
-    contact = models.Contact.objects.get(owner=user)
-    assert response.json() == {
-        "id": str(contact.id),
-        "abilities": {"delete": True, "get": True, "patch": True, "put": True},
-        "override": str(base_contact.id),
-        "data": CONTACT_DATA,
-        "full_name": "David Bowman",
-        "notes": "",
-        "owner": str(user.id),
-        "short_name": "Dave",
-    }
-
-    assert contact.full_name == "David Bowman"
-    assert contact.short_name == "Dave"
-    assert contact.data == CONTACT_DATA
-    assert contact.override == base_contact
-    assert contact.owner == user
-
-
-@override_settings(ALLOW_API_USER_CREATE=True)
-def test_api_contacts_create_authenticated_existing_override():
-    """
-    Trying to create a contact overriding a contact that is already overridden by the user
-    should receive a 400 error.
-    """
-    user = factories.UserFactory()
-    base_contact = factories.BaseContactFactory()
-    factories.ContactFactory(override=base_contact, owner=user)
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        "/api/v1.0/contacts/",
-        {
-            "override": str(base_contact.id),
-            "full_name": "David Bowman",
-            "notes": "",
-            "short_name": "Dave",
-            "data": CONTACT_DATA,
-        },
-        format="json",
-    )
-
-    assert response.status_code == 400
-    assert models.Contact.objects.count() == 2
-
-    assert response.json() == {
-        "__all__": ["Contact with this Owner and Override already exists."]
-    }
-
-
-def test_api_contacts_create_authenticated_successful_with_notes():
-    """Authenticated users should be able to create contacts with notes."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.post(
-        "/api/v1.0/contacts/",
-        {
-            "full_name": "David Bowman",
-            "short_name": "Dave",
-            "data": CONTACT_DATA,
-            "notes": "This is a note",
-        },
-        format="json",
-    )
-
-    assert response.status_code == 201
-    assert models.Contact.objects.count() == 1
-
-    contact = models.Contact.objects.get(owner=user)
-    assert response.json() == {
-        "id": str(contact.id),
-        "abilities": {"delete": True, "get": True, "patch": True, "put": True},
-        "override": None,
-        "data": CONTACT_DATA,
-        "full_name": "David Bowman",
-        "notes": "This is a note",
-        "owner": str(user.id),
-        "short_name": "Dave",
-    }
-
-    assert contact.full_name == "David Bowman"
-    assert contact.short_name == "Dave"
-    assert contact.data == CONTACT_DATA
-    assert contact.owner == user
-    assert contact.notes == "This is a note"
@@ -1,120 +0,0 @@
-"""
-Test contacts API endpoints in People's core app.
-"""
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories, models
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_contacts_delete_list_anonymous():
-    """Anonymous users should not be allowed to delete a list of contacts."""
-    factories.ContactFactory.create_batch(2)
-
-    response = APIClient().delete("/api/v1.0/contacts/")
-
-    assert response.status_code == 401
-    assert models.Contact.objects.count() == 2
-
-
-def test_api_contacts_delete_list_authenticated():
-    """Authenticated users should not be allowed to delete a list of contacts."""
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    factories.ContactFactory.create_batch(2)
-
-    response = client.delete("/api/v1.0/contacts/")
-
-    assert response.status_code == 405
-    assert models.Contact.objects.count() == 2
-
-
-def test_api_contacts_delete_anonymous():
-    """Anonymous users should not be allowed to delete a contact."""
-    contact = factories.ContactFactory()
-
-    client = APIClient()
-    response = client.delete(f"/api/v1.0/contacts/{contact.id!s}/")
-
-    assert response.status_code == 401
-    assert models.Contact.objects.count() == 1
-
-
-def test_api_contacts_delete_authenticated_public():
-    """
-    Authenticated users should not be allowed to delete a public contact.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    contact = factories.BaseContactFactory()
-
-    response = client.delete(
-        f"/api/v1.0/contacts/{contact.id!s}/",
-    )
-
-    assert response.status_code == 403
-    assert models.Contact.objects.count() == 1
-
-
-def test_api_contacts_delete_authenticated_owner():
-    """
-    Authenticated users should be allowed to delete a contact they own.
-    """
-    user = factories.UserFactory()
-    contact = factories.ContactFactory(owner=user)
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.delete(
-        f"/api/v1.0/contacts/{contact.id!s}/",
-    )
-
-    assert response.status_code == 204
-    assert models.Contact.objects.count() == 0
-    assert models.Contact.objects.filter(id=contact.id).exists() is False
-
-
-def test_api_contacts_delete_authenticated_profile():
-    """
-    Authenticated users should not be allowed to delete their profile contact.
-    """
-    user = factories.UserFactory()
-    contact = factories.ProfileContactFactory(user=user)
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.delete(
-        f"/api/v1.0/contacts/{contact.id!s}/",
-    )
-
-    assert response.status_code == 403
-    assert models.Contact.objects.exists() is True
-
-
-def test_api_contacts_delete_authenticated_other():
-    """
-    Authenticated users should not be allowed to delete a contact they don't own.
-    """
-    user = factories.UserFactory()
-    contact = factories.ContactFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.delete(
-        f"/api/v1.0/contacts/{contact.id!s}/",
-    )
-
-    assert response.status_code == 403
-    assert models.Contact.objects.count() == 1
@@ -1,305 +0,0 @@
-"""
-Test contacts API endpoints in People's core app.
-"""
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_contacts_list_anonymous():
-    """Anonymous users should not be allowed to list contacts."""
-    factories.ContactFactory.create_batch(2)
-
-    response = APIClient().get("/api/v1.0/contacts/")
-
-    assert response.status_code == 401
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_contacts_list_authenticated_no_query(django_assert_num_queries):
-    """
-    Authenticated users should be able to list contacts without applying a query.
-    Profile and overridden contacts should be excluded.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-
-    # The user's profile contact should be listed (why not)
-    user_profile_contact = factories.ContactFactory(
-        owner=user, user=user, full_name="Dave Bowman"
-    )
-
-    # A contact that belongs to another user should not be listed
-    factories.ContactFactory()
-    # even if from the same organization
-    factories.ContactFactory(owner__organization=organization)
-
-    # A profile contact should not be listed if from another organization
-    factories.ProfileContactFactory()
-
-    # A profile contact for someone in the same organization should be listed
-    profile_contact = factories.ProfileContactFactory(
-        user__organization=organization, full_name="Frank Poole"
-    )
-
-    # An overridden contact should not be listed, but the override must be
-    overriden_contact = factories.ProfileContactFactory(user__organization=organization)
-    override_contact = factories.ContactFactory(
-        owner=user, override=overriden_contact, full_name="Nicole Foole"
-    )
-
-    client = APIClient()
-    client.force_login(user)
-
-    with django_assert_num_queries(2):
-        response = client.get("/api/v1.0/contacts/")
-
-    assert response.status_code == 200
-    assert response.json() == [
-        {
-            "id": str(user_profile_contact.pk),
-            "abilities": {"delete": False, "get": True, "patch": True, "put": True},
-            "override": None,
-            "owner": str(user.pk),
-            "data": user_profile_contact.data,
-            "full_name": user_profile_contact.full_name,
-            "notes": "",
-            "short_name": user_profile_contact.short_name,
-        },
-        {
-            "id": str(profile_contact.pk),
-            "abilities": {"delete": False, "get": True, "patch": False, "put": False},
-            "override": None,
-            "owner": str(profile_contact.user.pk),
-            "data": profile_contact.data,
-            "full_name": profile_contact.full_name,
-            "notes": "",
-            "short_name": profile_contact.short_name,
-        },
-        {
-            "id": str(override_contact.pk),
-            "abilities": {"delete": True, "get": True, "patch": True, "put": True},
-            "override": str(overriden_contact.pk),
-            "owner": str(user.pk),
-            "data": override_contact.data,
-            "full_name": override_contact.full_name,
-            "notes": "",
-            "short_name": override_contact.short_name,
-        },
-    ]
-
-
-def test_api_contacts_list_authenticated_by_full_name():
-    """
-    Authenticated users should be able to search users with a case insensitive and
-    partial query on the full name.
-    """
-    user = factories.UserFactory(name="Prudence Crandall")
-
-    dave = factories.BaseContactFactory(full_name="David Bowman", data={})
-    nicole = factories.BaseContactFactory(full_name="Nicole Foole", data={})
-    frank = factories.BaseContactFactory(full_name="Frank Poole", data={})
-    factories.BaseContactFactory(full_name="Heywood Floyd", data={})
-
-    # Full query should work
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get("/api/v1.0/contacts/?q=David%20Bowman")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
-
-    # Partial query should work
-    response = client.get("/api/v1.0/contacts/?q=ank")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(frank.id)]
-
-    response = client.get("/api/v1.0/contacts/?q=ole")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(frank.id), str(nicole.id)]
-
-    response = client.get("/api/v1.0/contacts/?q=ool")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(frank.id), str(nicole.id)]
-
-
-def test_api_contacts_list_authenticated_by_email():
-    """
-    Authenticated users should be able to search users with a case insensitive and
-    partial query on the email.
-    """
-    user = factories.UserFactory()
-
-    dave = factories.BaseContactFactory(
-        full_name="0",  # don't match on full name but allow ordering
-        data={
-            "emails": [
-                {"type": "Home", "value": "dave@personal.com"},
-                {"type": "Work", "value": "david.bowman@example.com"},
-            ],
-        },
-    )
-    nicole = factories.BaseContactFactory(
-        full_name="1",  # don't match on full name but allow ordering
-        data={
-            "emails": [
-                {"type": "Work", "value": "nicole.foole@example.com"},
-            ],
-        },
-    )
-    frank = factories.BaseContactFactory(
-        full_name="2",  # don't match on full name but allow ordering
-        data={
-            "emails": [
-                {"type": "Home", "value": "francky@personal.com"},
-                {"type": "Work", "value": "franck.poole@example.com"},
-            ],
-        },
-    )
-    factories.BaseContactFactory(
-        full_name="3",  # don't match on full name but allow ordering
-        data={
-            "emails": [
-                {"type": "Work", "value": "heywood.floyd@example.com"},
-            ],
-        },
-    )
-
-    # Full query should work
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get("/api/v1.0/contacts/?q=david.bowman@example.com")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.pk)]
-
-    # Partial query should work
-    response = client.get("/api/v1.0/contacts/?q=anc")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(frank.pk)]
-
-    response = client.get("/api/v1.0/contacts/?q=olé")  # accented
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(nicole.pk), str(frank.pk)]
-
-    response = client.get("/api/v1.0/contacts/?q=oOl")  # mixed case
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(nicole.pk), str(frank.pk)]
-
-
-def test_api_contacts_list_authenticated_uppercase_content():
-    """Upper case content should be found by lower case query."""
-    user = factories.UserFactory()
-
-    dave = factories.BaseContactFactory(full_name="EEE", short_name="AAA")
-
-    # Unaccented full name
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get("/api/v1.0/contacts/?q=eee")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
-
-    # Unaccented short name
-    response = client.get("/api/v1.0/contacts/?q=aaa")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
-
-
-def test_api_contacts_list_authenticated_capital_query():
-    """Upper case query should find lower case content."""
-    user = factories.UserFactory()
-
-    dave = factories.BaseContactFactory(full_name="eee", short_name="aaa")
-
-    client = APIClient()
-    client.force_login(user)
-
-    # Unaccented full name
-    response = client.get("/api/v1.0/contacts/?q=EEE")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
-
-    # Unaccented short name
-    response = client.get("/api/v1.0/contacts/?q=AAA")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
-
-
-def test_api_contacts_list_authenticated_accented_content():
-    """Accented content should be found by unaccented query."""
-    user = factories.UserFactory()
-
-    dave = factories.BaseContactFactory(full_name="ééé", short_name="ààà")
-
-    client = APIClient()
-    client.force_login(user)
-
-    # Unaccented full name
-    response = client.get("/api/v1.0/contacts/?q=eee")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
-
-    # Unaccented short name
-    response = client.get("/api/v1.0/contacts/?q=aaa")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
-
-
-def test_api_contacts_list_authenticated_accented_query():
-    """Accented query should find unaccented content."""
-    user = factories.UserFactory()
-
-    dave = factories.BaseContactFactory(full_name="eee", short_name="aaa")
-
-    client = APIClient()
-    client.force_login(user)
-
-    # Unaccented full name
-    response = client.get("/api/v1.0/contacts/?q=ééé")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
-
-    # Unaccented short name
-    response = client.get("/api/v1.0/contacts/?q=ààà")
-
-    assert response.status_code == 200
-    contact_ids = [contact["id"] for contact in response.json()]
-    assert contact_ids == [str(dave.id)]
@@ -1,89 +0,0 @@
-"""
-Test contacts API endpoints in People's core app.
-"""
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_contacts_retrieve_anonymous():
-    """Anonymous users should not be allowed to retrieve a user."""
-    client = APIClient()
-    contact = factories.ContactFactory()
-    response = client.get(f"/api/v1.0/contacts/{contact.id!s}/")
-
-    assert response.status_code == 401
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_contacts_retrieve_authenticated_owned(django_assert_num_queries):
-    """
-    Authenticated users should be allowed to retrieve a contact they own.
-    """
-    user = factories.UserFactory()
-    contact = factories.ContactFactory(owner=user)
-
-    client = APIClient()
-    client.force_login(user)
-
-    with django_assert_num_queries(2):
-        response = client.get(f"/api/v1.0/contacts/{contact.id!s}/")
-
-    assert response.status_code == 200
-    assert response.json() == {
-        "id": str(contact.id),
-        "abilities": {"delete": True, "get": True, "patch": True, "put": True},
-        "override": None,
-        "owner": str(contact.owner.id),
-        "data": contact.data,
-        "full_name": contact.full_name,
-        "notes": "",
-        "short_name": contact.short_name,
-    }
-
-
-def test_api_contacts_retrieve_authenticated_public():
-    """
-    Authenticated users should be able to retrieve public contacts.
-    """
-    user = factories.UserFactory()
-    contact = factories.BaseContactFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/contacts/{contact.id!s}/")
-    assert response.status_code == 200
-    assert response.json() == {
-        "id": str(contact.id),
-        "abilities": {"delete": False, "get": True, "patch": False, "put": False},
-        "override": None,
-        "owner": None,
-        "data": contact.data,
-        "full_name": contact.full_name,
-        "notes": "",
-        "short_name": contact.short_name,
-    }
-
-
-def test_api_contacts_retrieve_authenticated_other():
-    """
-    Authenticated users should not be allowed to retrieve another user's contacts.
-    """
-    user = factories.UserFactory()
-    contact = factories.ContactFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    response = client.get(f"/api/v1.0/contacts/{contact.id!s}/")
-    assert response.status_code == 403
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
@@ -1,134 +0,0 @@
-"""
-Test contacts API endpoints in People's core app.
-"""
-
-import pytest
-from rest_framework.test import APIClient
-
-from core import factories
-from core.api.client import serializers
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_contacts_update_anonymous():
-    """Anonymous users should not be allowed to update a contact."""
-    contact = factories.ContactFactory()
-    old_contact_values = serializers.ContactSerializer(instance=contact).data
-
-    new_contact_values = serializers.ContactSerializer(
-        instance=factories.ContactFactory()
-    ).data
-    new_contact_values["override"] = str(factories.ContactFactory().id)
-    response = APIClient().put(
-        f"/api/v1.0/contacts/{contact.id!s}/",
-        new_contact_values,
-        format="json",
-    )
-    assert response.status_code == 401
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-    contact.refresh_from_db()
-    contact_values = serializers.ContactSerializer(instance=contact).data
-    assert contact_values == old_contact_values
-
-
-def test_api_contacts_update_authenticated_owned(django_assert_num_queries):
-    """
-    Authenticated users should be allowed to update their own contacts.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    contact = factories.ContactFactory(owner=user)  # Owned by the logged-in user
-    old_contact_values = serializers.ContactSerializer(instance=contact).data
-
-    new_contact_values = serializers.ContactSerializer(
-        instance=factories.ContactFactory()
-    ).data
-    new_contact_values["override"] = str(factories.ContactFactory().id)
-
-    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,
-            format="json",
-        )
-
-    assert response.status_code == 200
-
-    contact.refresh_from_db()
-    contact_values = serializers.ContactSerializer(instance=contact).data
-    for key, value in contact_values.items():
-        if key in ["override", "owner", "id"]:
-            assert value == old_contact_values[key]
-        else:
-            assert value == new_contact_values[key]
-
-
-def test_api_contacts_update_authenticated_profile():
-    """
-    Authenticated users should be allowed to update their profile contact.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    contact = factories.ContactFactory(owner=user, user=user)
-
-    old_contact_values = serializers.ContactSerializer(instance=contact).data
-    new_contact_values = serializers.ContactSerializer(
-        instance=factories.ContactFactory()
-    ).data
-    new_contact_values["override"] = str(factories.ContactFactory().id)
-
-    response = client.put(
-        f"/api/v1.0/contacts/{contact.id!s}/",
-        new_contact_values,
-        format="json",
-    )
-
-    assert response.status_code == 200
-    contact.refresh_from_db()
-    contact_values = serializers.ContactSerializer(instance=contact).data
-    for key, value in contact_values.items():
-        if key in ["override", "owner", "id"]:
-            assert value == old_contact_values[key]
-        else:
-            assert value == new_contact_values[key]
-
-
-def test_api_contacts_update_authenticated_other():
-    """
-    Authenticated users should not be allowed to update contacts owned by other users.
-    """
-    user = factories.UserFactory()
-
-    client = APIClient()
-    client.force_login(user)
-
-    contact = factories.ContactFactory()  # owned by another user
-    old_contact_values = serializers.ContactSerializer(instance=contact).data
-
-    new_contact_values = serializers.ContactSerializer(
-        instance=factories.ContactFactory()
-    ).data
-    new_contact_values["override"] = str(factories.ContactFactory().id)
-
-    response = client.put(
-        f"/api/v1.0/contacts/{contact.id!s}/",
-        new_contact_values,
-        format="json",
-    )
-
-    assert response.status_code == 403
-
-    contact.refresh_from_db()
-    contact_values = serializers.ContactSerializer(instance=contact).data
-    assert contact_values == old_contact_values
@@ -1 +0,0 @@
-"""Test organization API endpoints."""
@@ -1,91 +0,0 @@
-"""
-Tests for Organizations API endpoint in People's core app: retrieve
-"""
-
-import pytest
-from rest_framework import status
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_organizations_retrieve_anonymous(client):
-    """Anonymous users should not be allowed to retrieve an organization."""
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    response = client.get(f"/api/v1.0/organizations/{organization.pk}/")
-
-    assert response.status_code == status.HTTP_401_UNAUTHORIZED
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_organizations_retrieve_authenticated_unrelated(client):
-    """
-    Authenticated users should not be allowed to retrieve an organization to which they are
-    not related.
-    """
-    user = factories.UserFactory()
-    organization = factories.OrganizationFactory(with_registration_id=True)
-
-    client.force_login(user)
-
-    response = client.get(
-        f"/api/v1.0/organizations/{organization.pk!s}/",
-    )
-    assert response.status_code == status.HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Organization matches the given query."}
-
-
-def test_api_organizations_retrieve_authenticated_belong_to_organization(client):
-    """
-    Authenticated users should be allowed to retrieve an organization to which they
-    belong to.
-    """
-    organization = factories.OrganizationFactory(
-        registration_id_list=["56618615316840", "31561861231231", "98781236231482"],
-        domain_list=["example.com", "example.org"],
-    )
-    user = factories.UserFactory(organization=organization)
-
-    client.force_login(user)
-
-    response = client.get(
-        f"/api/v1.0/organizations/{organization.pk!s}/",
-    )
-
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() == {
-        "id": str(organization.pk),
-        "name": organization.name,
-        "abilities": {"delete": False, "get": True, "patch": False, "put": False},
-        "domain_list": ["example.com", "example.org"],
-        "registration_id_list": ["56618615316840", "31561861231231", "98781236231482"],
-    }
-
-
-def test_api_organizations_retrieve_authenticated_administrator(client):
-    """
-    Authenticated users should be allowed to retrieve an organization
-    which they administrate.
-    """
-    organization_access = (
-        factories.OrganizationAccessFactory()
-    )  # only role is administrator for now
-    user = organization_access.user
-    organization = organization_access.organization
-
-    client.force_login(user)
-
-    response = client.get(
-        f"/api/v1.0/organizations/{organization.pk!s}/",
-    )
-
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json()["abilities"] == {
-        "delete": False,
-        "get": True,
-        "patch": True,
-        "put": True,
-    }
@@ -1,96 +0,0 @@
-"""
-Tests for Organizations API endpoint in People's core app: update
-"""
-
-import pytest
-from rest_framework import status
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_organizations_update_anonymous(client):
-    """Anonymous users should not be allowed to update an organization."""
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    response = client.patch(
-        f"/api/v1.0/organizations/{organization.pk}/",
-        {"name": "New Name"},
-        content_type="application/json",
-    )
-
-    assert response.status_code == status.HTTP_401_UNAUTHORIZED
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_organizations_update_authenticated_unrelated(client):
-    """
-    Authenticated users should not be allowed to update an organization to which they are
-    not related.
-    """
-    user = factories.UserFactory()
-    organization = factories.OrganizationFactory(with_registration_id=True)
-
-    client.force_login(user)
-
-    response = client.patch(
-        f"/api/v1.0/organizations/{organization.pk}/",
-        {"name": "New Name"},
-        content_type="application/json",
-    )
-    assert response.status_code == status.HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Organization matches the given query."}
-
-
-def test_api_organizations_update_authenticated_belong_to_organization(client):
-    """
-    Authenticated users should NOT be allowed to update an organization to which they
-    belong to.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-
-    client.force_login(user)
-
-    response = client.patch(
-        f"/api/v1.0/organizations/{organization.pk}/",
-        {"name": "New Name"},
-        content_type="application/json",
-    )
-
-    assert response.status_code == status.HTTP_403_FORBIDDEN
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-
-def test_api_organizations_update_authenticated_administrator(client):
-    """
-    Authenticated users should be allowed to update an organization
-    which they administrate.
-    """
-    organization = factories.OrganizationFactory(
-        registration_id_list=["56618615316840", "31561861231231", "98781236231482"],
-        domain_list=["example.com", "example.org"],
-    )
-    organization_access = factories.OrganizationAccessFactory(organization=organization)
-    user = organization_access.user
-
-    client.force_login(user)
-
-    response = client.patch(
-        f"/api/v1.0/organizations/{organization.pk}/",
-        {"name": "New Name"},
-        content_type="application/json",
-    )
-
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() == {
-        "id": str(organization.pk),
-        "name": "New Name",
-        "abilities": {"delete": False, "get": True, "patch": True, "put": True},
-        "domain_list": ["example.com", "example.org"],
-        "registration_id_list": ["56618615316840", "31561861231231", "98781236231482"],
-    }
@@ -1 +0,0 @@
-"""Core resource server tests."""
@@ -1,178 +0,0 @@
-"""Tests for the authentication process of the resource server."""
-
-import base64
-import json
-
-import pytest
-import responses
-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.rfc7518.rsa_key import RSAKey
-from jwt.utils import to_base64url_uint
-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
-
-
-def build_authorization_bearer(token):
-    """
-    Build an Authorization Bearer header value from a token.
-
-    This can be used like this:
-    client.post(
-        ...
-        HTTP_AUTHORIZATION=f"Bearer {build_authorization_bearer('some_token')}",
-    )
-    """
-    return base64.b64encode(token.encode("utf-8")).decode("utf-8")
-
-
-@responses.activate
-def test_resource_server_authentication_class(client, 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.
-    """
-    private_key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
-
-    unencrypted_pem_private_key = private_key.private_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PrivateFormat.TraditionalOpenSSL,
-        encryption_algorithm=serialization.NoEncryption(),
-    )
-
-    pem_public_key = private_key.public_key().public_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PublicFormat.SubjectPublicKeyInfo,
-    )
-
-    settings.OIDC_RS_PRIVATE_KEY_STR = unencrypted_pem_private_key.decode("utf-8")
-    settings.OIDC_RS_ENCRYPTION_KEY_TYPE = "RSA"
-    settings.OIDC_RS_ENCRYPTION_ENCODING = "A256GCM"
-    settings.OIDC_RS_ENCRYPTION_ALGO = "RSA-OAEP"
-    settings.OIDC_RS_SIGNING_ALGO = "RS256"
-    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"
-
-    # Mock the JWKS endpoint
-    public_numbers = private_key.public_key().public_numbers()
-    responses.add(
-        responses.GET,
-        settings.OIDC_OP_JWKS_ENDPOINT,
-        body=json.dumps(
-            {
-                "keys": [
-                    {
-                        "kty": settings.OIDC_RS_ENCRYPTION_KEY_TYPE,
-                        "alg": settings.OIDC_RS_SIGNING_ALGO,
-                        "use": "sig",
-                        "kid": "1234567890",
-                        "n": to_base64url_uint(public_numbers.n).decode("ascii"),
-                        "e": to_base64url_uint(public_numbers.e).decode("ascii"),
-                    }
-                ]
-            }
-        ),
-    )
-
-    def encrypt_jwt(json_data):
-        """Encrypt the JWT token for the backend to decrypt."""
-        token = jose_jwt.encode(
-            {
-                "kid": "1234567890",
-                "alg": settings.OIDC_RS_SIGNING_ALGO,
-            },
-            json_data,
-            RSAKey.import_key(unencrypted_pem_private_key),
-            algorithms=[settings.OIDC_RS_SIGNING_ALGO],
-        )
-
-        return jose_jwe.encrypt_compact(
-            protected={
-                "alg": settings.OIDC_RS_ENCRYPTION_ALGO,
-                "enc": settings.OIDC_RS_ENCRYPTION_ENCODING,
-            },
-            plaintext=token,
-            public_key=RSAKey.import_key(pem_public_key),
-            algorithms=[
-                settings.OIDC_RS_ENCRYPTION_ALGO,
-                settings.OIDC_RS_ENCRYPTION_ENCODING,
-            ],
-        )
-
-    responses.add(
-        responses.POST,
-        "https://oidc.example.com/introspect",
-        body=encrypt_jwt(
-            {
-                "iss": "https://oidc.example.com",
-                "aud": "some_client_id",  # settings.OIDC_RS_CLIENT_ID
-                "token_introspection": {
-                    "sub": "very-specific-sub",
-                    "iss": "https://oidc.example.com",
-                    "aud": "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
@@ -296,7 +296,7 @@ def test_introspect_public_key_import_failure(

 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"}
+    introspection_response = {"active": True, "scope": "groups"}

    result = resource_server_backend._verify_user_info(introspection_response)
    assert result == introspection_response
@@ -333,7 +333,7 @@ def test_get_user_success(resource_server_backend):

    access_token = "valid_access_token"
    mock_jwt = Mock()
-    mock_claims = {"token_introspection": {"sub": "user123", "aud": "123"}}
+    mock_claims = {"token_introspection": {"sub": "user123"}}
    mock_user = Mock()

    resource_server_backend._introspect = Mock(return_value=mock_jwt)
@@ -1 +0,0 @@
-"""Tests for the resource server API endpoints."""
@@ -1,79 +0,0 @@
-"""Defines fixtures for the resource server API tests."""
-
-from contextlib import contextmanager
-from typing import Optional
-from unittest import mock
-
-from django.contrib.auth import get_user_model
-
-import pytest
-import responses
-from faker import Faker
-
-from core.resource_server.authentication import ResourceServerAuthentication
-
-User = get_user_model()
-fake = Faker()
-
-
-@contextmanager
-def _force_login_via_resource_server(
-    client_fixture,
-    user: User,
-    service_provider_audience: Optional[str],
-):
-    """
-    Context manager to authenticate a user with a service provider via
-    a resource server call.
-
-    This allows to authenticate a user with a service provider without doing
-    all the introspection process.
-
-    This is a private function, use the `force_login_via_resource_server`
-    fixture instead.
-
-    The `service_provider_audience` parameter might not match any existing
-    service provider audience, doing so allow to check the behavior when
-    the service provider is not yet known.
-    """
-
-    def mock_authenticate(self, request):  # pylint: disable=unused-argument
-        request.resource_server_token_audience = (
-            service_provider_audience or fake.pystr(min_chars=10, max_chars=10)
-        )
-        return user, "unused-token"
-
-    with mock.patch.object(
-        ResourceServerAuthentication, "authenticate", mock_authenticate
-    ):
-        client_fixture.force_login(
-            user,
-            backend="core.resource_server.authentication.ResourceServerAuthentication",
-        )
-        yield
-
-
-@pytest.fixture(name="force_login_via_resource_server")
-@responses.activate
-def force_login_via_resource_server_fixture():
-    """
-    Fixture to authenticate a user with a service provider via a resource server call.
-
-    Usage:
-    ```
-    def test_login_with_resource_server(
-        client, force_login_via_resource_server,
-    ):
-        user = UserFactory()
-        service_provider = ServiceProviderFactory()
-        with force_login_via_resource_server(client, user, service_provider.audience_id):
-            response = client.get(
-                "/resource-server/v1.0/<whatever>/",
-                format="json",
-                HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-            )
-
-            # response is authenticated
-    ```
-    """
-    return _force_login_via_resource_server
@@ -1 +0,0 @@
-"""Tests for the resource server Team API endpoints."""
@@ -1,166 +0,0 @@
-"""
-Tests for Teams API endpoint in People's core app: create
-"""
-
-import pytest
-from rest_framework.status import (
-    HTTP_201_CREATED,
-    HTTP_401_UNAUTHORIZED,
-)
-from rest_framework.test import APIClient
-
-from core.factories import OrganizationFactory, ServiceProviderFactory, UserFactory
-from core.models import ServiceProvider, Team
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_teams_create_anonymous():
-    """Anonymous users should not be allowed to create teams."""
-    response = APIClient().post(
-        "/resource-server/v1.0/teams/",
-        {
-            "name": "my team",
-        },
-    )
-
-    assert response.status_code == HTTP_401_UNAUTHORIZED
-    assert not Team.objects.exists()
-
-
-def test_api_teams_create_authenticated_new_service_provider(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should be able to create teams and should automatically be declared
-    as the owner of the newly created team and a new service provider should be created and
-    associated to the team.
-    """
-    organization = OrganizationFactory(with_registration_id=True)
-    user = UserFactory(organization=organization)
-    assert ServiceProvider.objects.count() == 0
-
-    with force_login_via_resource_server(client, user, "some_service_provider"):
-        response = client.post(
-            "/resource-server/v1.0/teams/",
-            {
-                "name": "my team",
-            },
-            format="json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_201_CREATED
-
-    team = Team.objects.get()
-    team_access = team.accesses.get()
-    service_provider = ServiceProvider.objects.get()  # service provider created
-
-    assert response.json() == {
-        "created_at": team.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-        "id": str(team.pk),
-        "depth": team.depth,
-        "name": "my team",
-        "numchild": team.numchild,
-        "path": team.path,
-        "updated_at": team.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-    }
-
-    # check team data
-    assert team.name == "my team"
-    assert team.organization == organization
-
-    # check team access data
-    assert team_access.role == "owner"
-    assert team_access.user == user
-
-    # check service provider data
-    assert service_provider.audience_id == "some_service_provider"
-
-
-def test_api_teams_create_authenticated_existing_service_provider(
-    client,
-    force_login_via_resource_server,
-):
-    """
-    Authenticated users should be able to create teams and should automatically be declared
-    as the owner of the newly created team and an existing service provider should be associated
-    to the team.
-    """
-    user = UserFactory()
-    service_provider = ServiceProviderFactory()
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.post(
-            "/resource-server/v1.0/teams/",
-            {
-                "name": "my team",
-            },
-            format="json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_201_CREATED
-
-    assert ServiceProvider.objects.count() == 1  # no object created
-    team = Team.objects.get()  # team created
-    assert team.service_providers.get().audience_id == service_provider.audience_id
-    assert team.name == "my team"
-    assert team.accesses.filter(role="owner", user=user).exists()
-
-
-def test_api_teams_create_cannot_override_organization(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should be able to create teams and not
-    be able to set the organization manually (for now).
-    """
-    organization = OrganizationFactory(with_registration_id=True)
-    user = UserFactory(organization=organization)
-    service_provider = ServiceProviderFactory()
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.post(
-            "/resource-server/v1.0/teams/",
-            {
-                "name": "my team",
-                "organization": OrganizationFactory(
-                    with_registration_id=True
-                ).pk,  # ignored
-            },
-            format="json",
-        )
-
-    assert response.status_code == HTTP_201_CREATED
-    team = Team.objects.get()
-    assert team.name == "my team"
-    assert team.organization == organization
-    assert team.accesses.filter(role="owner", user=user).exists()
-
-
-def test_api_teams_create_cannot_override_service_provider(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should be able to create teams and not
-    be able to set the team service provider manually.
-    """
-    user = UserFactory(with_organization=True)
-    service_provider = ServiceProviderFactory()
-
-    other_service_provider = ServiceProviderFactory()
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.post(
-            "/resource-server/v1.0/teams/",
-            {
-                "name": "my team",
-                "service_providers": [str(other_service_provider.pk)],  # ignored
-            },
-            format="json",
-        )
-
-    assert response.status_code == HTTP_201_CREATED
-
-    team = Team.objects.get()
-    assert team.name == "my team"
-    assert team.service_providers.get().audience_id == service_provider.audience_id
@@ -1,49 +0,0 @@
-"""
-Tests for Teams API endpoint in People's core app: delete
-"""
-
-import pytest
-from rest_framework.status import (
-    HTTP_401_UNAUTHORIZED,
-    HTTP_405_METHOD_NOT_ALLOWED,
-)
-from rest_framework.test import APIClient
-
-from core import factories, models
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_teams_delete_anonymous():
-    """Anonymous users should not be allowed to destroy a team."""
-    team = factories.TeamFactory()
-
-    response = APIClient().delete(
-        f"/resource-server/v1.0/teams/{team.id!s}/",
-    )
-
-    assert response.status_code == HTTP_401_UNAUTHORIZED
-    assert models.Team.objects.count() == 1
-
-
-def test_api_teams_delete_not_allowed(client, force_login_via_resource_server):
-    """
-    Authenticated users should not be allowed to delete a team from a resource
-    server, even if they have the right permissions.
-
-    This may be implemented in the future, but for now, it is not allowed.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-    team = factories.TeamFactory(
-        users=[(user, "owner")], service_providers=[service_provider]
-    )
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.delete(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-        )
-
-    assert response.status_code == HTTP_405_METHOD_NOT_ALLOWED
-    assert response.json() == {"detail": 'Method "DELETE" not allowed.'}
-    assert models.Team.objects.count() == 1
@@ -1,275 +0,0 @@
-"""
-Tests for Teams API endpoint in People's core app: list
-"""
-
-import pytest
-from rest_framework.status import HTTP_200_OK, HTTP_401_UNAUTHORIZED
-from rest_framework.test import APIClient
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_teams_list_anonymous():
-    """Anonymous users should not be allowed to list teams."""
-    factories.TeamFactory.create_batch(2)
-
-    response = APIClient().get("/resource-server/v1.0/teams/")
-
-    assert response.status_code == HTTP_401_UNAUTHORIZED
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_teams_list_authenticated(  # pylint: disable=too-many-locals
-    client, django_assert_num_queries, force_login_via_resource_server
-):
-    """
-    Authenticated users should be able to list teams
-    they are an owner/administrator/member of, and only list from the
-    requesting service provider should appear.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-    hidden_service_provider = factories.ServiceProviderFactory()
-
-    team_access_1 = factories.TeamAccessFactory(
-        user=user, team__service_providers=[service_provider], role="member"
-    )
-    team_1 = team_access_1.team
-
-    team_access_2 = factories.TeamAccessFactory(
-        user=user,
-        team__service_providers=[hidden_service_provider, service_provider],
-        role="member",
-    )
-    team_2 = team_access_2.team
-
-    team_access_3 = factories.TeamAccessFactory(
-        user=user, team__service_providers=[service_provider], role="administrator"
-    )
-    team_3 = team_access_3.team
-
-    team_access_4 = factories.TeamAccessFactory(
-        user=user, team__service_providers=[service_provider], role="owner"
-    )
-    team_4 = team_access_4.team
-
-    # Team filtered out because of the service provider
-    _not_included_team_access = factories.TeamAccessFactory(
-        user=user, team__service_providers=[hidden_service_provider]
-    )
-
-    # Authenticate using the resource server, ie via the Authorization header
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        with django_assert_num_queries(5):
-            # queries: Team path, Count, Team, ServiceProvider, TeamAccess
-            response = client.get(
-                "/resource-server/v1.0/teams/?ordering=created_at",
-                format="json",
-                HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-            )
-
-    assert response.status_code == HTTP_200_OK
-    assert response.json() == {
-        "count": 4,
-        "next": None,
-        "previous": None,
-        "results": [
-            {
-                "created_at": team_1.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-                "depth": team_1.depth,
-                "id": str(team_1.pk),
-                "name": team_1.name,
-                "numchild": team_1.numchild,
-                "path": team_1.path,
-                "updated_at": team_1.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-            },
-            {
-                "created_at": team_2.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-                "depth": team_2.depth,
-                "id": str(team_2.pk),
-                "name": team_2.name,
-                "numchild": team_2.numchild,
-                "path": team_2.path,
-                "updated_at": team_2.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-            },
-            {
-                "created_at": team_3.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-                "depth": team_3.depth,
-                "id": str(team_3.pk),
-                "name": team_3.name,
-                "numchild": team_3.numchild,
-                "path": team_3.path,
-                "updated_at": team_3.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-            },
-            {
-                "created_at": team_4.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-                "depth": team_4.depth,
-                "id": str(team_4.pk),
-                "name": team_4.name,
-                "numchild": team_4.numchild,
-                "path": team_4.path,
-                "updated_at": team_4.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-            },
-        ],
-    }
-
-
-def test_api_teams_list_authenticated_new_service_provider(
-    client, force_login_via_resource_server
-):
-    """
-    Team list from not yet known service provider should be empty (not fail).
-
-    Teams without service providers should not be listed.
-    """
-    user = factories.UserFactory()
-    _team = factories.TeamFactory(users=[user])
-
-    with force_login_via_resource_server(client, user, "some_service_provider"):
-        response = client.get(
-            "/resource-server/v1.0/teams/",
-        )
-
-    assert response.status_code == HTTP_200_OK
-    assert response.json() == {
-        "count": 0,
-        "next": None,
-        "previous": None,
-        "results": [],
-    }
-
-
-def test_api_teams_list_authenticated_distinct(client, force_login_via_resource_server):
-    """A team with several related users should only be listed once."""
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    other_user = factories.UserFactory()
-
-    team = factories.TeamFactory(
-        users=[user, other_user], service_providers=[service_provider]
-    )
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            "/resource-server/v1.0/teams/",
-        )
-
-    assert response.status_code == HTTP_200_OK
-    content = response.json()
-    assert content["count"] == 1
-
-    results = content["results"]
-    assert len(results) == 1
-    assert results[0]["id"] == str(team.id)
-
-
-def test_api_teams_order_param(client, force_login_via_resource_server):
-    """
-    Test that the 'created_at' field is sorted in ascending order
-    when the 'ordering' query parameter is set.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    team_ids = [
-        str(team.id)
-        for team in factories.TeamFactory.create_batch(
-            5, users=[user], service_providers=[service_provider]
-        )
-    ]
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            "/resource-server/v1.0/teams/?ordering=created_at",
-        )
-    assert response.status_code == 200
-
-    response_data = response.json()
-    response_team_ids = [team["id"] for team in response_data["results"]]
-
-    assert response_team_ids == team_ids, (
-        "created_at values are not sorted from oldest to newest"
-    )
-
-
-def test_api_teams_list_with_parent_teams(client, force_login_via_resource_server):
-    """
-    Authenticated users should be able to list teams including parent teams.
-    Parent teams should not be listed if they don't have the service provider.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    root_team = factories.TeamFactory(name="Root", service_providers=[service_provider])
-    first_team = factories.TeamFactory(name="First", parent_id=root_team.pk)
-    second_team = factories.TeamFactory(
-        name="Second", parent_id=first_team.pk, service_providers=[service_provider]
-    )
-
-    factories.TeamAccessFactory(user=user, team=second_team, role="member")
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            "/resource-server/v1.0/teams/",
-            format="json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_200_OK
-    response_data = response.json()
-    assert response_data["count"] == 2
-
-    team_ids = [team["id"] for team in response_data["results"]]
-    assert len(team_ids) == 2
-    assert set(team_ids) == {str(root_team.id), str(second_team.id)}
-
-
-def test_api_teams_list_with_parent_teams_other_organization(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should be able to list teams including parent teams.
-    Parent teams should not be listed if they don't have the service provider
-    or if the user does not belong to the organization.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-    service_provider = factories.ServiceProviderFactory()
-
-    other_organization = factories.OrganizationFactory(with_registration_id=True)
-    root_team = factories.TeamFactory(
-        name="Root",
-        service_providers=[service_provider],
-        organization=other_organization,
-    )
-    first_team = factories.TeamFactory(
-        name="First", parent_id=root_team.pk, organization=other_organization
-    )
-    second_team = factories.TeamFactory(
-        name="Second",
-        parent_id=first_team.pk,
-        service_providers=[service_provider],
-        organization=other_organization,
-    )
-
-    factories.TeamAccessFactory(user=user, team=second_team, role="member")
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            "/resource-server/v1.0/teams/",
-            format="json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_200_OK
-    response_data = response.json()
-    assert response_data["count"] == 1
-
-    team_ids = [team["id"] for team in response_data["results"]]
-    assert len(team_ids) == 1
-    assert set(team_ids) == {str(second_team.id)}
@@ -1,231 +0,0 @@
-"""
-Tests for Teams API endpoint in People's core app: retrieve
-"""
-
-import pytest
-from rest_framework import status
-from rest_framework.status import HTTP_404_NOT_FOUND
-from rest_framework.test import APIClient
-
-from core import factories
-from core.factories import TeamAccessFactory, UserFactory
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_teams_retrieve_anonymous():
-    """Anonymous users should not be allowed to retrieve a team."""
-    team = factories.TeamFactory()
-    response = APIClient().get(f"/resource-server/v1.0/teams/{team.id}/")
-
-    assert response.status_code == status.HTTP_401_UNAUTHORIZED
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_teams_retrieve_authenticated_unrelated(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should not be allowed to retrieve a team to which they are
-    not related.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    team = factories.TeamFactory(service_providers=[service_provider])
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-        )
-    assert response.status_code == status.HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
-
-
-def test_api_teams_retrieve_authenticated_related(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should be allowed to retrieve a team to which they
-    are related whatever the role even if the request is authenticated via
-    a resource server.
-    """
-    service_provider = factories.ServiceProviderFactory(
-        audience_id="some_service_provider"
-    )
-    user = factories.UserFactory()
-    team = factories.TeamFactory(users=[user], service_providers=[service_provider])
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() == {
-        "created_at": team.created_at.isoformat().replace("+00:00", "Z"),
-        "depth": 1,
-        "id": str(team.id),
-        "name": team.name,
-        "numchild": 0,
-        "path": team.path,
-        "updated_at": team.updated_at.isoformat().replace("+00:00", "Z"),
-    }
-
-
-def test_api_teams_retrieve_authenticated_other_service_provider(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should not be able to retrieve a team
-    if the request is authenticated via a different resource server.
-    """
-    user = UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    other_service_provider = factories.ServiceProviderFactory(
-        audience_id="some_service_provider"
-    )
-    team = factories.TeamFactory(
-        users=[user], service_providers=[other_service_provider]
-    )
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_404_NOT_FOUND
-
-
-def test_api_teams_retrieve_authenticated_related_parent_same_organization(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should be allowed to retrieve a parent team
-    of a team to which they are related, only if they belong to the
-    same organization.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-    service_provider = factories.ServiceProviderFactory()
-
-    root_team = factories.TeamFactory(
-        name="Root",
-        organization=organization,
-    )
-    first_team = factories.TeamFactory(
-        name="First",
-        parent_id=root_team.pk,
-        organization=organization,
-        service_providers=[service_provider],
-    )
-    second_team = factories.TeamFactory(
-        name="Second",
-        parent_id=first_team.pk,
-        service_providers=[service_provider],
-        organization=organization,
-    )
-    TeamAccessFactory(user=user, team=second_team, role="member")
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            f"/resource-server/v1.0/teams/{first_team.pk}/",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() == {
-        "created_at": first_team.created_at.isoformat().replace("+00:00", "Z"),
-        "depth": 2,
-        "id": str(first_team.pk),
-        "name": first_team.name,
-        "numchild": 1,
-        "path": first_team.path,
-        "updated_at": first_team.updated_at.isoformat().replace("+00:00", "Z"),
-    }
-
-
-def test_api_teams_retrieve_authenticated_related_parent_other_organization(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should be allowed to retrieve a parent team
-    of a team to which they are related, only if they belong to the
-    same organization.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-    service_provider = factories.ServiceProviderFactory()
-
-    other_organization = factories.OrganizationFactory(with_registration_id=True)
-    root_team = factories.TeamFactory(
-        name="Root",
-        organization=other_organization,
-    )
-    first_team = factories.TeamFactory(
-        name="First",
-        parent_id=root_team.pk,
-        organization=other_organization,
-        service_providers=[service_provider],
-    )
-    second_team = factories.TeamFactory(
-        name="Second",
-        parent_id=first_team.pk,
-        service_providers=[service_provider],
-        organization=other_organization,
-    )
-    TeamAccessFactory(user=user, team=second_team, role="member")
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            f"/resource-server/v1.0/teams/{first_team.pk}/",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == status.HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
-
-
-def test_api_teams_retrieve_authenticated_related_child_same_organization(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should NOT be allowed to retrieve a child team
-    of a team to which they are related, even if they belong to the
-    same organization.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-    service_provider = factories.ServiceProviderFactory()
-
-    root_team = factories.TeamFactory(
-        name="Root",
-        organization=organization,
-    )
-    first_team = factories.TeamFactory(
-        name="First",
-        parent_id=root_team.pk,
-        organization=organization,
-        service_providers=[service_provider],
-    )
-    second_team = factories.TeamFactory(
-        name="Second",
-        parent_id=first_team.pk,
-        service_providers=[service_provider],
-        organization=organization,
-    )
-    TeamAccessFactory(user=user, team=first_team, role="member")
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.get(
-            f"/resource-server/v1.0/teams/{second_team.pk}/",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == status.HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
@@ -1,338 +0,0 @@
-"""
-Tests for Teams API endpoint in People's core app: update
-"""
-
-import pytest
-from rest_framework.status import (
-    HTTP_200_OK,
-    HTTP_401_UNAUTHORIZED,
-    HTTP_403_FORBIDDEN,
-    HTTP_404_NOT_FOUND,
-)
-from rest_framework.test import APIClient
-
-from core import factories
-from core.api.resource_server import serializers
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_teams_update_anonymous():
-    """Anonymous users should not be allowed to update a team."""
-    team = factories.TeamFactory()
-    old_team_values = serializers.TeamSerializer(instance=team).data
-
-    new_team_values = serializers.TeamSerializer(instance=factories.TeamFactory()).data
-    response = APIClient().put(
-        f"/resource-server/v1.0/teams/{team.id!s}/",
-        new_team_values,
-        content_type="application/json",
-    )
-    assert response.status_code == HTTP_401_UNAUTHORIZED
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-    team.refresh_from_db()
-    team_values = serializers.TeamSerializer(instance=team).data
-    assert team_values == old_team_values
-
-
-def test_api_teams_update_authenticated_unrelated(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should not be allowed to update a team to which they are not related.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-    team = factories.TeamFactory(service_providers=[service_provider])
-
-    old_team_values = serializers.TeamSerializer(instance=team).data
-
-    new_team_values = serializers.TeamSerializer(instance=factories.TeamFactory()).data
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.put(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-            new_team_values,
-            content_type="application/json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
-
-    team.refresh_from_db()
-    team_values = serializers.TeamSerializer(instance=team).data
-    assert team_values == old_team_values
-
-
-def test_api_teams_update_authenticated(
-    client,
-    force_login_via_resource_server,
-):
-    """
-    Authenticated users should be allowed to update a team to which they
-    are related whatever the role even if the request is authenticated via
-    a resource server.
-    """
-    service_provider = factories.ServiceProviderFactory(
-        audience_id="some_service_provider"
-    )
-    user = factories.UserFactory()
-    team = factories.TeamFactory(
-        name="Old name",
-        users=[(user, "owner")],
-        service_providers=[service_provider],
-    )
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.put(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-            data=serializers.TeamSerializer(instance=team).data
-            | {
-                "name": "New name",
-            },
-            content_type="application/json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_200_OK
-
-    team.refresh_from_db()
-    assert team.name == "New name"
-
-
-def test_api_teams_update_authenticated_other_resource_server(
-    client, force_login_via_resource_server
-):
-    """
-    Authenticated users should not be able to update a team for which they are directly
-    owner, if the request is authenticated via a different service provider.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    other_service_provider = factories.ServiceProviderFactory(
-        audience_id="some_service_provider"
-    )
-    team = factories.TeamFactory(
-        name="Old name",
-        users=[(user, "owner")],
-        service_providers=[other_service_provider],
-    )
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.put(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-            data=serializers.TeamSerializer(instance=team).data
-            | {
-                "name": "New name",
-            },
-            content_type="application/json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
-
-    team.refresh_from_db()
-    assert team.name == "Old name"
-
-
-def test_api_teams_update_authenticated_members(
-    client, force_login_via_resource_server
-):
-    """
-    Users who are members of a team but not administrators should
-    not be allowed to update it.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    team = factories.TeamFactory(
-        users=[(user, "member")], service_providers=[service_provider]
-    )
-    old_team_values = serializers.TeamSerializer(instance=team).data
-
-    new_team_values = serializers.TeamSerializer(instance=factories.TeamFactory()).data
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.put(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-            new_team_values,
-            content_type="application/json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_403_FORBIDDEN
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-    team.refresh_from_db()
-    team_values = serializers.TeamSerializer(instance=team).data
-    assert team_values == old_team_values
-
-
-@pytest.mark.parametrize("role", ["owner", "administrator"])
-def test_api_teams_update_authenticated_administrators(
-    client, force_login_via_resource_server, role
-):
-    """Administrators or owners of a team should be allowed to update it."""
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    team = factories.TeamFactory(
-        users=[(user, role)],
-        service_providers=[service_provider],
-        name="old name",
-    )
-    initial_created_at = team.created_at
-    initial_updated_at = team.updated_at
-    initial_pk = team.pk
-
-    # generate new random values
-    new_values = serializers.TeamSerializer(instance=factories.TeamFactory.build()).data
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.put(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-            new_values,
-            content_type="application/json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-    assert response.status_code == HTTP_200_OK
-
-    team.refresh_from_db()
-    assert team.pk == initial_pk
-    assert team.name == new_values["name"]
-    assert team.created_at == initial_created_at
-    assert team.updated_at > initial_updated_at
-
-
-@pytest.mark.parametrize("role", ["owner", "administrator"])
-def test_api_teams_update_administrator_or_owner_of_another(
-    client, force_login_via_resource_server, role
-):
-    """
-    Being administrator or owner of a team should not grant authorization to update
-    another team.
-    """
-    user = factories.UserFactory()
-    service_provider = factories.ServiceProviderFactory()
-
-    factories.TeamFactory(users=[(user, role)], service_providers=[service_provider])
-
-    team = factories.TeamFactory(name="Old name", service_providers=[service_provider])
-    old_team_values = serializers.TeamSerializer(instance=team).data
-
-    new_team_values = serializers.TeamSerializer(instance=factories.TeamFactory()).data
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.put(
-            f"/resource-server/v1.0/teams/{team.id!s}/",
-            new_team_values,
-            content_type="application/json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
-
-    team.refresh_from_db()
-    team_values = serializers.TeamSerializer(instance=team).data
-    assert team_values == old_team_values
-
-
-@pytest.mark.parametrize("role", ["administrator", "member", "owner"])
-def test_api_teams_update_parent_team(client, force_login_via_resource_server, role):
-    """
-    Belonging to a team should NOT grant authorization to update
-    another parent team.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-    service_provider = factories.ServiceProviderFactory()
-
-    root_team = factories.TeamFactory(
-        name="Root",
-        organization=organization,
-    )
-    first_team = factories.TeamFactory(
-        name="First",
-        parent_id=root_team.pk,
-        organization=organization,
-        service_providers=[service_provider],
-    )
-    second_team = factories.TeamFactory(
-        name="Second",
-        parent_id=first_team.pk,
-        service_providers=[service_provider],
-        organization=organization,
-    )
-    factories.TeamAccessFactory(user=user, team=second_team, role=role)
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.patch(
-            f"/resource-server/v1.0/teams/{first_team.pk}/",
-            {
-                "name": "New name",
-            },
-            content_type="application/json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_403_FORBIDDEN
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-
-    first_team.refresh_from_db()
-    assert first_team.name == "First"
-
-
-@pytest.mark.parametrize("role", ["administrator", "member", "owner"])
-def test_api_teams_update_child_team(client, force_login_via_resource_server, role):
-    """
-    Belonging to a team should NOT grant authorization to update
-    another child team.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-    service_provider = factories.ServiceProviderFactory()
-
-    root_team = factories.TeamFactory(
-        name="Root",
-        organization=organization,
-    )
-    first_team = factories.TeamFactory(
-        name="First",
-        parent_id=root_team.pk,
-        organization=organization,
-        service_providers=[service_provider],
-    )
-    second_team = factories.TeamFactory(
-        name="Second",
-        parent_id=first_team.pk,
-        service_providers=[service_provider],
-        organization=organization,
-    )
-    factories.TeamAccessFactory(user=user, team=first_team, role=role)
-
-    with force_login_via_resource_server(client, user, service_provider.audience_id):
-        response = client.patch(
-            f"/resource-server/v1.0/teams/{second_team.pk}/",
-            {
-                "name": "New name",
-            },
-            content_type="application/json",
-            HTTP_AUTHORIZATION="Bearer b64untestedbearertoken",
-        )
-
-    assert response.status_code == HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
-
-    second_team.refresh_from_db()
-    assert second_team.name == "Second"
@@ -1,3 +0,0 @@
-"""
-Test for the service providers viewset.
-"""
@@ -1,91 +0,0 @@
-"""
-Tests for Service Provider API endpoint in People's core app: list
-"""
-
-import pytest
-from rest_framework.status import HTTP_200_OK, HTTP_401_UNAUTHORIZED
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_service_providers_list_anonymous(client):
-    """Anonymous users should not be allowed to list service providers."""
-    factories.ServiceProviderFactory.create_batch(2)
-
-    response = client.get("/api/v1.0/service-providers/")
-
-    assert response.status_code == HTTP_401_UNAUTHORIZED
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_service_providers_list_authenticated(client):
-    """
-    Authenticated users should be able to list service providers
-    of their organization.
-    """
-    user = factories.UserFactory(with_organization=True)
-    client.force_login(user)
-
-    service_provider_1 = factories.ServiceProviderFactory(
-        name="A", organizations=[user.organization]
-    )
-    service_provider_2 = factories.ServiceProviderFactory(
-        name="B", organizations=[user.organization]
-    )
-
-    # Generate some not fetched data
-    factories.ServiceProviderFactory.create_batch(
-        2, organizations=[factories.OrganizationFactory(with_registration_id=True)]
-    )  # Other service providers
-    factories.TeamFactory(
-        users=[user], service_providers=[factories.ServiceProviderFactory()]
-    )
-
-    response = client.get(
-        "/api/v1.0/service-providers/",
-    )
-
-    assert response.status_code == HTTP_200_OK
-    assert response.json() == {
-        "count": 2,
-        "next": None,
-        "previous": None,
-        "results": [
-            {
-                "audience_id": str(service_provider_1.audience_id),
-                "id": str(service_provider_1.pk),
-                "name": "A",
-            },
-            {
-                "audience_id": str(service_provider_2.audience_id),
-                "id": str(service_provider_2.pk),
-                "name": "B",
-            },
-        ],
-    }
-
-
-def test_api_service_providers_order(client):
-    """Test that the service providers are sorted as requested."""
-    user = factories.UserFactory(with_organization=True)
-    factories.ServiceProviderFactory(name="A", organizations=[user.organization])
-    factories.ServiceProviderFactory(name="B", organizations=[user.organization])
-
-    client.force_login(user)
-
-    # Test ordering by name descending
-    response = client.get("/api/v1.0/service-providers/?ordering=-name")
-    assert response.status_code == 200
-    response_data = response.json()["results"]
-    assert response_data[0]["name"] == "B"
-    assert response_data[1]["name"] == "A"
-
-    # Test ordering by creation date ascending
-    response = client.get("/api/v1.0/service-providers/?ordering=created_at")
-    response_data = response.json()["results"]
-    assert response_data[0]["name"] == "A"
-    assert response_data[1]["name"] == "B"
@@ -1,85 +0,0 @@
-"""
-Tests for Service Provider API endpoint in People's core app: retrieve
-"""
-
-import pytest
-from rest_framework.status import HTTP_200_OK, HTTP_401_UNAUTHORIZED, HTTP_404_NOT_FOUND
-
-from core import factories
-
-pytestmark = pytest.mark.django_db
-
-
-def test_api_service_providers_retrieve_anonymous(client):
-    """Anonymous users should not be allowed to retrieve service providers."""
-    service_provider = factories.ServiceProviderFactory()
-
-    response = client.get(f"/api/v1.0/service-providers/{service_provider.pk}/")
-
-    assert response.status_code == HTTP_401_UNAUTHORIZED
-    assert response.json() == {
-        "detail": "Authentication credentials were not provided."
-    }
-
-
-def test_api_service_providers_retrieve_authenticated_allowed(client):
-    """
-    Authenticated users should be able to retrieve service providers
-    of their organization.
-    """
-    user = factories.UserFactory(with_organization=True)
-    client.force_login(user)
-
-    service_provider = factories.ServiceProviderFactory(
-        organizations=[user.organization]
-    )
-
-    response = client.get(f"/api/v1.0/service-providers/{service_provider.pk}/")
-
-    assert response.status_code == HTTP_200_OK
-    assert response.json() == {
-        "audience_id": str(service_provider.audience_id),
-        "id": str(service_provider.pk),
-        "name": service_provider.name,
-    }
-
-
-def test_api_service_providers_retrieve_authenticated_other_organization(client):
-    """
-    Authenticated users should not be able to retrieve service providers
-    of other organization.
-    """
-    user = factories.UserFactory(with_organization=True)
-    client.force_login(user)
-
-    service_provider = factories.ServiceProviderFactory(
-        organizations=[factories.OrganizationFactory(with_registration_id=True)]
-    )
-
-    response = client.get(f"/api/v1.0/service-providers/{service_provider.pk}/")
-
-    assert response.status_code == HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No ServiceProvider matches the given query."}
-
-
-def test_api_service_providers_retrieve_authenticated_on_teams(client):
-    """
-    Authenticated users should not be able to retrieve service providers
-    just because it is related to one of their teams if it is not related
-    to their organization (might change later if needed).
-    """
-    user = factories.UserFactory(with_organization=True)
-    client.force_login(user)
-
-    other_organization = factories.OrganizationFactory(with_registration_id=True)
-    service_provider = factories.ServiceProviderFactory()
-    factories.TeamFactory(
-        users=[user],
-        organization=other_organization,
-        service_providers=[service_provider],
-    )
-
-    response = client.get(f"/api/v1.0/service-providers/{service_provider.pk}/")
-
-    assert response.status_code == HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No ServiceProvider matches the given query."}
@@ -1 +0,0 @@
-"""Core Swagger tests."""
@@ -1 +0,0 @@
-"""Team accesses tests package."""
@@ -338,19 +338,14 @@ def test_api_team_accesses_list_authenticated_ordering():
 def test_api_team_accesses_list_authenticated_ordering_user(ordering_field):
    """Team accesses can be ordered by user's fields."""

-    john = factories.UserFactory(email="john.doe@example.com", name="John Doe")
+    user = factories.UserFactory()
    team = factories.TeamFactory()
-    models.TeamAccess.objects.create(team=team, user=john)
+    models.TeamAccess.objects.create(team=team, user=user)

-    # create new team members
-    dave = factories.UserFactory(email="bowbow@example.com", name="David Bowman")
-    nicole = factories.UserFactory(
-        email="nicole_foole@example.com", name="Nicole Foole"
-    )
-    frank = factories.UserFactory(email="frank_poole@example.com", name="Frank Poole")
-    mary = factories.UserFactory(email="mary_pol@example.com", name="Mary Pol")
-    for user in (dave, nicole, frank, mary):
-        factories.TeamAccessFactory(team=team, user=user)
+    # create 20 new team members
+    for _ in range(20):
+        extra_user = factories.UserFactory()
+        factories.TeamAccessFactory(team=team, user=extra_user)

    client = APIClient()
    client.force_login(user)
@@ -359,11 +354,14 @@ def test_api_team_accesses_list_authenticated_ordering_user(ordering_field):
        f"/api/v1.0/teams/{team.id!s}/accesses/?ordering=user__{ordering_field}",
    )
    assert response.status_code == HTTP_200_OK
-    assert response.json()["count"] == 5
-    assert [access["user"]["name"] for access in response.json()["results"]] == [
-        dave.name,
-        frank.name,
-        john.name,
-        mary.name,
-        nicole.name,
+    assert response.json()["count"] == 21
+
+    def normalize(x):
+        """Mimic Django order_by, which is case-insensitive and space-insensitive"""
+        return x.casefold().replace(" ", "")
+
+    results = [
+        team_access["user"][ordering_field]
+        for team_access in response.json()["results"]
    ]
+    assert sorted(results, key=normalize) == results
@@ -9,7 +9,7 @@ import pytest
 from rest_framework.test import APIClient

 from core import factories, models
-from core.api.client import serializers
+from core.api import serializers

 pytestmark = pytest.mark.django_db

@@ -1 +0,0 @@
-"""Teams tests package."""
@@ -5,12 +5,12 @@ Tests for Teams API endpoint in People's core app: create
 import pytest
 from rest_framework.status import (
    HTTP_201_CREATED,
+    HTTP_400_BAD_REQUEST,
    HTTP_401_UNAUTHORIZED,
-    HTTP_403_FORBIDDEN,
 )
 from rest_framework.test import APIClient

-from core.factories import OrganizationFactory, UserFactory
+from core.factories import TeamFactory, UserFactory
 from core.models import Team

 pytestmark = pytest.mark.django_db
@@ -29,25 +29,16 @@ def test_api_teams_create_anonymous():
    assert not Team.objects.exists()


-def test_api_teams_create_authenticated(settings):
+def test_api_teams_create_authenticated():
    """
    Authenticated users should be able to create teams and should automatically be declared
    as the owner of the newly created team.
    """
-    organization = OrganizationFactory(with_registration_id=True)
-    user = UserFactory(organization=organization)
+    user = UserFactory()

    client = APIClient()
    client.force_login(user)

-    settings.FEATURES = {
-        "TEAMS_DISPLAY": True,
-        "TEAMS_CREATE": True,
-        "CONTACTS_DISPLAY": False,
-        "CONTACTS_CREATE": False,
-        "MAILBOXES_CREATE": False,
-    }
-
    response = client.post(
        "/api/v1.0/teams/",
        {
@@ -59,64 +50,76 @@ def test_api_teams_create_authenticated(settings):
    assert response.status_code == HTTP_201_CREATED
    team = Team.objects.get()
    assert team.name == "my team"
-    assert team.organization == organization
    assert team.accesses.filter(role="owner", user=user).exists()


-def test_api_teams_create_authenticated_feature_disabled(settings):
+def test_api_teams_create_authenticated_slugify_name():
    """
-    Authenticated users should not be able to create teams when feature is disabled.
+    Creating teams should automatically generate a slug.
    """
-    organization = OrganizationFactory(with_registration_id=True)
-    user = UserFactory(organization=organization)
-
-    client = APIClient()
-    client.force_login(user)
-
-    settings.FEATURES = {
-        "TEAMS_DISPLAY": True,
-        "TEAMS_CREATE": False,
-        "CONTACTS_DISPLAY": False,
-        "CONTACTS_CREATE": False,
-        "MAILBOXES_CREATE": False,
-    }
-
-    response = client.post(
-        "/api/v1.0/teams/",
-        {
-            "name": "my team",
-        },
-        format="json",
-    )
-
-    assert response.status_code == HTTP_403_FORBIDDEN
-    assert not Team.objects.exists()
-
-
-def test_api_teams_create_cannot_override_organization():
-    """
-    Authenticated users should be able to create teams and not
-    be able to set the organization manually (for now).
-    """
-    organization = OrganizationFactory(with_registration_id=True)
-    user = UserFactory(organization=organization)
-
+    user = UserFactory()
    client = APIClient()
    client.force_login(user)

    response = client.post(
        "/api/v1.0/teams/",
-        {
-            "name": "my team",
-            "organization": OrganizationFactory(
-                with_registration_id=True
-            ).pk,  # ignored
-        },
-        format="json",
+        {"name": "my team"},
    )

    assert response.status_code == HTTP_201_CREATED
    team = Team.objects.get()
    assert team.name == "my team"
-    assert team.organization == organization
-    assert team.accesses.filter(role="owner", user=user).exists()
+    assert team.slug == "my-team"
+
+
+@pytest.mark.parametrize(
+    "param",
+    [
+        ("my team", "my-team"),
+        ("my     team", "my-team"),
+        ("MY TEAM TOO", "my-team-too"),
+        ("mon équipe", "mon-equipe"),
+        ("front devs & UX", "front-devs-ux"),
+    ],
+)
+def test_api_teams_create_authenticated_expected_slug(param):
+    """
+    Creating teams should automatically create unaccented, no unicode, lower-case slug.
+    """
+    user = UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/teams/",
+        {
+            "name": param[0],
+        },
+    )
+
+    assert response.status_code == HTTP_201_CREATED
+    team = Team.objects.get()
+    assert team.name == param[0]
+    assert team.slug == param[1]
+
+
+def test_api_teams_create_authenticated_unique_slugs():
+    """
+    Creating teams should raise an error if already existing slug.
+    """
+    TeamFactory(name="existing team")
+    user = UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    response = client.post(
+        "/api/v1.0/teams/",
+        {
+            "name": "èxisting team",
+        },
+    )
+
+    assert response.status_code == HTTP_400_BAD_REQUEST
+    assert response.json()["slug"] == ["Team with this Slug already exists."]
@@ -113,59 +113,3 @@ def test_api_teams_delete_authenticated_owner():

    assert response.status_code == HTTP_204_NO_CONTENT
    assert models.Team.objects.exists() is False
-
-
-@pytest.mark.parametrize(
-    "role",
-    ["owner", "administrator", "member"],
-)
-def test_api_teams_delete_authenticated_owner_parent_team(client, role):
-    """
-    Authenticated users should not be able to delete a parent team they
-    don't own.
-    """
-    user = factories.UserFactory()
-
-    client.force_login(user)
-
-    root_team = factories.TeamFactory(name="Root")
-    first_team = factories.TeamFactory(name="First", parent_id=root_team.pk)
-    second_team = factories.TeamFactory(name="Second", parent_id=first_team.pk)
-
-    # user is a member of the second team
-    factories.TeamAccessFactory(team=second_team, user=user, role=role)
-
-    response = client.delete(f"/api/v1.0/teams/{first_team.pk}/")
-
-    assert response.status_code == HTTP_403_FORBIDDEN
-    assert response.json() == {
-        "detail": "You do not have permission to perform this action."
-    }
-    assert models.Team.objects.count() == 3
-
-
-@pytest.mark.parametrize(
-    "role",
-    ["owner", "administrator", "member"],
-)
-def test_api_teams_delete_authenticated_owner_child_team(client, role):
-    """
-    Authenticated users should not be able to delete a children team they
-    don't own.
-    """
-    user = factories.UserFactory()
-
-    client.force_login(user)
-
-    root_team = factories.TeamFactory(name="Root")
-    first_team = factories.TeamFactory(name="First", parent_id=root_team.pk)
-    second_team = factories.TeamFactory(name="Second", parent_id=first_team.pk)
-
-    # user is a member of the first team
-    factories.TeamAccessFactory(team=first_team, user=user, role=role)
-
-    response = client.delete(f"/api/v1.0/teams/{second_team.pk}/")
-
-    assert response.status_code == HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
-    assert models.Team.objects.count() == 3
@@ -2,7 +2,10 @@
 Tests for Teams API endpoint in People's core app: list
 """

+from unittest import mock
+
 import pytest
+from rest_framework.pagination import PageNumberPagination
 from rest_framework.status import HTTP_200_OK, HTTP_401_UNAUTHORIZED
 from rest_framework.test import APIClient

@@ -44,13 +47,60 @@ def test_api_teams_list_authenticated():
    )

    assert response.status_code == HTTP_200_OK
-    results = response.json()
-
+    results = response.json()["results"]
    assert len(results) == 5
    results_id = {result["id"] for result in results}
    assert expected_ids == results_id


+@mock.patch.object(PageNumberPagination, "get_page_size", return_value=2)
+def test_api_teams_list_pagination(
+    _mock_page_size,
+):
+    """Pagination should work as expected."""
+    user = factories.UserFactory()
+
+    client = APIClient()
+    client.force_login(user)
+
+    team_ids = [
+        str(access.team.id)
+        for access in factories.TeamAccessFactory.create_batch(3, user=user)
+    ]
+
+    # Get page 1
+    response = client.get(
+        "/api/v1.0/teams/",
+    )
+
+    assert response.status_code == HTTP_200_OK
+    content = response.json()
+
+    assert content["count"] == 3
+    assert content["next"] == "http://testserver/api/v1.0/teams/?page=2"
+    assert content["previous"] is None
+
+    assert len(content["results"]) == 2
+    for item in content["results"]:
+        team_ids.remove(item["id"])
+
+    # Get page 2
+    response = client.get(
+        "/api/v1.0/teams/?page=2",
+    )
+
+    assert response.status_code == HTTP_200_OK
+    content = response.json()
+
+    assert content["count"] == 3
+    assert content["next"] is None
+    assert content["previous"] == "http://testserver/api/v1.0/teams/"
+
+    assert len(content["results"]) == 1
+    team_ids.remove(content["results"][0]["id"])
+    assert team_ids == []
+
+
 def test_api_teams_list_authenticated_distinct():
    """A team with several related users should only be listed once."""
    user = factories.UserFactory()
@@ -68,8 +118,8 @@ def test_api_teams_list_authenticated_distinct():

    assert response.status_code == HTTP_200_OK
    content = response.json()
-    assert len(content) == 1
-    assert content[0]["id"] == str(team.id)
+    assert len(content["results"]) == 1
+    assert content["results"][0]["id"] == str(team.id)


 def test_api_teams_order():
@@ -92,12 +142,12 @@ def test_api_teams_order():
    assert response.status_code == 200

    response_data = response.json()
-    response_team_ids = [team["id"] for team in response_data]
+    response_team_ids = [team["id"] for team in response_data["results"]]

    team_ids.reverse()
-    assert response_team_ids == team_ids, (
-        "created_at values are not sorted from newest to oldest"
-    )
+    assert (
+        response_team_ids == team_ids
+    ), "created_at values are not sorted from newest to oldest"


 def test_api_teams_order_param():
@@ -120,206 +170,9 @@ def test_api_teams_order_param():
    assert response.status_code == 200

    response_data = response.json()
-    response_team_ids = [team["id"] for team in response_data]

-    assert response_team_ids == team_ids, (
-        "created_at values are not sorted from oldest to newest"
-    )
+    response_team_ids = [team["id"] for team in response_data["results"]]

-
-@pytest.mark.parametrize(
-    "role,local_team_abilities",
-    [
-        (
-            "owner",
-            {
-                "delete": True,
-                "get": True,
-                "manage_accesses": True,
-                "patch": True,
-                "put": True,
-            },
-        ),
-        (
-            "administrator",
-            {
-                "delete": False,
-                "get": True,
-                "manage_accesses": True,
-                "patch": True,
-                "put": True,
-            },
-        ),
-        (
-            "member",
-            {
-                "delete": False,
-                "get": True,
-                "manage_accesses": False,
-                "patch": False,
-                "put": False,
-            },
-        ),
-    ],
-)
-def test_api_teams_list_authenticated_team_tree(client, role, local_team_abilities):
-    """
-    Authenticated users should be able to list teams
-    they are an owner/administrator/member of, or any parent teams.
-    """
-    user = factories.UserFactory()
-
-    client.force_login(user)
-
-    root_team = factories.TeamFactory(name="Root")
-    first_team = factories.TeamFactory(name="First", parent_id=root_team.pk)
-    second_team = factories.TeamFactory(name="Second", parent_id=first_team.pk)
-    third_team = factories.TeamFactory(name="Third", parent_id=second_team.pk)
-    _fourth_team = factories.TeamFactory(name="Fourth", parent_id=third_team.pk)
-
-    # user is a member of the second team
-    user_access = factories.TeamAccessFactory(team=second_team, user=user, role=role)
-
-    response = client.get("/api/v1.0/teams/")
-
-    assert response.status_code == HTTP_200_OK
-    # By default, the teams are sorted by 'created_at' descending
-    assert response.json() == [
-        {
-            # I have the abilities only on the team I have a specific role
-            "abilities": local_team_abilities,
-            "accesses": [str(user_access.pk)],
-            "created_at": second_team.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-            "depth": 3,
-            "id": str(second_team.pk),
-            "name": "Second",
-            "numchild": 1,
-            "path": second_team.path,
-            "service_providers": [],
-            "updated_at": second_team.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-        },
-        {
-            # For parent teams, I only have the ability to list/retrieve
-            "abilities": {
-                "delete": False,
-                "get": True,
-                "manage_accesses": False,
-                "patch": False,
-                "put": False,
-            },
-            "accesses": [],
-            "created_at": first_team.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-            "depth": 2,
-            "id": str(first_team.pk),
-            "name": "First",
-            "numchild": 1,
-            "path": first_team.path,
-            "service_providers": [],
-            "updated_at": first_team.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-        },
-        {
-            # For parent teams, I only have the ability to list/retrieve
-            "abilities": {
-                "delete": False,
-                "get": True,
-                "manage_accesses": False,
-                "patch": False,
-                "put": False,
-            },
-            "accesses": [],
-            "created_at": root_team.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-            "depth": 1,
-            "id": str(root_team.pk),
-            "name": "Root",
-            "numchild": 1,
-            "path": root_team.path,
-            "service_providers": [],
-            "updated_at": root_team.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-        },
-    ]
-
-
-@pytest.mark.parametrize(
-    "role,local_team_abilities",
-    [
-        (
-            "owner",
-            {
-                "delete": True,
-                "get": True,
-                "manage_accesses": True,
-                "patch": True,
-                "put": True,
-            },
-        ),
-        (
-            "administrator",
-            {
-                "delete": False,
-                "get": True,
-                "manage_accesses": True,
-                "patch": True,
-                "put": True,
-            },
-        ),
-        (
-            "member",
-            {
-                "delete": False,
-                "get": True,
-                "manage_accesses": False,
-                "patch": False,
-                "put": False,
-            },
-        ),
-    ],
-)
-def test_api_teams_list_authenticated_team_different_organization(
-    client, role, local_team_abilities
-):
-    """
-    Authenticated users should be able to list teams they
-    are an owner/administrator/member of and any parent teams
-    only if from the same organization.
-    """
-    organization = factories.OrganizationFactory(with_registration_id=True)
-    user = factories.UserFactory(organization=organization)
-
-    other_organization = factories.OrganizationFactory(with_registration_id=True)
-    root_team = factories.TeamFactory(name="Root", organization=other_organization)
-    first_team = factories.TeamFactory(
-        name="First", parent_id=root_team.pk, organization=other_organization
-    )
-    second_team = factories.TeamFactory(
-        name="Second", parent_id=first_team.pk, organization=other_organization
-    )
-    third_team = factories.TeamFactory(
-        name="Third", parent_id=second_team.pk, organization=other_organization
-    )
-    _fourth_team = factories.TeamFactory(
-        name="Fourth", parent_id=third_team.pk, organization=other_organization
-    )
-
-    client.force_login(user)
-
-    # user is a member of the second team
-    user_access = factories.TeamAccessFactory(team=second_team, user=user, role=role)
-
-    response = client.get("/api/v1.0/teams/")
-
-    assert response.status_code == HTTP_200_OK
-    assert response.json() == [
-        {
-            # I have the abilities only on the team I have a specific role
-            "abilities": local_team_abilities,
-            "accesses": [str(user_access.pk)],
-            "created_at": second_team.created_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-            "depth": 3,
-            "id": str(second_team.pk),
-            "name": "Second",
-            "numchild": 1,
-            "path": second_team.path,
-            "service_providers": [],
-            "updated_at": second_team.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
-        },
-    ]
+    assert (
+        response_team_ids == team_ids
+    ), "created_at values are not sorted from oldest to newest"
@@ -67,80 +67,10 @@ def test_api_teams_retrieve_authenticated_related():
        ]
    )
    assert response.json() == {
-        "abilities": team.get_abilities(user),
-        "created_at": team.created_at.isoformat().replace("+00:00", "Z"),
-        "depth": 1,
        "id": str(team.id),
        "name": team.name,
-        "numchild": 0,
-        "path": team.path,
-        "service_providers": [],
+        "slug": team.slug,
+        "abilities": team.get_abilities(user),
+        "created_at": team.created_at.isoformat().replace("+00:00", "Z"),
        "updated_at": team.updated_at.isoformat().replace("+00:00", "Z"),
    }
-
-
-@pytest.mark.parametrize(
-    "role",
-    ["owner", "administrator", "member"],
-)
-def test_api_teams_retrieve_authenticated_related_parent(client, role):
-    """
-    Authenticated users should be allowed to retrieve a parent team
-    to which they are related through the child team whatever the role.
-    """
-    user = factories.UserFactory()
-
-    client.force_login(user)
-
-    root_team = factories.TeamFactory(name="Root")
-    first_team = factories.TeamFactory(name="First", parent_id=root_team.pk)
-    second_team = factories.TeamFactory(name="Second", parent_id=first_team.pk)
-
-    # user is a member of the second team
-    factories.TeamAccessFactory(team=second_team, user=user, role=role)
-
-    response = client.get(f"/api/v1.0/teams/{first_team.pk!s}/")
-
-    # the abilities enforces the "get" via the queryset
-    abilities = first_team.get_abilities(user)
-    abilities["get"] = True
-
-    assert response.status_code == status.HTTP_200_OK
-    assert response.json() == {
-        "abilities": abilities,
-        "accesses": [],
-        "created_at": first_team.created_at.isoformat().replace("+00:00", "Z"),
-        "depth": 2,
-        "id": str(first_team.pk),
-        "name": first_team.name,
-        "numchild": 1,
-        "path": first_team.path,
-        "service_providers": [],
-        "updated_at": first_team.updated_at.isoformat().replace("+00:00", "Z"),
-    }
-
-
-@pytest.mark.parametrize(
-    "role",
-    ["owner", "administrator", "member"],
-)
-def test_api_teams_retrieve_authenticated_related_children(client, role):
-    """
-    Authenticated users should NOT be allowed to retrieve a child team
-    to which they are related through the parent team whatever the role.
-    """
-    user = factories.UserFactory()
-
-    client.force_login(user)
-
-    root_team = factories.TeamFactory(name="Root")
-    first_team = factories.TeamFactory(name="First", parent_id=root_team.pk)
-    second_team = factories.TeamFactory(name="Second", parent_id=first_team.pk)
-
-    # user is a member of the first team
-    factories.TeamAccessFactory(team=first_team, user=user, role=role)
-
-    response = client.get(f"/api/v1.0/teams/{second_team.pk!s}/")
-
-    assert response.status_code == status.HTTP_404_NOT_FOUND
-    assert response.json() == {"detail": "No Team matches the given query."}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Bossavit	38cfaff81f	Fix typo	2024-10-25 13:00:37 +02:00
Laurent Bossavit	80ac55b6e2	✨(ci) add docker layer caching	2024-10-24 16:32:13 +02:00
				`@@ -1 +0,0 @@`
				`"""People core resource server API endpoints"""`
				`@@ -1 +0,0 @@`
				`"""Tests for the resource server API endpoints."""`
				`@@ -1 +0,0 @@`
				`"""Tests for the resource server Team API endpoints."""`