From 1b1a89cc709dfd125f46b8eae51d136db25040e2 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 26 Dec 2023 14:38:07 +0100
Subject: [PATCH 1/5] Add a link to the producer space in the dropdown menu

---
 apps/shared/lib/helpers.ex                    |  9 ----
 .../dataset_now_on_nap_notification_job.ex    |  3 +-
 apps/transport/lib/transport_web.ex           |  1 +
 .../controllers/session_controller.ex         | 50 +++++++++++++------
 apps/transport/lib/transport_web/router.ex    |  9 ++--
 .../dataset/_dataset_scores_chart.html.heex   |  2 +-
 .../templates/dataset/details.html.heex       |  2 +-
 .../templates/dataset/index.html.heex         |  2 +-
 .../email/dataset_now_on_nap.html.md          |  2 +-
 .../email/producer_with_subscriptions.html.md |  2 +-
 .../producer_without_subscriptions.html.md    |  2 +-
 .../resource_unavailable_producer.html.md     |  2 +-
 .../templates/layout/_header.html.heex        |  7 ++-
 .../page/infos_producteurs.html.heex          |  2 +-
 .../lib/transport_web/views/email_view.ex     |  8 +++
 apps/transport/priv/gettext/default.pot       |  4 ++
 .../priv/gettext/en/LC_MESSAGES/default.po    |  4 ++
 .../priv/gettext/fr/LC_MESSAGES/default.po    |  4 ++
 apps/transport/test/support/conn_case.ex      |  9 +---
 ...taset_now_on_nap_notification_job_test.exs |  2 +-
 ...minder_producers_notification_job_test.exs |  2 +-
 ...urce_unavailable_notification_job_test.exs |  2 +-
 .../backoffice/backoffice_controller_test.exs | 12 ++---
 .../broken_urls_controller_test.exs           | 15 +-----
 .../controllers/page_controller_test.exs      | 31 ++++++++++--
 .../controllers/session_controller_test.exs   | 30 ++++++++---
 26 files changed, 136 insertions(+), 82 deletions(-)

diff --git a/apps/shared/lib/helpers.ex b/apps/shared/lib/helpers.ex
index fc224103e7..f1ba55eff4 100644
--- a/apps/shared/lib/helpers.ex
+++ b/apps/shared/lib/helpers.ex
@@ -57,13 +57,4 @@ defmodule Helpers do
       dates -> dates |> Enum.max(DateTime) |> DateTime.to_iso8601()
     end
   end
-
-  @spec admin?(map | nil) :: boolean
-  def admin?(%{} = user) do
-    user
-    |> Map.get("organizations", [])
-    |> Enum.any?(fn org -> org["slug"] == "equipe-transport-data-gouv-fr" end)
-  end
-
-  def admin?(nil), do: false
 end
diff --git a/apps/transport/lib/jobs/dataset_now_on_nap_notification_job.ex b/apps/transport/lib/jobs/dataset_now_on_nap_notification_job.ex
index c7b133f52f..67f57f5f0f 100644
--- a/apps/transport/lib/jobs/dataset_now_on_nap_notification_job.ex
+++ b/apps/transport/lib/jobs/dataset_now_on_nap_notification_job.ex
@@ -27,8 +27,7 @@ defmodule Transport.Jobs.DatasetNowOnNAPNotificationJob do
         Phoenix.View.render_to_string(TransportWeb.EmailView, "dataset_now_on_nap.html",
           dataset_url: TransportWeb.Router.Helpers.dataset_url(TransportWeb.Endpoint, :details, dataset.slug),
           dataset_custom_title: dataset.custom_title,
-          contact_email_address: Application.get_env(:transport, :contact_email),
-          espace_producteur_url: TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur)
+          contact_email_address: Application.get_env(:transport, :contact_email)
         )
       )
 
diff --git a/apps/transport/lib/transport_web.ex b/apps/transport/lib/transport_web.ex
index 5a7a64b74a..a263eb9efc 100644
--- a/apps/transport/lib/transport_web.ex
+++ b/apps/transport/lib/transport_web.ex
@@ -42,6 +42,7 @@ defmodule TransportWeb do
       use TransportWeb.InputHelpers
 
       import TransportWeb.Router.Helpers
+      import TransportWeb.Router, only: [is_transport_data_gouv_member?: 1]
       import TransportWeb.ErrorHelpers
       import TransportWeb.InputHelpers
       import TransportWeb.Gettext
diff --git a/apps/transport/lib/transport_web/controllers/session_controller.ex b/apps/transport/lib/transport_web/controllers/session_controller.ex
index 84a517089a..c13eb394ba 100644
--- a/apps/transport/lib/transport_web/controllers/session_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/session_controller.ex
@@ -4,6 +4,7 @@ defmodule TransportWeb.SessionController do
   """
   use TransportWeb, :controller
   alias Datagouvfr.Authentication
+  import Ecto.Query
   require Logger
 
   def new(conn, _) do
@@ -127,24 +128,45 @@ defmodule TransportWeb.SessionController do
   end
 
   def save_current_user(%Plug.Conn{} = conn, %{} = user_params) do
-    conn |> put_session(:current_user, user_params |> user_params_for_session())
+    conn |> put_session(:current_user, user_params_for_session(user_params))
+  end
+
+  def user_params_for_session(%{} = params) do
+    params
+    # Remove the list of `organizations` from the final map: it's already stored in the database
+    # and maintained up-to-date by `Transport.Jobs.UpdateContactsJob`
+    # and it can be too big to be stored in a cookie
+    |> Map.delete("organizations")
+    # - `is_admin` is needed to check permissions
+    # - `is_producer` is used to get access to the "Espace producteur"
+    |> Map.merge(%{"is_producer" => is_producer?(params), "is_admin" => is_admin?(params)})
   end
 
   @doc """
-  iex> pan_org = %{"slug" => "equipe-transport-data-gouv-fr", "name" => "PAN"}
-  iex> other_org = %{"slug" => "foo-inc", "name" => "Foo Inc"}
-  iex> user_params_for_session(%{"foo" => "bar", "organizations" => [pan_org, other_org]})
-  %{"foo" => "bar", "organizations" => [pan_org]}
+  Are you a data producer?
+  You're a data producer if you're a member of an organization with an active dataset
+  on transport.data.gouv.fr.
+  This is set when you log in, we can refresh this field more often in the future.
   """
-  def user_params_for_session(%{} = params) do
-    Map.put(
-      params,
-      "organizations",
-      Enum.filter(
-        params["organizations"],
-        &match?(%{"slug" => "equipe-transport-data-gouv-fr"}, &1)
-      )
-    )
+  def is_producer?(%{"organizations" => orgs}) do
+    org_ids = Enum.map(orgs, & &1["id"])
+
+    DB.Dataset.base_query() |> where([dataset: d], d.organization_id in ^org_ids) |> DB.Repo.exists?()
+  end
+
+  @doc """
+  Are you a transport.data.gouv.fr admin?
+  You're an admin if you're a member of the PAN organization on data.gouv.fr.
+
+  iex> is_admin?(%{"organizations" => [%{"slug" => "equipe-transport-data-gouv-fr"}, %{"slug" => "foo"}]})
+  true
+  iex> is_admin?(%{"organizations" => [%{"slug" => "foo"}]})
+  false
+  iex> is_admin?(%{"organizations" => []})
+  false
+  """
+  def is_admin?(%{"organizations" => orgs}) do
+    Enum.any?(orgs, &(&1["slug"] == "equipe-transport-data-gouv-fr"))
   end
 
   defp get_redirect_path(%Plug.Conn{} = conn) do
diff --git a/apps/transport/lib/transport_web/router.ex b/apps/transport/lib/transport_web/router.ex
index fb968c2c3c..6268012abe 100644
--- a/apps/transport/lib/transport_web/router.ex
+++ b/apps/transport/lib/transport_web/router.ex
@@ -314,6 +314,7 @@ defmodule TransportWeb.Router do
   end
 
   defp assign_current_user(conn, _) do
+    # `current_user` is set by TransportWeb.SessionController.user_params_for_session/1
     assign(conn, :current_user, get_session(conn, :current_user))
   end
 
@@ -353,11 +354,9 @@ defmodule TransportWeb.Router do
   end
 
   # NOTE: method visibility set to public because we need to call the same logic from LiveView
-  def is_transport_data_gouv_member?(current_user) do
-    current_user
-    |> Map.get("organizations", [])
-    |> Enum.any?(fn org -> org["slug"] == "equipe-transport-data-gouv-fr" end)
-  end
+  # `current_user` is set by TransportWeb.SessionController.user_params_for_session/1
+  def is_transport_data_gouv_member?(%{"is_admin" => true} = _current_user), do: true
+  def is_transport_data_gouv_member?(_), do: false
 
   # Check that a secret key is passed in the URL in the `export_key` query parameter
   defp check_export_secret_key(%Plug.Conn{params: params} = conn, _) do
diff --git a/apps/transport/lib/transport_web/templates/dataset/_dataset_scores_chart.html.heex b/apps/transport/lib/transport_web/templates/dataset/_dataset_scores_chart.html.heex
index ecd59d75fa..beae528280 100644
--- a/apps/transport/lib/transport_web/templates/dataset/_dataset_scores_chart.html.heex
+++ b/apps/transport/lib/transport_web/templates/dataset/_dataset_scores_chart.html.heex
@@ -1,4 +1,4 @@
-<section :if={admin?(@conn.assigns[:current_user])} class="pt-48">
+<section :if={is_transport_data_gouv_member?(@conn.assigns[:current_user])} class="pt-48">
   <h2><%= dgettext("page-dataset-details", "Dataset scores") %></h2>
   <div class="panel" id="scores-chart">
     <div id="vega-vis"></div>
diff --git a/apps/transport/lib/transport_web/templates/dataset/details.html.heex b/apps/transport/lib/transport_web/templates/dataset/details.html.heex
index b974b4e859..2aa60c82f8 100644
--- a/apps/transport/lib/transport_web/templates/dataset/details.html.heex
+++ b/apps/transport/lib/transport_web/templates/dataset/details.html.heex
@@ -16,7 +16,7 @@
   <h1>
     <%= @dataset.custom_title %>
   </h1>
-  <%= if admin?(assigns[:current_user]) do %>
+  <%= if is_transport_data_gouv_member?(assigns[:current_user]) do %>
     <i class="fa fa-external-link-alt"></i>
     <%= link("backoffice", to: backoffice_page_path(@conn, :edit, @dataset.id)) %>
     <%= render("_dataset_scores.html", dataset_scores: @dataset_scores, locale: locale) %>
diff --git a/apps/transport/lib/transport_web/templates/dataset/index.html.heex b/apps/transport/lib/transport_web/templates/dataset/index.html.heex
index b483ecb67c..110a4544bc 100644
--- a/apps/transport/lib/transport_web/templates/dataset/index.html.heex
+++ b/apps/transport/lib/transport_web/templates/dataset/index.html.heex
@@ -183,7 +183,7 @@
                         <a href={dataset_path(@conn, :details, dataset.slug)}>
                           <%= dataset.custom_title %>
                         </a>
-                        <%= if admin?(assigns[:current_user]) do %>
+                        <%= if is_transport_data_gouv_member?(assigns[:current_user]) do %>
                           <span class="dataset-backoffice-link">
                             <i class="fa fa-external-link-alt"></i>
                             <%= link("backoffice", to: backoffice_page_path(@conn, :edit, dataset.id)) %>
diff --git a/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md b/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md
index 2a317c8305..3df930b83a 100644
--- a/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md
+++ b/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md
@@ -2,7 +2,7 @@ Bonjour,
 
 Votre jeu de données [<%= @dataset_custom_title %>](<%= @dataset_url %>) a bien été référencé sur le Point d’Accès National aux données de transport, [transport.data.gouv.fr](https://transport.data.gouv.fr).
 
-Rendez-vous sur votre [Espace Producteur](<%= @espace_producteur_url %>) pour mettre à jour vos données ou vous inscrire à des notifications en cas de péremption, d’indisponibilité ou d’erreurs bloquantes sur votre jeu de données.
+Rendez-vous sur votre [Espace Producteur](<%= espace_producteur_url(:dataset_now_on_nap) %>) pour mettre à jour vos données ou vous inscrire à des notifications en cas de péremption, d’indisponibilité ou d’erreurs bloquantes sur votre jeu de données.
 
 Si vous avez des questions, n’hésitez pas à contacter notre équipe à l’adresse : <%= @contact_email_address %>.
 
diff --git a/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md b/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
index 7705861efd..780d8152fd 100644
--- a/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
+++ b/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
@@ -11,7 +11,7 @@ Vous êtes inscrit à des notifications concernant les jeux de données suivants
 </ul>
 <% end %>
 
-Les notifications vous permettent d’être alerté en cas d’expiration, d’indisponibilité et d’erreurs de vos données. Rendez-vous sur votre [Espace Producteur](<%= TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur) %>) pour les gérer de manière autonome.
+Les notifications vous permettent d’être alerté en cas d’expiration, d’indisponibilité et d’erreurs de vos données. Rendez-vous sur votre [Espace Producteur](<%= espace_producteur_url(:periodic_reminder_producer_with_subscriptions) %>) pour les gérer de manière autonome.
 
 <%= if @has_other_producers_subscribers do %>
 Les autres personnes inscrites à ces notifications sont : <%= @other_producers_subscribers %>.
diff --git a/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md b/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
index 8ab2bdc9d7..fed1ad1009 100644
--- a/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
+++ b/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
@@ -13,7 +13,7 @@ Le saviez-vous ? Il est possible de vous inscrire à des notifications concernan
 
 Les notifications vous permettent d’être alerté en cas d’expiration, d’indisponibilité et d’erreurs de vos données.
 
-Pour vous inscrire, rien de plus simple : rendez-vous sur votre [Espace Producteur](<%= TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur) %>) dans le menu “Recevoir des notifications”.
+Pour vous inscrire, rien de plus simple : rendez-vous sur votre [Espace Producteur](<%= espace_producteur_url(:periodic_reminder_producer_without_subscriptions) %>) dans le menu “Recevoir des notifications”.
 
 Nous restons disponibles pour vous accompagner si besoin.
 
diff --git a/apps/transport/lib/transport_web/templates/email/resource_unavailable_producer.html.md b/apps/transport/lib/transport_web/templates/email/resource_unavailable_producer.html.md
index a564e000ef..c987a79375 100644
--- a/apps/transport/lib/transport_web/templates/email/resource_unavailable_producer.html.md
+++ b/apps/transport/lib/transport_web/templates/email/resource_unavailable_producer.html.md
@@ -7,7 +7,7 @@ Il semble que vous ayez supprimé puis créé une nouvelle ressource : l’URL d
 
 Pour les prochaines mises à jour, afin de garantir une URL stable, nous vous invitons à remplacer votre ressource obsolète par la nouvelle.
 
-Pour cela, rendez-vous sur votre [Espace Producteur](<%= TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur) %>) à partir duquel vous pourrez procéder à ces mises à jour.
+Pour cela, rendez-vous sur votre [Espace Producteur](<%= espace_producteur_url(:resource_unavailable_producer) %>) à partir duquel vous pourrez procéder à ces mises à jour.
 
 Retrouvez la procédure pas à pas [sur notre documentation](https://doc.transport.data.gouv.fr/producteurs/mettre-a-jour-des-donnees).
 <% else %>
diff --git a/apps/transport/lib/transport_web/templates/layout/_header.html.heex b/apps/transport/lib/transport_web/templates/layout/_header.html.heex
index 2600d62e83..a3a641e65b 100644
--- a/apps/transport/lib/transport_web/templates/layout/_header.html.heex
+++ b/apps/transport/lib/transport_web/templates/layout/_header.html.heex
@@ -81,9 +81,14 @@
                   <% end %>
                 </div>
                 <div class="dropdown-content">
-                  <%= if admin?(assigns[:current_user]) do %>
+                  <%= if is_transport_data_gouv_member?(assigns[:current_user]) do %>
                     <%= link("Administration", to: "/backoffice") %>
                   <% end %>
+                  <%= if Map.get(assigns[:current_user], "is_producer", false) do %>
+                    <%= link(gettext("Producer space"),
+                      to: page_path(@conn, :espace_producteur, utm_source: "menu_dropdown")
+                    ) %>
+                  <% end %>
                   <a
                     class="navigation__link nagivation__link--logout"
                     href={session_path(@conn, :delete, redirect_path: current_path(@conn))}
diff --git a/apps/transport/lib/transport_web/templates/page/infos_producteurs.html.heex b/apps/transport/lib/transport_web/templates/page/infos_producteurs.html.heex
index 1e6f23f735..2f8cd9e8c2 100644
--- a/apps/transport/lib/transport_web/templates/page/infos_producteurs.html.heex
+++ b/apps/transport/lib/transport_web/templates/page/infos_producteurs.html.heex
@@ -9,7 +9,7 @@
       <%= if assigns[:current_user] do %>
         <div class="panel-producteurs signed-in">
           <h2><%= dgettext("page-producteurs", "Welcome!") %></h2>
-          <a class="button" href={page_path(@conn, :espace_producteur)}>
+          <a class="button" href={page_path(@conn, :espace_producteur, utm_source: "producer_infos_page")}>
             <%= dgettext("page-producteurs", "Access your producer section") %>
           </a>
           <div class="pt-24">
diff --git a/apps/transport/lib/transport_web/views/email_view.ex b/apps/transport/lib/transport_web/views/email_view.ex
index 85da06277c..39426f4a7e 100644
--- a/apps/transport/lib/transport_web/views/email_view.ex
+++ b/apps/transport/lib/transport_web/views/email_view.ex
@@ -15,4 +15,12 @@ defmodule TransportWeb.EmailView do
     url = TransportWeb.Router.Helpers.resource_url(TransportWeb.Endpoint, :details, id)
     link(title, to: url)
   end
+
+  def espace_producteur_url(view_name) do
+    TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur,
+      utm_source: "transactional_email",
+      utm_medium: "email",
+      utm_campaign: to_string(view_name)
+    )
+  end
 end
diff --git a/apps/transport/priv/gettext/default.pot b/apps/transport/priv/gettext/default.pot
index b71ebd4ec8..7a78b4f282 100644
--- a/apps/transport/priv/gettext/default.pot
+++ b/apps/transport/priv/gettext/default.pot
@@ -146,3 +146,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Compare two GTFS files"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "Producer space"
+msgstr ""
diff --git a/apps/transport/priv/gettext/en/LC_MESSAGES/default.po b/apps/transport/priv/gettext/en/LC_MESSAGES/default.po
index 1e0619571b..a67ff4d9ba 100644
--- a/apps/transport/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/transport/priv/gettext/en/LC_MESSAGES/default.po
@@ -146,3 +146,7 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "Compare two GTFS files"
 msgstr ""
+
+#, elixir-autogen, elixir-format
+msgid "Producer space"
+msgstr ""
diff --git a/apps/transport/priv/gettext/fr/LC_MESSAGES/default.po b/apps/transport/priv/gettext/fr/LC_MESSAGES/default.po
index ee44cbd2dd..8cddfcfdec 100644
--- a/apps/transport/priv/gettext/fr/LC_MESSAGES/default.po
+++ b/apps/transport/priv/gettext/fr/LC_MESSAGES/default.po
@@ -146,3 +146,7 @@ msgstr "Loi climat et résilience"
 #, elixir-autogen, elixir-format
 msgid "Compare two GTFS files"
 msgstr "Comparer deux GTFS"
+
+#, elixir-autogen, elixir-format
+msgid "Producer space"
+msgstr "Espace producteur"
diff --git a/apps/transport/test/support/conn_case.ex b/apps/transport/test/support/conn_case.ex
index e981b8ef39..9ecc1e6c73 100644
--- a/apps/transport/test/support/conn_case.ex
+++ b/apps/transport/test/support/conn_case.ex
@@ -38,12 +38,7 @@ defmodule TransportWeb.ConnCase do
     {:ok, conn: ConnTest.build_conn()}
   end
 
-  def setup_admin_in_session(conn) do
-    conn
-    |> init_test_session(%{
-      current_user: %{
-        "organizations" => [%{"slug" => "equipe-transport-data-gouv-fr"}]
-      }
-    })
+  def setup_admin_in_session(%Plug.Conn{} = conn) do
+    init_test_session(conn, %{current_user: %{"is_admin" => true}})
   end
 end
diff --git a/apps/transport/test/transport/jobs/dataset_now_on_nap_notification_job_test.exs b/apps/transport/test/transport/jobs/dataset_now_on_nap_notification_job_test.exs
index 91078413f3..b733bf7057 100644
--- a/apps/transport/test/transport/jobs/dataset_now_on_nap_notification_job_test.exs
+++ b/apps/transport/test/transport/jobs/dataset_now_on_nap_notification_job_test.exs
@@ -47,7 +47,7 @@ defmodule Transport.Test.Transport.Jobs.DatasetNowOnNAPNotificationJobTest do
                ~s(Votre jeu de données <a href="http://127.0.0.1:5100/datasets/#{dataset.slug}">Mon JDD</a> a bien été référencé)
 
       assert html_content =~
-               ~s(Rendez-vous sur votre <a href="http://127.0.0.1:5100/espace_producteur">Espace Producteur</a)
+               ~s(Rendez-vous sur votre <a href="http://127.0.0.1:5100/espace_producteur?utm_source=transactional_email&amp;utm_medium=email&amp;utm_campaign=dataset_now_on_nap">Espace Producteur</a)
 
       :ok
     end)
diff --git a/apps/transport/test/transport/jobs/periodic_reminder_producers_notification_job_test.exs b/apps/transport/test/transport/jobs/periodic_reminder_producers_notification_job_test.exs
index d4a94c381b..37567bf5f8 100644
--- a/apps/transport/test/transport/jobs/periodic_reminder_producers_notification_job_test.exs
+++ b/apps/transport/test/transport/jobs/periodic_reminder_producers_notification_job_test.exs
@@ -235,7 +235,7 @@ defmodule Transport.Test.Transport.Jobs.PeriodicReminderProducersNotificationJob
                ~s(Il est possible de vous inscrire à des notifications concernant le jeu de données que vous gérez sur transport.data.gouv.fr, <a href="http://127.0.0.1:5100/datasets/#{dataset.slug}">#{dataset.custom_title}</a>)
 
       assert html =~
-               ~s(Pour vous inscrire, rien de plus simple : rendez-vous sur votre <a href="http://127.0.0.1:5100/espace_producteur">Espace Producteur</a>)
+               ~s(Pour vous inscrire, rien de plus simple : rendez-vous sur votre <a href="http://127.0.0.1:5100/espace_producteur?utm_source=transactional_email&amp;utm_medium=email&amp;utm_campaign=periodic_reminder_producer_without_subscriptions">Espace Producteur</a>)
     end)
 
     assert :ok == perform_job(PeriodicReminderProducersNotificationJob, %{"contact_id" => contact.id})
diff --git a/apps/transport/test/transport/jobs/resource_unavailable_notification_job_test.exs b/apps/transport/test/transport/jobs/resource_unavailable_notification_job_test.exs
index 73809bc641..456a0d9362 100644
--- a/apps/transport/test/transport/jobs/resource_unavailable_notification_job_test.exs
+++ b/apps/transport/test/transport/jobs/resource_unavailable_notification_job_test.exs
@@ -151,7 +151,7 @@ defmodule Transport.Test.Transport.Jobs.ResourceUnavailableNotificationJobTest d
       assert html_part =~ "Il semble que vous ayez supprimé puis créé une nouvelle ressource"
 
       assert html_part =~
-               ~s(rendez-vous sur votre <a href="http://127.0.0.1:5100/espace_producteur">Espace Producteur</a> à partir duquel vous pourrez procéder à ces mises à jour)
+               ~s(rendez-vous sur votre <a href="http://127.0.0.1:5100/espace_producteur?utm_source=transactional_email&amp;utm_medium=email&amp;utm_campaign=resource_unavailable_producer">Espace Producteur</a> à partir duquel vous pourrez procéder à ces mises à jour)
 
       :ok
     end)
diff --git a/apps/transport/test/transport_web/controllers/backoffice/backoffice_controller_test.exs b/apps/transport/test/transport_web/controllers/backoffice/backoffice_controller_test.exs
index c5d3e9b2a3..66f99dce3a 100644
--- a/apps/transport/test/transport_web/controllers/backoffice/backoffice_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/backoffice/backoffice_controller_test.exs
@@ -50,10 +50,10 @@ defmodule TransportWeb.BackofficeControllerTest do
     assert get_flash(conn, :info) =~ "Vous devez être préalablement connecté"
   end
 
-  test "Check that you belong to the right organization", %{conn: conn} do
+  test "Check that you are an admin", %{conn: conn} do
     conn =
       conn
-      |> init_test_session(%{current_user: %{"organizations" => [%{"slug" => "pouet pouet"}]}})
+      |> init_test_session(%{current_user: %{"is_admin" => false}})
       |> get(backoffice_page_path(conn, :index))
 
     assert redirected_to(conn, 302) =~ "/login/explanation"
@@ -61,13 +61,7 @@ defmodule TransportWeb.BackofficeControllerTest do
   end
 
   test "Show 'add new dataset' form", %{conn: conn} do
-    conn =
-      conn
-      |> init_test_session(%{
-        current_user: %{"organizations" => [%{"slug" => "blurp"}, %{"slug" => "equipe-transport-data-gouv-fr"}]}
-      })
-      |> get(backoffice_page_path(conn, :index))
-
+    conn = conn |> setup_admin_in_session() |> get(backoffice_page_path(conn, :index))
     assert html_response(conn, 200) =~ "Ajouter un jeu de données"
   end
 
diff --git a/apps/transport/test/transport_web/controllers/backoffice/broken_urls_controller_test.exs b/apps/transport/test/transport_web/controllers/backoffice/broken_urls_controller_test.exs
index 6bc3bb07eb..0684e6ab65 100644
--- a/apps/transport/test/transport_web/controllers/backoffice/broken_urls_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/backoffice/broken_urls_controller_test.exs
@@ -1,6 +1,5 @@
 defmodule TransportWeb.Backoffice.BrokenUrlsControllerTest do
   use TransportWeb.ConnCase, async: true
-  import Plug.Test
   import DB.Factory
   alias TransportWeb.Backoffice.BrokenUrlsController
 
@@ -24,12 +23,7 @@ defmodule TransportWeb.Backoffice.BrokenUrlsControllerTest do
     dataset_history_2 = insert(:dataset_history, dataset_id: dataset.id)
     insert(:dataset_history_resources, dataset_history_id: dataset_history_2.id, payload: %{"download_url" => "url2"})
 
-    conn =
-      conn
-      |> init_test_session(%{
-        current_user: %{"organizations" => [%{"slug" => "equipe-transport-data-gouv-fr"}]}
-      })
-      |> get(backoffice_broken_urls_path(conn, :index))
+    conn = conn |> setup_admin_in_session() |> get(backoffice_broken_urls_path(conn, :index))
 
     res = conn |> html_response(200)
     assert res =~ "Détection de changements d'URLs stables"
@@ -85,12 +79,7 @@ defmodule TransportWeb.Backoffice.BrokenUrlsControllerTest do
     dataset_history_2 = insert(:dataset_history, dataset_id: dataset.id)
     insert(:dataset_history_resources, dataset_history_id: dataset_history_2.id, payload: %{"download_url" => "url1"})
 
-    conn =
-      conn
-      |> init_test_session(%{
-        current_user: %{"organizations" => [%{"slug" => "equipe-transport-data-gouv-fr"}]}
-      })
-      |> get(backoffice_broken_urls_path(conn, :index))
+    conn = conn |> setup_admin_in_session() |> get(backoffice_broken_urls_path(conn, :index))
 
     # check we get a 200 if list is empty
     res = conn |> html_response(200)
diff --git a/apps/transport/test/transport_web/controllers/page_controller_test.exs b/apps/transport/test/transport_web/controllers/page_controller_test.exs
index 5aad78009d..bd62911a35 100644
--- a/apps/transport/test/transport_web/controllers/page_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/page_controller_test.exs
@@ -45,20 +45,20 @@ defmodule TransportWeb.PageControllerTest do
     html = html_response(conn, 200)
     assert html =~ "disponible, valoriser et améliorer"
 
-    # # I have an explanation of what data.gouv.fr is
+    # I have an explanation of what data.gouv.fr is
     assert html =~ "plateforme ouverte des données publiques françaises"
 
-    # # I have an explanation of what the relationship is between data.gouv.fr and Transport
+    # I have an explanation of what the relationship is between data.gouv.fr and Transport
     assert html =~ "transport.data.gouv.fr est un site affilié à data.gouv.fr"
 
-    # # I have an explanation of what's going to happen and what I'm I supposed to do
+    # I have an explanation of what's going to happen and what I'm I supposed to do
     assert html =~ "créer un compte ou vous identifier avec votre compte data.gouv.fr"
     assert html =~ "autoriser transport.data.gouv.fr à utiliser votre compte data.gouv.fr"
 
-    # # I can click somewhere to start the log in / sign up process
+    # I can click somewhere to start the log in / sign up process
     assert html =~ "Se connecter"
 
-    # # I can click somewhere to ask for help
+    # I can click somewhere to ask for help
     assert html =~ "Nous contacter"
   end
 
@@ -183,4 +183,25 @@ defmodule TransportWeb.PageControllerTest do
     content = conn |> get(page_path(conn, :humans_txt)) |> text_response(200)
     assert content == "# Membres actuels\nFoo\n\n# Anciens membres\nBar\nBaz"
   end
+
+  test "menu has a link to producer space when the user is a producer", %{conn: conn} do
+    espace_producteur_path = page_path(conn, :espace_producteur, utm_source: "menu_dropdown")
+
+    has_menu_item? = fn %Plug.Conn{} = conn ->
+      conn
+      |> get(page_path(conn, :index))
+      |> html_response(200)
+      |> Floki.parse_document!()
+      |> Floki.find("nav .dropdown-content a")
+      |> Enum.any?(&(&1 == {"a", [{"href", espace_producteur_path}], ["Espace producteur"]}))
+    end
+
+    refute conn
+           |> init_test_session(current_user: %{"is_producer" => false})
+           |> has_menu_item?.()
+
+    assert conn
+           |> init_test_session(current_user: %{"is_producer" => true})
+           |> has_menu_item?.()
+  end
 end
diff --git a/apps/transport/test/transport_web/controllers/session_controller_test.exs b/apps/transport/test/transport_web/controllers/session_controller_test.exs
index 81486e7a2f..e17320c7da 100644
--- a/apps/transport/test/transport_web/controllers/session_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/session_controller_test.exs
@@ -38,12 +38,23 @@ defmodule TransportWeb.SessionControllerTest do
 
     assert [] == DB.Repo.all(DB.Contact)
     conn = conn |> get(session_path(conn, :create, %{"code" => "secret"}))
+
     current_user = get_session(conn, :current_user)
 
+    assert %{
+             "id" => ^datagouv_user_id,
+             "email" => ^email,
+             "first_name" => ^first_name,
+             "last_name" => ^last_name,
+             "is_admin" => true,
+             # No active dataset for this users' organizations
+             "is_producer" => false
+           } = current_user
+
+    refute Map.has_key?(current_user, "avatar")
+    refute Map.has_key?(current_user, "organizations")
+
     assert redirected_to(conn, 302) == "/"
-    assert Map.has_key?(current_user, "id") == true
-    assert Map.has_key?(current_user, "avatar") == false
-    assert [%{"slug" => ^organization_slug}] = current_user["organizations"]
 
     # A `DB.Contact` has been created for this user
     assert [
@@ -77,10 +88,17 @@ defmodule TransportWeb.SessionControllerTest do
   end
 
   test "save_current_user", %{conn: conn} do
-    pan_org = %{"slug" => "equipe-transport-data-gouv-fr", "name" => "PAN"}
-    user_params = %{"foo" => "bar", "organizations" => [%{"slug" => "foo"}, pan_org]}
+    pan_org = %{"slug" => "equipe-transport-data-gouv-fr", "name" => "PAN", "id" => org_id = Ecto.UUID.generate()}
+
+    assert is_admin?(%{"organizations" => [pan_org]})
+    refute is_producer?(%{"organizations" => [pan_org]})
+    insert(:dataset, organization_id: org_id)
+    # You're a producer if you're a member of an org with an active dataset
+    assert is_producer?(%{"organizations" => [pan_org]})
+
+    user_params = %{"foo" => "bar", "organizations" => [pan_org]}
 
-    assert %{"foo" => "bar", "organizations" => [pan_org]} ==
+    assert %{"foo" => "bar", "is_admin" => true, "is_producer" => true} ==
              conn |> init_test_session(%{}) |> save_current_user(user_params) |> get_session(:current_user)
   end
 

From 0afa9a4de2820d6ae8aedc46fb4fb3ce1850decd Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 26 Dec 2023 15:03:59 +0100
Subject: [PATCH 2/5] Refactor links in emails

---
 .../templates/email/dataset_now_on_nap.html.md    |  2 +-
 .../email/producer_with_subscriptions.html.md     |  2 +-
 .../email/producer_without_subscriptions.html.md  |  2 +-
 .../email/resource_unavailable_producer.html.md   |  2 +-
 .../lib/transport_web/views/email_view.ex         | 15 +++++++++------
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md b/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md
index 3df930b83a..b9dc325a5e 100644
--- a/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md
+++ b/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md
@@ -2,7 +2,7 @@ Bonjour,
 
 Votre jeu de données [<%= @dataset_custom_title %>](<%= @dataset_url %>) a bien été référencé sur le Point d’Accès National aux données de transport, [transport.data.gouv.fr](https://transport.data.gouv.fr).
 
-Rendez-vous sur votre [Espace Producteur](<%= espace_producteur_url(:dataset_now_on_nap) %>) pour mettre à jour vos données ou vous inscrire à des notifications en cas de péremption, d’indisponibilité ou d’erreurs bloquantes sur votre jeu de données.
+Rendez-vous sur votre <%= link_for_espace_producteur(:dataset_now_on_nap) %> pour mettre à jour vos données ou vous inscrire à des notifications en cas de péremption, d’indisponibilité ou d’erreurs bloquantes sur votre jeu de données.
 
 Si vous avez des questions, n’hésitez pas à contacter notre équipe à l’adresse : <%= @contact_email_address %>.
 
diff --git a/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md b/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
index 780d8152fd..5cca911d5e 100644
--- a/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
+++ b/apps/transport/lib/transport_web/templates/email/producer_with_subscriptions.html.md
@@ -11,7 +11,7 @@ Vous êtes inscrit à des notifications concernant les jeux de données suivants
 </ul>
 <% end %>
 
-Les notifications vous permettent d’être alerté en cas d’expiration, d’indisponibilité et d’erreurs de vos données. Rendez-vous sur votre [Espace Producteur](<%= espace_producteur_url(:periodic_reminder_producer_with_subscriptions) %>) pour les gérer de manière autonome.
+Les notifications vous permettent d’être alerté en cas d’expiration, d’indisponibilité et d’erreurs de vos données. Rendez-vous sur votre <%= link_for_espace_producteur(:periodic_reminder_producer_with_subscriptions) %> pour les gérer de manière autonome.
 
 <%= if @has_other_producers_subscribers do %>
 Les autres personnes inscrites à ces notifications sont : <%= @other_producers_subscribers %>.
diff --git a/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md b/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
index fed1ad1009..8218430aa6 100644
--- a/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
+++ b/apps/transport/lib/transport_web/templates/email/producer_without_subscriptions.html.md
@@ -13,7 +13,7 @@ Le saviez-vous ? Il est possible de vous inscrire à des notifications concernan
 
 Les notifications vous permettent d’être alerté en cas d’expiration, d’indisponibilité et d’erreurs de vos données.
 
-Pour vous inscrire, rien de plus simple : rendez-vous sur votre [Espace Producteur](<%= espace_producteur_url(:periodic_reminder_producer_without_subscriptions) %>) dans le menu “Recevoir des notifications”.
+Pour vous inscrire, rien de plus simple : rendez-vous sur votre <%= link_for_espace_producteur(:periodic_reminder_producer_without_subscriptions) %> dans le menu “Recevoir des notifications”.
 
 Nous restons disponibles pour vous accompagner si besoin.
 
diff --git a/apps/transport/lib/transport_web/templates/email/resource_unavailable_producer.html.md b/apps/transport/lib/transport_web/templates/email/resource_unavailable_producer.html.md
index c987a79375..8211f13122 100644
--- a/apps/transport/lib/transport_web/templates/email/resource_unavailable_producer.html.md
+++ b/apps/transport/lib/transport_web/templates/email/resource_unavailable_producer.html.md
@@ -7,7 +7,7 @@ Il semble que vous ayez supprimé puis créé une nouvelle ressource : l’URL d
 
 Pour les prochaines mises à jour, afin de garantir une URL stable, nous vous invitons à remplacer votre ressource obsolète par la nouvelle.
 
-Pour cela, rendez-vous sur votre [Espace Producteur](<%= espace_producteur_url(:resource_unavailable_producer) %>) à partir duquel vous pourrez procéder à ces mises à jour.
+Pour cela, rendez-vous sur votre <%= link_for_espace_producteur(:resource_unavailable_producer) %> à partir duquel vous pourrez procéder à ces mises à jour.
 
 Retrouvez la procédure pas à pas [sur notre documentation](https://doc.transport.data.gouv.fr/producteurs/mettre-a-jour-des-donnees).
 <% else %>
diff --git a/apps/transport/lib/transport_web/views/email_view.ex b/apps/transport/lib/transport_web/views/email_view.ex
index 39426f4a7e..384f6f237e 100644
--- a/apps/transport/lib/transport_web/views/email_view.ex
+++ b/apps/transport/lib/transport_web/views/email_view.ex
@@ -16,11 +16,14 @@ defmodule TransportWeb.EmailView do
     link(title, to: url)
   end
 
-  def espace_producteur_url(view_name) do
-    TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur,
-      utm_source: "transactional_email",
-      utm_medium: "email",
-      utm_campaign: to_string(view_name)
-    )
+  def link_for_espace_producteur(view_name) do
+    url =
+      TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur,
+        utm_source: "transactional_email",
+        utm_medium: "email",
+        utm_campaign: to_string(view_name)
+      )
+
+    link("Espace Producteur", to: url)
   end
 end

From b24229e1fd3f6d8c54215aa12f05e4d567d6ab32 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Wed, 27 Dec 2023 13:59:52 +0100
Subject: [PATCH 3/5] Refresh is_producer when visiting espace producteur

---
 .../lib/transport_web/controllers/page_controller.ex  | 11 ++++++++++-
 .../transport_web/controllers/session_controller.ex   |  1 +
 .../controllers/page_controller_test.exs              |  3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/transport/lib/transport_web/controllers/page_controller.ex b/apps/transport/lib/transport_web/controllers/page_controller.ex
index 7d2240185e..b538d20efa 100644
--- a/apps/transport/lib/transport_web/controllers/page_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/page_controller.ex
@@ -186,7 +186,16 @@ defmodule TransportWeb.PageController do
           {conn, []}
       end
 
-    conn |> assign(:datasets, datasets) |> render("espace_producteur.html")
+    conn
+    |> assign(:datasets, datasets)
+    |> refresh_is_producer(datasets)
+    |> render("espace_producteur.html")
+  end
+
+  defp refresh_is_producer(%Plug.Conn{} = conn, datasets) do
+    is_producer = not Enum.empty?(datasets)
+    current_user = get_session(conn, :current_user, %{})
+    conn |> put_session(:current_user, Map.put(current_user, "is_producer", is_producer))
   end
 
   defp aoms_with_dataset do
diff --git a/apps/transport/lib/transport_web/controllers/session_controller.ex b/apps/transport/lib/transport_web/controllers/session_controller.ex
index c13eb394ba..9ee7c0249a 100644
--- a/apps/transport/lib/transport_web/controllers/session_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/session_controller.ex
@@ -139,6 +139,7 @@ defmodule TransportWeb.SessionController do
     |> Map.delete("organizations")
     # - `is_admin` is needed to check permissions
     # - `is_producer` is used to get access to the "Espace producteur"
+    # `is_producer` is also refreshed when they visit their "Espace producteur"
     |> Map.merge(%{"is_producer" => is_producer?(params), "is_admin" => is_admin?(params)})
   end
 
diff --git a/apps/transport/test/transport_web/controllers/page_controller_test.exs b/apps/transport/test/transport_web/controllers/page_controller_test.exs
index d1f62cf034..2d4547b865 100644
--- a/apps/transport/test/transport_web/controllers/page_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/page_controller_test.exs
@@ -79,6 +79,9 @@ defmodule TransportWeb.PageControllerTest do
         |> init_test_session(current_user: %{})
         |> get(page_path(conn, :espace_producteur))
 
+      # `is_producer` attribute has been set for the current user
+      assert %{"is_producer" => true} = conn |> get_session(:current_user)
+
       {:ok, doc} = conn |> html_response(200) |> Floki.parse_document()
       assert Floki.find(doc, ".message--error") == []
 

From 5ebe45095e0d15c538b1573dd04e733a6d32c8f3 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Wed, 27 Dec 2023 14:00:47 +0100
Subject: [PATCH 4/5] Update comment

---
 .../lib/transport_web/controllers/session_controller.ex         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/transport/lib/transport_web/controllers/session_controller.ex b/apps/transport/lib/transport_web/controllers/session_controller.ex
index 9ee7c0249a..c04d0ef8e3 100644
--- a/apps/transport/lib/transport_web/controllers/session_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/session_controller.ex
@@ -147,7 +147,7 @@ defmodule TransportWeb.SessionController do
   Are you a data producer?
   You're a data producer if you're a member of an organization with an active dataset
   on transport.data.gouv.fr.
-  This is set when you log in, we can refresh this field more often in the future.
+  This is set when you log in and refreshed when you visit your "Espace producteur".
   """
   def is_producer?(%{"organizations" => orgs}) do
     org_ids = Enum.map(orgs, & &1["id"])

From bfff9d9ddb63324c7b161003dd4c58897ac607b4 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Mon, 8 Jan 2024 10:40:05 +0100
Subject: [PATCH 5/5] Add TransportWeb.Session

---
 apps/transport/lib/transport_web.ex           |  1 -
 .../controllers/page_controller.ex            |  8 +--
 .../controllers/session_controller.ex         | 42 ++----------
 .../live/backoffice/jobs_live.ex              |  5 +-
 .../live/backoffice/proxy_config_live.ex      | 23 +------
 apps/transport/lib/transport_web/router.ex    |  7 +-
 apps/transport/lib/transport_web/session.ex   | 67 +++++++++++++++++++
 .../dataset/_dataset_scores_chart.html.heex   |  2 +-
 .../templates/dataset/details.html.heex       |  2 +-
 .../templates/dataset/index.html.heex         |  2 +-
 .../templates/layout/_header.html.heex        |  4 +-
 .../controllers/session_controller_test.exs   |  6 +-
 .../test/transport_web/session_text.exs       | 42 ++++++++++++
 13 files changed, 130 insertions(+), 81 deletions(-)
 create mode 100644 apps/transport/lib/transport_web/session.ex
 create mode 100644 apps/transport/test/transport_web/session_text.exs

diff --git a/apps/transport/lib/transport_web.ex b/apps/transport/lib/transport_web.ex
index a263eb9efc..5a7a64b74a 100644
--- a/apps/transport/lib/transport_web.ex
+++ b/apps/transport/lib/transport_web.ex
@@ -42,7 +42,6 @@ defmodule TransportWeb do
       use TransportWeb.InputHelpers
 
       import TransportWeb.Router.Helpers
-      import TransportWeb.Router, only: [is_transport_data_gouv_member?: 1]
       import TransportWeb.ErrorHelpers
       import TransportWeb.InputHelpers
       import TransportWeb.Gettext
diff --git a/apps/transport/lib/transport_web/controllers/page_controller.ex b/apps/transport/lib/transport_web/controllers/page_controller.ex
index b538d20efa..7cf023916a 100644
--- a/apps/transport/lib/transport_web/controllers/page_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/page_controller.ex
@@ -188,16 +188,10 @@ defmodule TransportWeb.PageController do
 
     conn
     |> assign(:datasets, datasets)
-    |> refresh_is_producer(datasets)
+    |> TransportWeb.Session.set_is_producer(datasets)
     |> render("espace_producteur.html")
   end
 
-  defp refresh_is_producer(%Plug.Conn{} = conn, datasets) do
-    is_producer = not Enum.empty?(datasets)
-    current_user = get_session(conn, :current_user, %{})
-    conn |> put_session(:current_user, Map.put(current_user, "is_producer", is_producer))
-  end
-
   defp aoms_with_dataset do
     aoms_legal_owners =
       Dataset.base_query()
diff --git a/apps/transport/lib/transport_web/controllers/session_controller.ex b/apps/transport/lib/transport_web/controllers/session_controller.ex
index c04d0ef8e3..09338610da 100644
--- a/apps/transport/lib/transport_web/controllers/session_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/session_controller.ex
@@ -4,7 +4,6 @@ defmodule TransportWeb.SessionController do
   """
   use TransportWeb, :controller
   alias Datagouvfr.Authentication
-  import Ecto.Query
   require Logger
 
   def new(conn, _) do
@@ -128,46 +127,17 @@ defmodule TransportWeb.SessionController do
   end
 
   def save_current_user(%Plug.Conn{} = conn, %{} = user_params) do
-    conn |> put_session(:current_user, user_params_for_session(user_params))
+    conn
+    |> put_session(:current_user, user_params_for_session(user_params))
+    |> TransportWeb.Session.set_is_producer(user_params)
+    |> TransportWeb.Session.set_is_admin(user_params)
   end
 
-  def user_params_for_session(%{} = params) do
-    params
+  defp user_params_for_session(%{} = params) do
     # Remove the list of `organizations` from the final map: it's already stored in the database
     # and maintained up-to-date by `Transport.Jobs.UpdateContactsJob`
     # and it can be too big to be stored in a cookie
-    |> Map.delete("organizations")
-    # - `is_admin` is needed to check permissions
-    # - `is_producer` is used to get access to the "Espace producteur"
-    # `is_producer` is also refreshed when they visit their "Espace producteur"
-    |> Map.merge(%{"is_producer" => is_producer?(params), "is_admin" => is_admin?(params)})
-  end
-
-  @doc """
-  Are you a data producer?
-  You're a data producer if you're a member of an organization with an active dataset
-  on transport.data.gouv.fr.
-  This is set when you log in and refreshed when you visit your "Espace producteur".
-  """
-  def is_producer?(%{"organizations" => orgs}) do
-    org_ids = Enum.map(orgs, & &1["id"])
-
-    DB.Dataset.base_query() |> where([dataset: d], d.organization_id in ^org_ids) |> DB.Repo.exists?()
-  end
-
-  @doc """
-  Are you a transport.data.gouv.fr admin?
-  You're an admin if you're a member of the PAN organization on data.gouv.fr.
-
-  iex> is_admin?(%{"organizations" => [%{"slug" => "equipe-transport-data-gouv-fr"}, %{"slug" => "foo"}]})
-  true
-  iex> is_admin?(%{"organizations" => [%{"slug" => "foo"}]})
-  false
-  iex> is_admin?(%{"organizations" => []})
-  false
-  """
-  def is_admin?(%{"organizations" => orgs}) do
-    Enum.any?(orgs, &(&1["slug"] == "equipe-transport-data-gouv-fr"))
+    Map.delete(params, "organizations")
   end
 
   defp get_redirect_path(%Plug.Conn{} = conn) do
diff --git a/apps/transport/lib/transport_web/live/backoffice/jobs_live.ex b/apps/transport/lib/transport_web/live/backoffice/jobs_live.ex
index db0f7b4025..c8b2a46239 100644
--- a/apps/transport/lib/transport_web/live/backoffice/jobs_live.ex
+++ b/apps/transport/lib/transport_web/live/backoffice/jobs_live.ex
@@ -33,9 +33,10 @@ defmodule TransportWeb.Backoffice.JobsLive do
   # https://hexdocs.pm/phoenix_live_view/security-model.html#disconnecting-all-instances-of-a-given-live-user
   #
   def ensure_admin_auth_or_redirect(socket, current_user, func) do
-    if current_user && TransportWeb.Router.is_transport_data_gouv_member?(current_user) do
+    socket = assign(socket, current_user: current_user)
+
+    if TransportWeb.Session.is_admin?(socket) do
       # We track down the current admin so that it can be used by next actions
-      socket = assign(socket, current_admin_user: current_user)
       # Then call the remaining code, which is expected to return the socket
       func.(socket)
     else
diff --git a/apps/transport/lib/transport_web/live/backoffice/proxy_config_live.ex b/apps/transport/lib/transport_web/live/backoffice/proxy_config_live.ex
index 23bcffdaa1..587988f655 100644
--- a/apps/transport/lib/transport_web/live/backoffice/proxy_config_live.ex
+++ b/apps/transport/lib/transport_web/live/backoffice/proxy_config_live.ex
@@ -4,6 +4,7 @@ defmodule TransportWeb.Backoffice.ProxyConfigLive do
   """
   use Phoenix.LiveView
   alias Transport.Telemetry
+  import TransportWeb.Backoffice.JobsLive, only: [ensure_admin_auth_or_redirect: 3]
   import TransportWeb.Router.Helpers
 
   # The number of past days we want to report on (as a positive integer).
@@ -20,25 +21,6 @@ defmodule TransportWeb.Backoffice.ProxyConfigLive do
      end)}
   end
 
-  #
-  # If one calls "redirect" and does not leave immediately, the remaining code will
-  # be executed, opening security issues. This method goal is to minimize this risk.
-  # See https://hexdocs.pm/phoenix_live_view/security-model.html for overall docs.
-  #
-  # Also, disconnect will have to be handled:
-  # https://hexdocs.pm/phoenix_live_view/security-model.html#disconnecting-all-instances-of-a-given-live-user
-  #
-  defp ensure_admin_auth_or_redirect(socket, current_user, func) do
-    if current_user && TransportWeb.Router.is_transport_data_gouv_member?(current_user) do
-      # We track down the current admin so that it can be used by next actions
-      socket = assign(socket, current_admin_user: current_user)
-      # Then call the remaining code, which is expected to return the socket
-      func.(socket)
-    else
-      redirect(socket, to: "/login")
-    end
-  end
-
   defp schedule_next_update_data do
     Process.send_after(self(), :update_data, 1000)
   end
@@ -57,8 +39,7 @@ defmodule TransportWeb.Backoffice.ProxyConfigLive do
   end
 
   def handle_event("refresh_proxy_config", _value, socket) do
-    if socket.assigns.current_admin_user, do: config_module().clear_config_cache!()
-
+    config_module().clear_config_cache!()
     {:noreply, socket}
   end
 
diff --git a/apps/transport/lib/transport_web/router.ex b/apps/transport/lib/transport_web/router.ex
index 6268012abe..b9a0025a0f 100644
--- a/apps/transport/lib/transport_web/router.ex
+++ b/apps/transport/lib/transport_web/router.ex
@@ -353,11 +353,6 @@ defmodule TransportWeb.Router do
     end
   end
 
-  # NOTE: method visibility set to public because we need to call the same logic from LiveView
-  # `current_user` is set by TransportWeb.SessionController.user_params_for_session/1
-  def is_transport_data_gouv_member?(%{"is_admin" => true} = _current_user), do: true
-  def is_transport_data_gouv_member?(_), do: false
-
   # Check that a secret key is passed in the URL in the `export_key` query parameter
   defp check_export_secret_key(%Plug.Conn{params: params} = conn, _) do
     export_key_value = Map.get(params, "export_key", "")
@@ -374,7 +369,7 @@ defmodule TransportWeb.Router do
   end
 
   defp transport_data_gouv_member(%Plug.Conn{} = conn, _) do
-    if is_transport_data_gouv_member?(conn.assigns[:current_user]) do
+    if TransportWeb.Session.is_admin?(conn) do
       conn
     else
       conn
diff --git a/apps/transport/lib/transport_web/session.ex b/apps/transport/lib/transport_web/session.ex
new file mode 100644
index 0000000000..e3e8fca929
--- /dev/null
+++ b/apps/transport/lib/transport_web/session.ex
@@ -0,0 +1,67 @@
+defmodule TransportWeb.Session do
+  @moduledoc """
+  Web session getters and setters.
+  """
+  import Ecto.Query
+  import Plug.Conn
+
+  @is_admin_key_name "is_admin"
+  @is_producer_key_name "is_producer"
+
+  @doc """
+  Are you a data producer?
+
+  You're a data producer if you're a member of an organization with an active dataset
+  on transport.data.gouv.fr.
+  This is set when you log in and refreshed when you visit your "Espace producteur".
+  """
+  @spec set_is_producer(Plug.Conn.t(), map() | [DB.Dataset.t()]) :: Plug.Conn.t()
+  def set_is_producer(%Plug.Conn{} = conn, %{"organizations" => _} = params) do
+    set_session_attribute_attribute(conn, @is_producer_key_name, is_producer?(params))
+  end
+
+  def set_is_producer(%Plug.Conn{} = conn, [%DB.Dataset{}] = _datasets_for_user) do
+    set_session_attribute_attribute(conn, @is_producer_key_name, true)
+  end
+
+  def set_is_producer(%Plug.Conn{} = conn, [] = _datasets_for_user) do
+    set_session_attribute_attribute(conn, @is_producer_key_name, false)
+  end
+
+  @doc """
+  Are you a transport.data.gouv.fr admin?
+  You're an admin if you're a member of the PAN organization on data.gouv.fr.
+  """
+  def set_is_admin(%Plug.Conn{} = conn, %{"organizations" => _} = params) do
+    set_session_attribute_attribute(conn, @is_admin_key_name, is_admin?(params))
+  end
+
+  def is_admin?(%{"organizations" => orgs}) do
+    Enum.any?(orgs, &(&1["slug"] == "equipe-transport-data-gouv-fr"))
+  end
+
+  def is_admin?(%Plug.Conn{} = conn) do
+    conn |> current_user() |> Map.get(@is_admin_key_name, false)
+  end
+
+  def is_admin?(%Phoenix.LiveView.Socket{assigns: %{current_user: current_user}}) do
+    Map.get(current_user, @is_admin_key_name, false)
+  end
+
+  def is_producer?(%Plug.Conn{} = conn) do
+    conn |> current_user() |> Map.get(@is_producer_key_name, false)
+  end
+
+  def is_producer?(%{"organizations" => orgs}) do
+    org_ids = Enum.map(orgs, & &1["id"])
+    DB.Dataset.base_query() |> where([dataset: d], d.organization_id in ^org_ids) |> DB.Repo.exists?()
+  end
+
+  @spec set_session_attribute_attribute(Plug.Conn.t(), binary(), boolean()) :: Plug.Conn.t()
+  defp set_session_attribute_attribute(%Plug.Conn{} = conn, key, value) do
+    current_user = current_user(conn)
+    conn |> put_session(:current_user, Map.put(current_user, key, value))
+  end
+
+  defp current_user(%Plug.Conn{} = conn), do: get_session(conn, :current_user, %{})
+end
diff --git a/apps/transport/lib/transport_web/templates/dataset/_dataset_scores_chart.html.heex b/apps/transport/lib/transport_web/templates/dataset/_dataset_scores_chart.html.heex
index beae528280..1818a4a7f3 100644
--- a/apps/transport/lib/transport_web/templates/dataset/_dataset_scores_chart.html.heex
+++ b/apps/transport/lib/transport_web/templates/dataset/_dataset_scores_chart.html.heex
@@ -1,4 +1,4 @@
-<section :if={is_transport_data_gouv_member?(@conn.assigns[:current_user])} class="pt-48">
+<section :if={TransportWeb.Session.is_admin?(@conn)} class="pt-48">
   <h2><%= dgettext("page-dataset-details", "Dataset scores") %></h2>
   <div class="panel" id="scores-chart">
     <div id="vega-vis"></div>
diff --git a/apps/transport/lib/transport_web/templates/dataset/details.html.heex b/apps/transport/lib/transport_web/templates/dataset/details.html.heex
index 2aa60c82f8..60304c0b54 100644
--- a/apps/transport/lib/transport_web/templates/dataset/details.html.heex
+++ b/apps/transport/lib/transport_web/templates/dataset/details.html.heex
@@ -16,7 +16,7 @@
   <h1>
     <%= @dataset.custom_title %>
   </h1>
-  <%= if is_transport_data_gouv_member?(assigns[:current_user]) do %>
+  <%= if TransportWeb.Session.is_admin?(@conn) do %>
     <i class="fa fa-external-link-alt"></i>
     <%= link("backoffice", to: backoffice_page_path(@conn, :edit, @dataset.id)) %>
     <%= render("_dataset_scores.html", dataset_scores: @dataset_scores, locale: locale) %>
diff --git a/apps/transport/lib/transport_web/templates/dataset/index.html.heex b/apps/transport/lib/transport_web/templates/dataset/index.html.heex
index 110a4544bc..ac240d3be1 100644
--- a/apps/transport/lib/transport_web/templates/dataset/index.html.heex
+++ b/apps/transport/lib/transport_web/templates/dataset/index.html.heex
@@ -183,7 +183,7 @@
                         <a href={dataset_path(@conn, :details, dataset.slug)}>
                           <%= dataset.custom_title %>
                         </a>
-                        <%= if is_transport_data_gouv_member?(assigns[:current_user]) do %>
+                        <%= if TransportWeb.Session.is_admin?(@conn) do %>
                           <span class="dataset-backoffice-link">
                             <i class="fa fa-external-link-alt"></i>
                             <%= link("backoffice", to: backoffice_page_path(@conn, :edit, dataset.id)) %>
diff --git a/apps/transport/lib/transport_web/templates/layout/_header.html.heex b/apps/transport/lib/transport_web/templates/layout/_header.html.heex
index a3a641e65b..7b1f6e1071 100644
--- a/apps/transport/lib/transport_web/templates/layout/_header.html.heex
+++ b/apps/transport/lib/transport_web/templates/layout/_header.html.heex
@@ -81,10 +81,10 @@
                   <% end %>
                 </div>
                 <div class="dropdown-content">
-                  <%= if is_transport_data_gouv_member?(assigns[:current_user]) do %>
+                  <%= if TransportWeb.Session.is_admin?(@conn) do %>
                     <%= link("Administration", to: "/backoffice") %>
                   <% end %>
-                  <%= if Map.get(assigns[:current_user], "is_producer", false) do %>
+                  <%= if TransportWeb.Session.is_producer?(@conn) do %>
                     <%= link(gettext("Producer space"),
                       to: page_path(@conn, :espace_producteur, utm_source: "menu_dropdown")
                     ) %>
diff --git a/apps/transport/test/transport_web/controllers/session_controller_test.exs b/apps/transport/test/transport_web/controllers/session_controller_test.exs
index e17320c7da..4df85a9ff3 100644
--- a/apps/transport/test/transport_web/controllers/session_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/session_controller_test.exs
@@ -90,11 +90,11 @@ defmodule TransportWeb.SessionControllerTest do
   test "save_current_user", %{conn: conn} do
     pan_org = %{"slug" => "equipe-transport-data-gouv-fr", "name" => "PAN", "id" => org_id = Ecto.UUID.generate()}
 
-    assert is_admin?(%{"organizations" => [pan_org]})
-    refute is_producer?(%{"organizations" => [pan_org]})
+    assert TransportWeb.Session.is_admin?(%{"organizations" => [pan_org]})
+    refute TransportWeb.Session.is_producer?(%{"organizations" => [pan_org]})
     insert(:dataset, organization_id: org_id)
     # You're a producer if you're a member of an org with an active dataset
-    assert is_producer?(%{"organizations" => [pan_org]})
+    assert TransportWeb.Session.is_producer?(%{"organizations" => [pan_org]})
 
     user_params = %{"foo" => "bar", "organizations" => [pan_org]}
 
diff --git a/apps/transport/test/transport_web/session_text.exs b/apps/transport/test/transport_web/session_text.exs
new file mode 100644
index 0000000000..ebaeb26085
--- /dev/null
+++ b/apps/transport/test/transport_web/session_text.exs
@@ -0,0 +1,42 @@
+defmodule TransportWeb.SessionTest do
+  use ExUnit.Case, async: true
+  import DB.Factory
+  import TransportWeb.Session
+  doctest TransportWeb.Session, import: true
+
+  @pan_org_id Ecto.UUID.generate()
+
+  setup do
+    :ok = Ecto.Adapters.SQL.Sandbox.checkout(DB.Repo)
+  end
+
+  test "is_producer?" do
+    refute is_producer?(%{"organizations" => [pan_org()]})
+    insert(:dataset, organization_id: @pan_org_id)
+    # You're a producer if you're a member of an org with an active dataset
+    assert is_producer?(%{"organizations" => [pan_org()]})
+  end
+
+  test "is_admin?" do
+    refute is_admin?(%{"organizations" => []})
+    refute is_admin?(%{"organizations" => [%{"slug" => "foo"}]})
+    assert is_admin?(%{"organizations" => [pan_org()]})
+  end
+
+  describe "reader" do
+    test "is_admin?" do
+      refute is_admin?(Plug.Test.init_test_session(%Plug.Conn{}, %{}))
+      assert is_admin?(Plug.Test.init_test_session(%Plug.Conn{}, %{current_user: %{"is_admin" => true}}))
+      assert is_admin?(%{"is_admin" => true})
+    end
+
+    test "is_producer?" do
+      assert is_producer?(Plug.Test.init_test_session(%Plug.Conn{}, %{current_user: %{"is_producer" => true}}))
+      refute is_producer?(Plug.Test.init_test_session(%Plug.Conn{}, %{}))
+    end
+  end
+
+  def pan_org do
+    %{"slug" => "equipe-transport-data-gouv-fr", "name" => "PAN", "id" => @pan_org_id}
+  end
+end