From dbc0022536c7b18e9e09de685c384c0041b88141 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Mon, 8 Jan 2024 23:51:34 +0100
Subject: [PATCH 1/4] =?UTF-8?q?UpdateContactsJob=20:=20g=C3=A8re=20cas=20o?=
 =?UTF-8?q?=C3=B9=20user=20datagouv=20a=20=C3=A9t=C3=A9=20supprim=C3=A9=20?=
 =?UTF-8?q?(#3694)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* UpdateContactsJob : gère cas où user datagouv a été supprimé

* Test also for organizations
---
 .../transport/lib/jobs/update_contacts_job.ex | 23 ++++++++++++++-----
 .../jobs/update_contacts_job_test.exs         | 22 ++++++++++++++++++
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/apps/transport/lib/jobs/update_contacts_job.ex b/apps/transport/lib/jobs/update_contacts_job.ex
index 0202cc4e6a..9a2c8513f0 100644
--- a/apps/transport/lib/jobs/update_contacts_job.ex
+++ b/apps/transport/lib/jobs/update_contacts_job.ex
@@ -25,12 +25,23 @@ defmodule Transport.Jobs.UpdateContactsJob do
     DB.Contact.base_query()
     |> where([contact: c], c.datagouv_user_id in ^ids)
     |> DB.Repo.all()
-    |> Enum.each(fn %DB.Contact{datagouv_user_id: datagouv_user_id} = contact ->
-      {:ok, %{"organizations" => organizations}} = Datagouvfr.Client.User.get(datagouv_user_id)
+    |> Enum.each(&update_contact/1)
+  end
+
+  defp update_contact(%DB.Contact{datagouv_user_id: datagouv_user_id} = contact) do
+    # https://doc.data.gouv.fr/api/reference/#/users/get_user
+    # 404 status code: User not found
+    # 410 status code: User is not active or has been deleted
+    case Datagouvfr.Client.User.get(datagouv_user_id) do
+      {:ok, %{"organizations" => organizations}} ->
+        contact
+        |> DB.Contact.changeset(%{organizations: organizations})
+        |> DB.Repo.update!()
 
-      contact
-      |> DB.Contact.changeset(%{organizations: organizations})
-      |> DB.Repo.update!()
-    end)
+      {:error, reason} when reason in [:not_found, :gone] ->
+        contact
+        |> DB.Contact.changeset(%{organizations: [], datagouv_user_id: nil})
+        |> DB.Repo.update!()
+    end
   end
 end
diff --git a/apps/transport/test/transport/jobs/update_contacts_job_test.exs b/apps/transport/test/transport/jobs/update_contacts_job_test.exs
index bf0c748b12..9a4ea6a894 100644
--- a/apps/transport/test/transport/jobs/update_contacts_job_test.exs
+++ b/apps/transport/test/transport/jobs/update_contacts_job_test.exs
@@ -53,4 +53,26 @@ defmodule Transport.Test.Transport.Jobs.UpdateContactsJobTest do
     assert [%DB.Organization{name: ^org_name, id: ^org_id}] = contact.organizations
     assert %DB.Contact{organization: ^org_name} = contact
   end
+
+  test "removes datagouv_user_id and organizations when API responds with 404 or 410" do
+    Enum.each([404, 410], fn status_code ->
+      contact =
+        insert_contact(%{
+          datagouv_user_id: user_id = Ecto.UUID.generate(),
+          organizations: [:organization |> build() |> Map.from_struct()]
+        })
+
+      url = "https://demo.data.gouv.fr/api/1/users/#{user_id}/"
+
+      Transport.HTTPoison.Mock
+      |> expect(:request, fn :get, ^url, "", [], [follow_redirect: true] ->
+        {:ok, %HTTPoison.Response{status_code: status_code, body: ""}}
+      end)
+
+      assert :ok == perform_job(UpdateContactsJob, %{contact_ids: [user_id]})
+
+      assert %DB.Contact{datagouv_user_id: nil, organizations: []} =
+               contact |> DB.Repo.reload!() |> DB.Repo.preload([:organizations])
+    end)
+  end
 end

From 1d3f4d4f245fc7b9ff792de3938c4ae58a5b4a2f Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 9 Jan 2024 08:43:09 +0100
Subject: [PATCH 2/4] Ajoute un lien vers l'Espace Producteur dans le menu
 quand pertinent (#3684)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add a link to the producer space in the dropdown menu

* Refactor links in emails

* Refresh is_producer when visiting espace producteur

* Update comment

* Add TransportWeb.Session

---------

Co-authored-by: Thibaut Barrère <thibaut.barrere@gmail.com>
---
 apps/shared/lib/helpers.ex                    |  9 ---
 .../dataset_now_on_nap_notification_job.ex    |  3 +-
 .../controllers/page_controller.ex            |  5 +-
 .../controllers/session_controller.ex         | 25 +++----
 .../live/backoffice/jobs_live.ex              |  5 +-
 .../live/backoffice/proxy_config_live.ex      | 23 +------
 apps/transport/lib/transport_web/router.ex    | 10 +--
 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 +-
 .../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     | 11 +++
 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      | 34 ++++++++--
 .../controllers/session_controller_test.exs   | 30 +++++++--
 .../test/transport_web/session_text.exs       | 42 ++++++++++++
 30 files changed, 230 insertions(+), 111 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/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/controllers/page_controller.ex b/apps/transport/lib/transport_web/controllers/page_controller.ex
index 7d2240185e..7cf023916a 100644
--- a/apps/transport/lib/transport_web/controllers/page_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/page_controller.ex
@@ -186,7 +186,10 @@ defmodule TransportWeb.PageController do
           {conn, []}
       end
 
-    conn |> assign(:datasets, datasets) |> render("espace_producteur.html")
+    conn
+    |> assign(:datasets, datasets)
+    |> TransportWeb.Session.set_is_producer(datasets)
+    |> render("espace_producteur.html")
   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 84a517089a..09338610da 100644
--- a/apps/transport/lib/transport_web/controllers/session_controller.ex
+++ b/apps/transport/lib/transport_web/controllers/session_controller.ex
@@ -127,24 +127,17 @@ 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))
+    |> TransportWeb.Session.set_is_producer(user_params)
+    |> TransportWeb.Session.set_is_admin(user_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]}
-  """
-  def user_params_for_session(%{} = params) do
-    Map.put(
-      params,
-      "organizations",
-      Enum.filter(
-        params["organizations"],
-        &match?(%{"slug" => "equipe-transport-data-gouv-fr"}, &1)
-      )
-    )
+  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(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 fb968c2c3c..b9a0025a0f 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
 
@@ -352,13 +353,6 @@ defmodule TransportWeb.Router do
     end
   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
-
   # 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", "")
@@ -375,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 ecd59d75fa..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={admin?(@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 b974b4e859..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 admin?(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 b483ecb67c..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 admin?(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/email/dataset_now_on_nap.html.md b/apps/transport/lib/transport_web/templates/email/dataset_now_on_nap.html.md
index 2a317c8305..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 %>) 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 7705861efd..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](<%= 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 <%= 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 8ab2bdc9d7..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](<%= 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 <%= 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 a564e000ef..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](<%= TransportWeb.Router.Helpers.page_url(TransportWeb.Endpoint, :espace_producteur) %>) à 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/templates/layout/_header.html.heex b/apps/transport/lib/transport_web/templates/layout/_header.html.heex
index 2600d62e83..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,9 +81,14 @@
                   <% end %>
                 </div>
                 <div class="dropdown-content">
-                  <%= if admin?(assigns[:current_user]) do %>
+                  <%= if TransportWeb.Session.is_admin?(@conn) do %>
                     <%= link("Administration", to: "/backoffice") %>
                   <% end %>
+                  <%= if TransportWeb.Session.is_producer?(@conn) 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..384f6f237e 100644
--- a/apps/transport/lib/transport_web/views/email_view.ex
+++ b/apps/transport/lib/transport_web/views/email_view.ex
@@ -15,4 +15,15 @@ defmodule TransportWeb.EmailView do
     url = TransportWeb.Router.Helpers.resource_url(TransportWeb.Endpoint, :details, id)
     link(title, to: url)
   end
+
+  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
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 e84087f6a0..985a5c9481 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 bf8f90bd06..2d4547b865 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
 
@@ -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") == []
 
@@ -183,4 +186,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..4df85a9ff3 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 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 TransportWeb.Session.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
 
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

From 8cdbb59ef8e2971d5ddd5b1a70da3b2174207e15 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 9 Jan 2024 09:22:52 +0100
Subject: [PATCH 3/4] TransportWeb.Session : corrige erreur pattern matching
 (#3708)

---
 apps/transport/lib/transport_web/session.ex   |  9 +++------
 .../{session_text.exs => session_test.exs}    | 20 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 7 deletions(-)
 rename apps/transport/test/transport_web/{session_text.exs => session_test.exs} (65%)

diff --git a/apps/transport/lib/transport_web/session.ex b/apps/transport/lib/transport_web/session.ex
index e3e8fca929..9408470f66 100644
--- a/apps/transport/lib/transport_web/session.ex
+++ b/apps/transport/lib/transport_web/session.ex
@@ -20,12 +20,9 @@ defmodule TransportWeb.Session 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)
+  def set_is_producer(%Plug.Conn{} = conn, datasets_for_user) when is_list(datasets_for_user) do
+    is_producer = not Enum.empty?(datasets_for_user)
+    set_session_attribute_attribute(conn, @is_producer_key_name, is_producer)
   end
 
   @doc """
diff --git a/apps/transport/test/transport_web/session_text.exs b/apps/transport/test/transport_web/session_test.exs
similarity index 65%
rename from apps/transport/test/transport_web/session_text.exs
rename to apps/transport/test/transport_web/session_test.exs
index ebaeb26085..cf24adcda4 100644
--- a/apps/transport/test/transport_web/session_text.exs
+++ b/apps/transport/test/transport_web/session_test.exs
@@ -27,7 +27,7 @@ defmodule TransportWeb.SessionTest 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})
+      assert is_admin?(%Phoenix.LiveView.Socket{assigns: %{current_user: %{"is_admin" => true}}})
     end
 
     test "is_producer?" do
@@ -36,6 +36,24 @@ defmodule TransportWeb.SessionTest do
     end
   end
 
+  describe "set_is_producer" do
+    test "no datasets" do
+      assert %{"is_producer" => false} ==
+               %Plug.Conn{}
+               |> Plug.Test.init_test_session(%{current_user: %{}})
+               |> set_is_producer([])
+               |> Plug.Conn.get_session(:current_user)
+    end
+
+    test "2 datasets" do
+      assert %{"is_producer" => true} ==
+               %Plug.Conn{}
+               |> Plug.Test.init_test_session(%{current_user: %{}})
+               |> set_is_producer([build(:dataset), build(:dataset)])
+               |> Plug.Conn.get_session(:current_user)
+    end
+  end
+
   def pan_org do
     %{"slug" => "equipe-transport-data-gouv-fr", "name" => "PAN", "id" => @pan_org_id}
   end

From 202fde374cb8573fb22c53e8f22fa73d7dde0799 Mon Sep 17 00:00:00 2001
From: Antoine Augusti <antoine.augusti@transport.data.gouv.fr>
Date: Tue, 9 Jan 2024 09:47:53 +0100
Subject: [PATCH 4/4] =?UTF-8?q?Mise=20=C3=A0=20jour=20vers=20Phoenix=201.7?=
 =?UTF-8?q?=20(#3696)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Upgrade to Phoenix 1.7

* Verified routes

* Use verified routes

* Fork scrivener_html to transportdatagouvfr

* Add support for removed deps

---------

Co-authored-by: Thibaut Barrère <thibaut.barrere@gmail.com>
---
 apps/gbfs/mix.exs                             |  3 +--
 apps/shared/mix.exs                           |  2 +-
 apps/transport/client/yarn.lock               |  2 +-
 apps/transport/lib/transport_web.ex           | 19 ++++++++++++++++
 apps/transport/lib/transport_web/endpoint.ex  |  2 +-
 apps/transport/lib/transport_web/router.ex    |  1 +
 .../templates/layout/_breaking_news.html.heex |  8 +++----
 .../templates/layout/app.html.heex            | 12 +++++-----
 .../lib/transport_web/views/layout_view.ex    |  6 +----
 apps/transport/mix.exs                        | 10 +++++----
 apps/transport/test/support/conn_case.ex      |  2 ++
 .../api/gtfs_stops_controller_test.exs        |  8 +++----
 .../backoffice/backoffice_controller_test.exs | 22 ++++++++++---------
 .../broken_urls_controller_test.exs           |  2 +-
 .../backoffice/contact_controller_test.exs    | 10 ++++-----
 ...ification_subscription_controller_test.exs | 10 ++++-----
 .../controllers/contact_controller_test.exs   | 21 ++++++++----------
 .../controllers/explore_controller_test.exs   |  6 ++---
 .../transport_web/controllers/nav_test.exs    |  2 +-
 .../notification_controller_test.exs          |  8 +++----
 .../controllers/page_controller_test.exs      |  8 +++----
 .../controllers/resource_controller_test.exs  |  2 +-
 .../transport_web/controllers/seo_test.exs    | 20 ++++++++---------
 .../transport_web/plugs/rate_limiter_test.exs |  6 ++---
 .../routing/headers_and_cookies_test.exs      |  8 +++++--
 .../routing/proxy_routing_test.exs            |  2 +-
 .../transport_web/views/avatar_view_test.exs  |  2 +-
 apps/unlock/mix.exs                           |  2 +-
 generate_deps_changelogs.exs                  |  2 ++
 mix.lock                                      | 18 +++++++--------
 30 files changed, 125 insertions(+), 101 deletions(-)

diff --git a/apps/gbfs/mix.exs b/apps/gbfs/mix.exs
index 7861ecca68..19e0a68ed8 100644
--- a/apps/gbfs/mix.exs
+++ b/apps/gbfs/mix.exs
@@ -11,7 +11,6 @@ defmodule GBFS.MixProject do
       lockfile: "../../mix.lock",
       elixir: "~> 1.8",
       elixirc_paths: elixirc_paths(Mix.env()),
-      compilers: [:phoenix] ++ Mix.compilers(),
       start_permanent: Mix.env() == :prod,
       deps: deps(),
       test_coverage: [tool: ExCoveralls],
@@ -38,7 +37,7 @@ defmodule GBFS.MixProject do
     [
       {:cachex, "~> 3.5"},
       {:httpoison, "~> 2.1"},
-      {:phoenix, "~> 1.6.2"},
+      {:phoenix, "~> 1.7.0"},
       {:sweet_xml, ">= 0.0.0"},
       {:jason, ">= 0.0.0"},
       {:cors_plug, "~> 3.0"},
diff --git a/apps/shared/mix.exs b/apps/shared/mix.exs
index f1d5059ff8..18e1a6dcf8 100644
--- a/apps/shared/mix.exs
+++ b/apps/shared/mix.exs
@@ -46,7 +46,7 @@ defmodule Shared.MixProject do
       {:finch, "~> 0.8"},
       # Required for the ConditionalJSONEncoder shared component, but
       # there is probably a way to avoid that?
-      {:phoenix, "~> 1.6.2"},
+      {:phoenix, "~> 1.7.0"},
       # The global app config references Sentry.LoggerBackend. We add it in "shared"
       # as an implicit dependency, to ensure `Sentry.LoggerBackend` is always defined,
       # otherwise running tests for an individual umbrella sub-app will raise error.
diff --git a/apps/transport/client/yarn.lock b/apps/transport/client/yarn.lock
index 01755e034d..7578253a6e 100644
--- a/apps/transport/client/yarn.lock
+++ b/apps/transport/client/yarn.lock
@@ -4041,7 +4041,7 @@ path-type@^4.0.0:
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 "phoenix@file:../../../deps/phoenix":
-  version "1.6.16"
+  version "1.7.10"
 
 "phoenix_html@file:../../../deps/phoenix_html":
   version "3.3.3"
diff --git a/apps/transport/lib/transport_web.ex b/apps/transport/lib/transport_web.ex
index 5a7a64b74a..49f54031e2 100644
--- a/apps/transport/lib/transport_web.ex
+++ b/apps/transport/lib/transport_web.ex
@@ -16,6 +16,8 @@ defmodule TransportWeb do
   below. Instead, define any helper function in modules
   and import those modules here.
   """
+  def static_paths,
+    do: ~w(js css fonts images data favicon.ico documents BingSiteAuth.xml google5be4b09db1274976.html demo_rt.html)
 
   def controller do
     quote do
@@ -26,6 +28,8 @@ defmodule TransportWeb do
       import TransportWeb.PaginationHelpers
       alias TransportWeb.ErrorView
       import Phoenix.LiveView.Controller
+
+      unquote(verified_routes())
     end
   end
 
@@ -54,6 +58,12 @@ defmodule TransportWeb do
     end
   end
 
+  def view_helpers do
+    quote do
+      unquote(verified_routes())
+    end
+  end
+
   def router do
     quote do
       use Phoenix.Router
@@ -78,6 +88,15 @@ defmodule TransportWeb do
     end
   end
 
+  def verified_routes do
+    quote do
+      use Phoenix.VerifiedRoutes,
+        endpoint: TransportWeb.Endpoint,
+        router: TransportWeb.Router,
+        statics: TransportWeb.static_paths()
+    end
+  end
+
   @doc """
   When used, dispatch to the appropriate controller/view/etc.
   """
diff --git a/apps/transport/lib/transport_web/endpoint.ex b/apps/transport/lib/transport_web/endpoint.ex
index f3eebe58c4..37c3e11afc 100644
--- a/apps/transport/lib/transport_web/endpoint.ex
+++ b/apps/transport/lib/transport_web/endpoint.ex
@@ -22,7 +22,7 @@ defmodule TransportWeb.Endpoint do
     at: "/",
     from: :transport,
     gzip: Mix.env() == :prod,
-    only: ~w(js css fonts images data favicon.ico documents BingSiteAuth.xml google5be4b09db1274976.html demo_rt.html)
+    only: TransportWeb.static_paths()
   )
 
   # Code reloading can be explicitly enabled under the
diff --git a/apps/transport/lib/transport_web/router.ex b/apps/transport/lib/transport_web/router.ex
index b9a0025a0f..a1a9b7f64d 100644
--- a/apps/transport/lib/transport_web/router.ex
+++ b/apps/transport/lib/transport_web/router.ex
@@ -12,6 +12,7 @@ defmodule TransportWeb.Router do
     plug(:canonical_host)
     plug(:accepts, ["html"])
     plug(:fetch_session)
+    plug(:fetch_flash)
     plug(:fetch_live_flash)
     plug(:protect_from_forgery)
     plug(TransportWeb.Plugs.PutLocale)
diff --git a/apps/transport/lib/transport_web/templates/layout/_breaking_news.html.heex b/apps/transport/lib/transport_web/templates/layout/_breaking_news.html.heex
index 5d611647fb..85af107542 100644
--- a/apps/transport/lib/transport_web/templates/layout/_breaking_news.html.heex
+++ b/apps/transport/lib/transport_web/templates/layout/_breaking_news.html.heex
@@ -1,7 +1,7 @@
-<div :if={get_flash(@conn, :breaking_news_info)} class="notification">
-  <%= @conn |> get_flash(:breaking_news_info) |> markdown_to_safe_html!() %>
+<div :if={Phoenix.Flash.get(@flash, :breaking_news_info)} class="notification">
+  <%= @flash |> Phoenix.Flash.get(:breaking_news_info) |> markdown_to_safe_html!() %>
 </div>
 
-<div :if={get_flash(@conn, :breaking_news_error)} class="notification message--error">
-  <%= @conn |> get_flash(:breaking_news_error) |> markdown_to_safe_html!() %>
+<div :if={Phoenix.Flash.get(@flash, :breaking_news_error)} class="notification message--error">
+  <%= @flash |> Phoenix.Flash.get(:breaking_news_error) |> markdown_to_safe_html!() %>
 </div>
diff --git a/apps/transport/lib/transport_web/templates/layout/app.html.heex b/apps/transport/lib/transport_web/templates/layout/app.html.heex
index e33ae5b1f6..ac2cc8e870 100644
--- a/apps/transport/lib/transport_web/templates/layout/app.html.heex
+++ b/apps/transport/lib/transport_web/templates/layout/app.html.heex
@@ -64,16 +64,16 @@
     <main class="layout-main">
       <%= if has_flash(@conn) do %>
         <%= render(LayoutView, "_breaking_news.html", assigns) %>
-        <%= if get_flash(@conn, :info) do %>
-          <p class="notification"><%= get_flash(@conn, :info) %></p>
+        <%= if Phoenix.Flash.get(@flash, :info) do %>
+          <p class="notification"><%= Phoenix.Flash.get(@flash, :info) %></p>
         <% end %>
-        <%= if get_flash(@conn, :errors) do %>
-          <%= for error <- get_flash(@conn, :errors) do %>
+        <%= if Phoenix.Flash.get(@flash, :errors) do %>
+          <%= for error <- Phoenix.Flash.get(@flash, :errors) do %>
             <p class="notification message--error"><%= error %></p>
           <% end %>
         <% end %>
-        <%= if get_flash(@conn, :error) do %>
-          <p class="notification message--error"><%= get_flash(@conn, :error) %></p>
+        <%= if Phoenix.Flash.get(@flash, :error) do %>
+          <p class="notification message--error"><%= Phoenix.Flash.get(@flash, :error) %></p>
         <% end %>
       <% end %>
 
diff --git a/apps/transport/lib/transport_web/views/layout_view.ex b/apps/transport/lib/transport_web/views/layout_view.ex
index 1cb0e3335d..88e9e19f1d 100644
--- a/apps/transport/lib/transport_web/views/layout_view.ex
+++ b/apps/transport/lib/transport_web/views/layout_view.ex
@@ -8,11 +8,7 @@ defmodule TransportWeb.LayoutView do
     Controller.current_path(conn)
   end
 
-  def has_flash(conn) do
-    # it's not nice to depend on some internal state, but it does not seems to have a better way
-    # to check if the `put_flash` function has been called, and it's important for error pages
-    not is_nil(conn.private[:phoenix_flash])
-  end
+  def has_flash(%Plug.Conn{} = conn), do: not Enum.empty?(conn.assigns.flash)
 
   def add_locale_to_url(conn, locale) do
     query_params = conn.query_params |> Map.put("locale", locale) |> Plug.Conn.Query.encode()
diff --git a/apps/transport/mix.exs b/apps/transport/mix.exs
index a88eeaf296..39e41b54a3 100644
--- a/apps/transport/mix.exs
+++ b/apps/transport/mix.exs
@@ -60,12 +60,12 @@ defmodule Transport.Mixfile do
       {:earmark, "~> 1.4"},
       {:gettext, "~> 0.11"},
       {:httpoison, "~> 2.1"},
-      {:phoenix, "~> 1.6.2"},
+      {:phoenix, "~> 1.7.0"},
       {:phoenix_html, "~> 3.1"},
       # Compilation issue for this dependency, see https://github.com/etalab/transport-site/issues/3499
       {:phoenix_markdown, git: "https://github.com/pzingg/phoenix_markdown.git", ref: "b2e5ff67c9ce9160d7ef1f66d0c859dfa6284a53"},
       # Careful with the upgrade: https://github.com/etalab/transport-site/issues/3433
-      {:phoenix_live_view, "~> 0.18.0"},
+      {:phoenix_live_view, "~> 0.18.18"},
       {:html_sanitize_ex, "~> 1.4"},
       {:floki, ">= 0.0.0", only: :test},
       {:plug_cowboy, "~> 2.3"},
@@ -74,8 +74,10 @@ defmodule Transport.Mixfile do
       {:timex, "~> 3.7"},
       {:sentry, "~> 10.1"},
       {:scrivener, "~> 2.5"},
-      # Compilation issue for this dependency, see https://github.com/etalab/transport-site/issues/3499
-      {:scrivener_html, git: "https://github.com/etalab/scrivener_html.git", ref: "f0245703abf7d0ce2b48a0f7e96997def7649e5f"},
+      # `scrivener_html` seems to be unmaintained!
+      # - Compilation issue for this dependency, see https://github.com/etalab/transport-site/issues/3499
+      # - was not updated to support Phoenix 1.7
+      {:scrivener_html, git: "https://github.com/transportdatagouvfr/scrivener_html.git", ref: "d6ac5ac4c0c94fc871a42817817b6d5c7b5d6b0c"},
       {:scrivener_list, "~>2.0"},
       {:jason, "~> 1.1"},
       {:open_api_spex, "~> 3.8"},
diff --git a/apps/transport/test/support/conn_case.ex b/apps/transport/test/support/conn_case.ex
index 9ecc1e6c73..3b72d6b6e0 100644
--- a/apps/transport/test/support/conn_case.ex
+++ b/apps/transport/test/support/conn_case.ex
@@ -31,6 +31,8 @@ defmodule TransportWeb.ConnCase do
 
       # The default endpoint for testing
       @endpoint TransportWeb.Endpoint
+
+      use TransportWeb, :verified_routes
     end
   end
 
diff --git a/apps/transport/test/transport_web/controllers/api/gtfs_stops_controller_test.exs b/apps/transport/test/transport_web/controllers/api/gtfs_stops_controller_test.exs
index a90882bed3..ec0a545208 100644
--- a/apps/transport/test/transport_web/controllers/api/gtfs_stops_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/api/gtfs_stops_controller_test.exs
@@ -7,7 +7,7 @@ defmodule TransportWeb.API.GTFSStopsControllerTest do
   end
 
   test "GET /api/gtfs-stops without parameters", %{conn: conn} do
-    conn = conn |> get("/api/gtfs-stops")
+    conn = conn |> get(~p"/api/gtfs-stops")
     json = json_response(conn, 422)
     assert json["error"] == "incorrect parameters"
   end
@@ -15,7 +15,7 @@ defmodule TransportWeb.API.GTFSStopsControllerTest do
   test "GET /api/gtfs-stops with full map parameters", %{conn: conn} do
     conn =
       conn
-      |> get("/api/gtfs-stops", %{
+      |> get(~p"/api/gtfs-stops", %{
         "south" => "48.8",
         "east" => "2.4",
         "west" => "2.2",
@@ -36,7 +36,7 @@ defmodule TransportWeb.API.GTFSStopsControllerTest do
 
     conn =
       conn
-      |> get("/api/gtfs-stops", %{
+      |> get(~p"/api/gtfs-stops", %{
         "south" => "43.5326204268101",
         "east" => "22.6318359375",
         "west" => "-18.764648437500004",
@@ -55,7 +55,7 @@ defmodule TransportWeb.API.GTFSStopsControllerTest do
 
     conn =
       conn
-      |> get("/api/gtfs-stops", %{
+      |> get(~p"/api/gtfs-stops", %{
         "south" => "48.8",
         "east" => "2.4",
         "west" => "2.2",
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 985a5c9481..f91a41be32 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
@@ -47,7 +47,7 @@ defmodule TransportWeb.BackofficeControllerTest do
     target_uri = URI.parse(redirected_to(conn, 302))
     assert target_uri.path == "/login/explanation"
     assert target_uri.query == URI.encode_query(redirect_path: "/backoffice")
-    assert get_flash(conn, :info) =~ "Vous devez être préalablement connecté"
+    assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Vous devez être préalablement connecté"
   end
 
   test "Check that you are an admin", %{conn: conn} do
@@ -57,7 +57,9 @@ defmodule TransportWeb.BackofficeControllerTest do
       |> get(backoffice_page_path(conn, :index))
 
     assert redirected_to(conn, 302) =~ "/login/explanation"
-    assert get_flash(conn, :error) =~ "You need to be a member of the transport.data.gouv.fr team."
+
+    assert Phoenix.Flash.get(conn.assigns.flash, :error) =~
+             "You need to be a member of the transport.data.gouv.fr team."
   end
 
   test "Show 'add new dataset' form", %{conn: conn} do
@@ -80,7 +82,7 @@ defmodule TransportWeb.BackofficeControllerTest do
     assert redirected_to(conn, 302) == backoffice_page_path(conn, :index)
     assert Resource |> Repo.all() |> length() == 0
 
-    assert get_flash(conn, :error) ==
+    assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
              "%{region: [\"Vous devez remplir soit une région soit une AOM soit utiliser les zones data.gouv\"]}"
 
     assert [] == all_enqueued()
@@ -103,7 +105,7 @@ defmodule TransportWeb.BackofficeControllerTest do
     assert redirected_to(conn, 302) == backoffice_page_path(conn, :index)
     assert Resource |> Repo.all() |> length() == 0
 
-    assert get_flash(conn, :error) ==
+    assert Phoenix.Flash.get(conn.assigns.flash, :error) ==
              "%{region: [\"Vous devez remplir soit une région soit une AOM soit utiliser les zones data.gouv\"]}"
 
     assert [] == all_enqueued()
@@ -174,7 +176,7 @@ defmodule TransportWeb.BackofficeControllerTest do
     assert redirected_to(conn, 302) == backoffice_page_path(conn, :index)
     assert Resource |> where([r], not r.is_community_resource) |> Repo.all() |> length() == 1
     assert Resource |> where([r], r.is_community_resource) |> Repo.all() |> length() == 2
-    assert ["Dataset ajouté" | _] = get_flash(conn, :info)
+    assert ["Dataset ajouté" | _] = Phoenix.Flash.get(conn.assigns.flash, :info)
   end
 
   test "Add a dataset linked to aom", %{conn: conn} do
@@ -216,7 +218,7 @@ defmodule TransportWeb.BackofficeControllerTest do
 
     assert Resource |> where([r], not r.is_community_resource) |> Repo.all() |> length() == 1
     assert Resource |> where([r], r.is_community_resource) |> Repo.all() |> length() == 2
-    assert ["Dataset ajouté" | _] = get_flash(conn, :info)
+    assert ["Dataset ajouté" | _] = Phoenix.Flash.get(conn.assigns.flash, :info)
   end
 
   test "Add a dataset linked to cities", %{conn: conn} do
@@ -238,7 +240,7 @@ defmodule TransportWeb.BackofficeControllerTest do
 
     assert redirected_to(conn, 302) == backoffice_page_path(conn, :index)
     assert Resource |> Repo.all() |> length() == 1
-    assert ["Dataset ajouté" | _] = get_flash(conn, :info)
+    assert ["Dataset ajouté" | _] = Phoenix.Flash.get(conn.assigns.flash, :info)
   end
 
   test "Add a dataset linked to cities and to the country", %{conn: conn} do
@@ -264,7 +266,7 @@ defmodule TransportWeb.BackofficeControllerTest do
     assert logs =~ "Vous devez remplir soit une région soit une AOM"
     assert redirected_to(conn, 302) == backoffice_page_path(conn, :index)
     assert Resource |> Repo.all() |> length() == 0
-    flash = get_flash(conn, :error)
+    flash = Phoenix.Flash.get(conn.assigns.flash, :error)
 
     assert flash =~
              "Vous devez remplir soit une région soit une AOM soit utiliser les zones data.gouv"
@@ -293,7 +295,7 @@ defmodule TransportWeb.BackofficeControllerTest do
     # is empty (but not null since it comes from a form)
     assert redirected_to(conn, 302) == backoffice_page_path(conn, :index)
     assert Resource |> Repo.all() |> length() == 1
-    assert ["Dataset ajouté" | _] = conn |> get_flash(:info)
+    assert ["Dataset ajouté" | _] = Phoenix.Flash.get(conn.assigns.flash, :info)
     %Resource{id: resource_id} = Resource |> Repo.one!()
 
     assert [
@@ -330,7 +332,7 @@ defmodule TransportWeb.BackofficeControllerTest do
     # It should not be possible to link a dataset to either a region and to the whole country
     assert redirected_to(conn, 302) == backoffice_page_path(conn, :index)
     assert Resource |> Repo.all() |> length() == 0
-    flash = get_flash(conn, :error)
+    flash = Phoenix.Flash.get(conn.assigns.flash, :error)
     assert logs =~ "Un jeu de données ne peut pas être à la fois régional et national"
     assert flash =~ "Un jeu de données ne peut pas être à la fois régional et national"
   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 0684e6ab65..4035de6ae4 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
@@ -12,7 +12,7 @@ defmodule TransportWeb.Backoffice.BrokenUrlsControllerTest do
     target_uri = URI.parse(redirected_to(conn, 302))
     assert target_uri.path == "/login/explanation"
     assert target_uri.query == URI.encode_query(redirect_path: request_path)
-    assert get_flash(conn, :info) =~ "Vous devez être préalablement connecté"
+    assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Vous devez être préalablement connecté"
   end
 
   test "detects a broken URL", %{conn: conn} do
diff --git a/apps/transport/test/transport_web/controllers/backoffice/contact_controller_test.exs b/apps/transport/test/transport_web/controllers/backoffice/contact_controller_test.exs
index 2cad8d240a..f968ae7298 100644
--- a/apps/transport/test/transport_web/controllers/backoffice/contact_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/backoffice/contact_controller_test.exs
@@ -12,7 +12,7 @@ defmodule TransportWeb.Backoffice.ContactControllerTest do
     target_uri = URI.parse(redirected_to(conn, 302))
     assert target_uri.path == "/login/explanation"
     assert target_uri.query == URI.encode_query(redirect_path: request_path)
-    assert get_flash(conn, :info) =~ "Vous devez être préalablement connecté"
+    assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Vous devez être préalablement connecté"
   end
 
   describe "index" do
@@ -90,7 +90,7 @@ defmodule TransportWeb.Backoffice.ContactControllerTest do
       assert %DB.Contact{first_name: "John", last_name: "Doe", email: "john@example.com", organization: "Corp Inc"} =
                DB.Repo.one!(DB.Contact)
 
-      assert get_flash(conn, :info) =~ "Contact mis à jour"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Contact mis à jour"
     end
 
     test "redirects when there are errors", %{conn: conn} do
@@ -137,7 +137,7 @@ defmodule TransportWeb.Backoffice.ContactControllerTest do
         |> post(backoffice_contact_path(conn, :create, %{"contact" => args}))
 
       assert redirected_to(conn, 302) == backoffice_contact_path(conn, :index)
-      assert get_flash(conn, :info) =~ "Contact mis à jour"
+      assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Contact mis à jour"
       assert %DB.Contact{last_name: ^new_last_name} = DB.Repo.reload!(contact)
     end
 
@@ -151,7 +151,7 @@ defmodule TransportWeb.Backoffice.ContactControllerTest do
         |> post(backoffice_contact_path(conn, :create, %{"contact" => %{"id" => contact.id, "email" => other_email}}))
 
       assert redirected_to(conn, 302) == backoffice_contact_path(conn, :index)
-      assert get_flash(conn, :error) =~ "Un contact existe déjà avec cette adresse e-mail"
+      assert Phoenix.Flash.get(conn.assigns.flash, :error) =~ "Un contact existe déjà avec cette adresse e-mail"
       assert %DB.Contact{email: ^email} = DB.Repo.reload!(contact)
     end
 
@@ -196,7 +196,7 @@ defmodule TransportWeb.Backoffice.ContactControllerTest do
       |> post(backoffice_contact_path(conn, :delete, contact.id))
 
     assert redirected_to(conn, 302) == backoffice_contact_path(conn, :index)
-    assert get_flash(conn, :info) =~ "Le contact a été supprimé"
+    assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "Le contact a été supprimé"
     assert is_nil(DB.Repo.reload(contact))
   end
 
diff --git a/apps/transport/test/transport_web/controllers/backoffice/notification_subscription_controller_test.exs b/apps/transport/test/transport_web/controllers/backoffice/notification_subscription_controller_test.exs
index 9bf81fa69c..c6fd1846fb 100644
--- a/apps/transport/test/transport_web/controllers/backoffice/notification_subscription_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/backoffice/notification_subscription_controller_test.exs
@@ -31,7 +31,7 @@ defmodule TransportWeb.NotificationSubscriptionControllerTest do
         |> post(backoffice_notification_subscription_path(conn, :create, args))
 
       assert redirected_to(conn_response, 302) == backoffice_page_path(conn, :edit, dataset_id) <> @target_html_anchor
-      assert get_flash(conn_response, :info) =~ "L'abonnement a été créé"
+      assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "L'abonnement a été créé"
 
       assert [
                %DB.NotificationSubscription{
@@ -55,7 +55,7 @@ defmodule TransportWeb.NotificationSubscriptionControllerTest do
         |> post(backoffice_notification_subscription_path(conn, :create, Map.put(args, "dataset_with_error", "true")))
 
       assert redirected_to(conn_response, 302) == backoffice_page_path(conn, :edit, dataset_id) <> @target_html_anchor
-      assert get_flash(conn_response, :info) =~ "L'abonnement a été créé"
+      assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "L'abonnement a été créé"
 
       assert Enum.sort([:dataset_with_error, :expiration, :resource_unavailable]) ==
                DB.NotificationSubscription.base_query()
@@ -117,7 +117,7 @@ defmodule TransportWeb.NotificationSubscriptionControllerTest do
       assert redirected_to(conn_response, 302) ==
                backoffice_contact_path(conn, :edit, contact_id) <> @target_html_anchor
 
-      assert get_flash(conn_response, :info) =~ "Abonnements mis à jour"
+      assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "Abonnements mis à jour"
 
       assert [
                %DB.NotificationSubscription{
@@ -157,7 +157,7 @@ defmodule TransportWeb.NotificationSubscriptionControllerTest do
       })
 
     assert redirected_to(conn_response, 302) == backoffice_page_path(conn, :edit, dataset_id) <> @target_html_anchor
-    assert get_flash(conn_response, :info) =~ "L'abonnement a été supprimé"
+    assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "L'abonnement a été supprimé"
 
     assert DB.NotificationSubscription |> DB.Repo.all() |> Enum.empty?()
   end
@@ -201,7 +201,7 @@ defmodule TransportWeb.NotificationSubscriptionControllerTest do
       )
 
     assert redirected_to(conn_response, 302) == backoffice_page_path(conn, :edit, dataset_id) <> @target_html_anchor
-    assert get_flash(conn_response, :info) =~ "Les abonnements ont été supprimés"
+    assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "Les abonnements ont été supprimés"
 
     assert [
              %DB.NotificationSubscription{
diff --git a/apps/transport/test/transport_web/controllers/contact_controller_test.exs b/apps/transport/test/transport_web/controllers/contact_controller_test.exs
index a0239d43b7..c2604e1b81 100644
--- a/apps/transport/test/transport_web/controllers/contact_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/contact_controller_test.exs
@@ -3,24 +3,21 @@ defmodule TransportWeb.ContactControllerTest do
   import Swoosh.TestAssertions
 
   test "Post contact form with honey pot filled", %{conn: conn} do
-    conn
-    |> post(contact_path(conn, :send_mail, %{email: "spammer@internet.com", name: "John Doe"}))
-    |> get_flash(:info)
+    conn = post(conn, contact_path(conn, :send_mail, %{email: "spammer@internet.com", name: "John Doe"}))
     # only spammers get a fox emoji in their flash message
-    |> Kernel.=~("🦊")
-    |> assert
+    assert Phoenix.Flash.get(conn.assigns.flash, :info) =~ "🦊"
 
     assert_no_email_sent()
   end
 
   test "Post contact form without honey pot", %{conn: conn} do
-    conn
-    |> post(
-      contact_path(conn, :send_mail, %{email: "human@user.fr", topic: "dataset", question: "where is my dataset?"})
-    )
-    |> get_flash(:info)
-    |> Kernel.=~("🦊")
-    |> refute
+    conn =
+      conn
+      |> post(
+        contact_path(conn, :send_mail, %{email: "human@user.fr", topic: "dataset", question: "where is my dataset?"})
+      )
+
+    refute Phoenix.Flash.get(conn.assigns.flash, :info) =~ "🦊"
 
     assert_email_sent(
       from: {"PAN, Formulaire Contact", "contact@transport.data.gouv.fr"},
diff --git a/apps/transport/test/transport_web/controllers/explore_controller_test.exs b/apps/transport/test/transport_web/controllers/explore_controller_test.exs
index 4d816e7fd5..1979d8066f 100644
--- a/apps/transport/test/transport_web/controllers/explore_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/explore_controller_test.exs
@@ -28,7 +28,7 @@ defmodule TransportWeb.ExploreControllerTest do
   end
 
   test "GET /explore", %{conn: conn} do
-    conn = conn |> get("/explore")
+    conn = conn |> get(~p"/explore")
     html = html_response(conn, 200)
     assert html =~ "Exploration"
   end
@@ -36,14 +36,14 @@ defmodule TransportWeb.ExploreControllerTest do
   test "GET /explore/vehicle-positions", %{conn: conn} do
     redirect_path =
       conn
-      |> get("/explore/vehicle-positions")
+      |> get(~p"/explore/vehicle-positions")
       |> redirected_to(302)
 
     assert redirect_path == "/explore"
   end
 
   test "GET /explore/gtfs-stops", %{conn: conn} do
-    conn = conn |> get("/explore/gtfs-stops")
+    conn = conn |> get(~p"/explore/gtfs-stops")
     html = html_response(conn, 200)
     doc = Floki.parse_document!(html)
 
diff --git a/apps/transport/test/transport_web/controllers/nav_test.exs b/apps/transport/test/transport_web/controllers/nav_test.exs
index 1e2a042cc0..76982109f7 100644
--- a/apps/transport/test/transport_web/controllers/nav_test.exs
+++ b/apps/transport/test/transport_web/controllers/nav_test.exs
@@ -40,7 +40,7 @@ defmodule TransportWeb.NavTest do
     # we'll later use a proper stubbed implementation for all tests.
     with_mock Datagouvfr.Client.Discussions, get: fn _ -> [] end do
       # browse the home
-      conn = conn |> get("/")
+      conn = conn |> get(~p"/")
       html = html_response(conn, 200)
 
       # I can click to the a list of available datasets
diff --git a/apps/transport/test/transport_web/controllers/notification_controller_test.exs b/apps/transport/test/transport_web/controllers/notification_controller_test.exs
index 5ffd488c2b..342716289e 100644
--- a/apps/transport/test/transport_web/controllers/notification_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/notification_controller_test.exs
@@ -63,7 +63,7 @@ defmodule TransportWeb.NotificationControllerTest do
       conn_response = conn |> post(notification_path(conn, :create, args))
 
       assert redirected_to(conn_response, 302) == notification_path(conn, :index)
-      assert get_flash(conn_response, :info) =~ "La notification a été créée"
+      assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "La notification a été créée"
 
       assert [
                %DB.NotificationSubscription{
@@ -84,7 +84,7 @@ defmodule TransportWeb.NotificationControllerTest do
       conn_response = conn |> post(notification_path(conn, :create, Map.put(args, "dataset_with_error", "true")))
 
       assert redirected_to(conn_response, 302) == notification_path(conn, :index)
-      assert get_flash(conn_response, :info) =~ "La notification a été créée"
+      assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "La notification a été créée"
 
       assert Enum.sort([:dataset_with_error, :expiration, :resource_unavailable]) ==
                DB.NotificationSubscription.base_query()
@@ -111,7 +111,7 @@ defmodule TransportWeb.NotificationControllerTest do
     conn_response = conn |> delete(notification_path(conn, :delete, subscription_id))
 
     assert redirected_to(conn_response, 302) == notification_path(conn, :index)
-    assert get_flash(conn_response, :info) =~ "La notification a été supprimée"
+    assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "La notification a été supprimée"
 
     assert DB.NotificationSubscription |> DB.Repo.all() |> Enum.empty?()
   end
@@ -150,7 +150,7 @@ defmodule TransportWeb.NotificationControllerTest do
     conn_response = conn |> delete(notification_path(conn, :delete_for_dataset, dataset_id))
 
     assert redirected_to(conn_response, 302) == notification_path(conn, :index)
-    assert get_flash(conn_response, :info) =~ "Les notifications ont été supprimées"
+    assert Phoenix.Flash.get(conn_response.assigns.flash, :info) =~ "Les notifications ont été supprimées"
 
     assert [
              %DB.NotificationSubscription{
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 2d4547b865..a13c8b8091 100644
--- a/apps/transport/test/transport_web/controllers/page_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/page_controller_test.exs
@@ -31,7 +31,7 @@ defmodule TransportWeb.PageControllerTest do
 
   test "I can see a log-in link on home", %{conn: conn} do
     # go to the home page
-    conn = conn |> get("/")
+    conn = conn |> get(~p"/")
     doc = html_response(conn, 200)
     html = doc |> Floki.parse_document!()
 
@@ -127,12 +127,12 @@ defmodule TransportWeb.PageControllerTest do
   end
 
   test "security.txt page", %{conn: conn} do
-    conn |> get("/.well-known/security.txt") |> text_response(200)
+    conn |> get(~p"/.well-known/security.txt") |> text_response(200)
   end
 
   describe "robots.txt" do
     test "200 response, doesn't disallow indexing everything", %{conn: conn} do
-      refute conn |> get("/robots.txt") |> text_response(200) =~ ~r(Disallow: \/$)
+      refute conn |> get(~p"/robots.txt") |> text_response(200) =~ ~r(Disallow: \/$)
     end
 
     test "disallow indexing everything in staging" do
@@ -155,7 +155,7 @@ defmodule TransportWeb.PageControllerTest do
   end
 
   test "budget page", %{conn: conn} do
-    conn |> get("/budget") |> redirected_to(302) =~ "https://doc.transport.data.gouv.fr"
+    conn |> get(~p"/budget") |> redirected_to(302) =~ "https://doc.transport.data.gouv.fr"
   end
 
   test "humans txt", %{conn: conn} do
diff --git a/apps/transport/test/transport_web/controllers/resource_controller_test.exs b/apps/transport/test/transport_web/controllers/resource_controller_test.exs
index 0744f40af3..e7c91d405f 100644
--- a/apps/transport/test/transport_web/controllers/resource_controller_test.exs
+++ b/apps/transport/test/transport_web/controllers/resource_controller_test.exs
@@ -754,6 +754,6 @@ defmodule TransportWeb.ResourceControllerTest do
 
     html = html_response(conn, 404)
     assert html =~ "Page non disponible"
-    assert get_flash(conn, :error) == "La ressource n'est pas disponible sur le serveur distant"
+    assert Phoenix.Flash.get(conn.assigns.flash, :error) == "La ressource n'est pas disponible sur le serveur distant"
   end
 end
diff --git a/apps/transport/test/transport_web/controllers/seo_test.exs b/apps/transport/test/transport_web/controllers/seo_test.exs
index b22ded4d50..5d9dbc9778 100644
--- a/apps/transport/test/transport_web/controllers/seo_test.exs
+++ b/apps/transport/test/transport_web/controllers/seo_test.exs
@@ -52,7 +52,7 @@ defmodule TransportWeb.SeoMetadataTest do
   end
 
   test "GET / ", %{conn: conn} do
-    title = conn |> get("/") |> html_response(200) |> title
+    title = conn |> get(~p"/") |> html_response(200) |> title
     assert title =~ "Le Point d’Accès National aux données ouvertes de transport"
   end
 
@@ -62,45 +62,45 @@ defmodule TransportWeb.SeoMetadataTest do
   end
 
   test "GET /datasets/aom/4242 ", %{conn: conn} do
-    title = conn |> get("/datasets/aom/4242") |> html_response(200) |> title
+    title = conn |> get(~p"/datasets/aom/4242") |> html_response(200) |> title
     assert title =~ "AOM Angers Métropôle : Jeux de données ouverts"
   end
 
   test "GET /datasets/region/12 ", %{conn: conn} do
-    region = DB.Repo.get_by(DB.Region, nom: "Pays de la Loire")
-    title = conn |> get("/datasets/region/#{region.id}") |> html_response(200) |> title
+    region = Repo.get_by(Region, nom: "Pays de la Loire")
+    title = conn |> get(~p"/datasets/region/#{region.id}") |> html_response(200) |> title
     assert title =~ "Jeux de données ouverts de la région Pays de la Loire"
   end
 
   test "GET /datasets/commune/36044 ", %{conn: conn} do
-    title = conn |> get("/datasets/commune/36044") |> html_response(200) |> title
+    title = conn |> get(~p"/datasets/commune/36044") |> html_response(200) |> title
     assert title =~ "Jeux de données ouverts de la commune de Châteauroux"
   end
 
   test "GET /datasets?type=bike-scooter-sharing ", %{conn: conn} do
-    title = conn |> get("/datasets?type=bike-scooter-sharing") |> html_response(200) |> title
+    title = conn |> get(~p"/datasets?type=bike-scooter-sharing") |> html_response(200) |> title
     assert title =~ "Jeux de données ouverts de la catégorie Vélos et trottinettes en libre-service"
   end
 
   test "GET /dataset/:id ", %{conn: conn} do
     Transport.History.Fetcher.Mock |> expect(:history_resources, fn _, _ -> [] end)
-    title = conn |> get("/datasets/horaires-et-arrets-du-reseau-irigo-format-gtfs") |> html_response(200) |> title
+    title = conn |> get(~p"/datasets/horaires-et-arrets-du-reseau-irigo-format-gtfs") |> html_response(200) |> title
     assert title =~ "Horaires Angers - Données (GTFS) ouvertes - Angers Métropôle"
   end
 
   test "GET /resources/:id ", %{conn: conn} do
-    title = conn |> get("/resources/1234") |> html_response(200) |> title
+    title = conn |> get(~p"/resources/1234") |> html_response(200) |> title
     assert title =~ "Jeu de données ouvert GTFS - angers.zip pour Horaires Angers - Angers Métropôle"
   end
 
   test "GET /aoms ", %{conn: conn} do
-    title = conn |> get("/aoms") |> html_response(200) |> title
+    title = conn |> get(~p"/aoms") |> html_response(200) |> title
     assert title =~ "État de l’ouverture des données de transport en commun pour les AOMs françaises"
   end
 
   test "GET /validation ", %{conn: conn} do
     Transport.Shared.Schemas.Mock |> expect(:transport_schemas, fn -> %{} end)
-    title = conn |> get("/validation") |> html_response(200) |> title
+    title = conn |> get(~p"/validation") |> html_response(200) |> title
     assert title =~ "Évaluation de la qualité d’un fichier ou d’un flux"
   end
 end
diff --git a/apps/transport/test/transport_web/plugs/rate_limiter_test.exs b/apps/transport/test/transport_web/plugs/rate_limiter_test.exs
index b7ae2c05e2..cd90c41d9a 100644
--- a/apps/transport/test/transport_web/plugs/rate_limiter_test.exs
+++ b/apps/transport/test/transport_web/plugs/rate_limiter_test.exs
@@ -93,7 +93,7 @@ defmodule TransportWeb.Plugs.RateLimiterTest do
       text =
         conn
         |> Plug.Conn.put_req_header("user-agent", "Mozilla Bar")
-        |> get("/")
+        |> get(~p"/")
         |> text_response(401)
 
       assert text == "Unauthorized"
@@ -117,7 +117,7 @@ defmodule TransportWeb.Plugs.RateLimiterTest do
       assert %Plug.Conn{status: 429} =
                conn
                |> Plug.Conn.put_req_header("x-forwarded-for", to_string(blocked_ip))
-               |> get("/")
+               |> get(~p"/")
     end
 
     test "does not block a request if user agent is allowed, even if IP is blocked", %{conn: conn} do
@@ -127,7 +127,7 @@ defmodule TransportWeb.Plugs.RateLimiterTest do
       conn
       |> Plug.Conn.put_req_header("x-forwarded-for", to_string(blocked_ip))
       |> Plug.Conn.put_req_header("user-agent", "SpecialUserAgent")
-      |> get("/robots.txt")
+      |> get(~p"/robots.txt")
       |> text_response(200)
     end
   end
diff --git a/apps/transport/test/transport_web/routing/headers_and_cookies_test.exs b/apps/transport/test/transport_web/routing/headers_and_cookies_test.exs
index ec25c974fc..3b959071f1 100644
--- a/apps/transport/test/transport_web/routing/headers_and_cookies_test.exs
+++ b/apps/transport/test/transport_web/routing/headers_and_cookies_test.exs
@@ -4,9 +4,13 @@ defmodule TransportWeb.HeadersAndCookiesTest do
 
   test "sets expected headers", %{conn: conn} do
     conn = get(conn, "/")
-    assert get_resp_header(conn, "x-frame-options") == ["SAMEORIGIN"]
-    assert get_resp_header(conn, "x-xss-protection") == ["1; mode=block"]
+    # Correct with security practises recommend in February 2022
+    # https://github.com/phoenixframework/phoenix/pull/4677
+    assert get_resp_header(conn, "referrer-policy") == ["strict-origin-when-cross-origin"]
     assert get_resp_header(conn, "x-content-type-options") == ["nosniff"]
+    assert get_resp_header(conn, "x-download-options") == ["noopen"]
+    assert get_resp_header(conn, "x-frame-options") == ["SAMEORIGIN"]
+    assert get_resp_header(conn, "x-permitted-cross-domain-policies") == ["none"]
 
     [header] = get_resp_header(conn, "set-cookie")
     # 15 days, in seconds
diff --git a/apps/transport/test/transport_web/routing/proxy_routing_test.exs b/apps/transport/test/transport_web/routing/proxy_routing_test.exs
index 9af5b169f3..b914f9a53e 100644
--- a/apps/transport/test/transport_web/routing/proxy_routing_test.exs
+++ b/apps/transport/test/transport_web/routing/proxy_routing_test.exs
@@ -6,7 +6,7 @@ defmodule TransportWeb.ProxyRoutingTest do
     conn =
       conn
       |> Map.put(:host, "proxy.example.com")
-      |> get("/")
+      |> get(~p"/")
 
     [h] = Plug.Conn.get_resp_header(conn, "x-request-id")
     assert h
diff --git a/apps/transport/test/transport_web/views/avatar_view_test.exs b/apps/transport/test/transport_web/views/avatar_view_test.exs
index 65ebcaa254..fcc856bacf 100644
--- a/apps/transport/test/transport_web/views/avatar_view_test.exs
+++ b/apps/transport/test/transport_web/views/avatar_view_test.exs
@@ -19,7 +19,7 @@ defmodule TransportWeb.LayoutViewTest do
     render =
       conn
       |> init_test_session(current_user: current_user)
-      |> get("/")
+      |> get(~p"/")
       |> Map.get(:resp_body)
 
     assert render =~ current_user["avatar_thumbnail"]
diff --git a/apps/unlock/mix.exs b/apps/unlock/mix.exs
index d6f85555db..5578e9a8df 100644
--- a/apps/unlock/mix.exs
+++ b/apps/unlock/mix.exs
@@ -35,7 +35,7 @@ defmodule Unlock.MixProject do
 
   defp deps do
     [
-      {:phoenix, "~> 1.6.2"},
+      {:phoenix, "~> 1.7.0"},
       {:phoenix_html, "~> 3.1"},
       {:sentry, "~> 10.1"},
       # required indirectly by sentry
diff --git a/generate_deps_changelogs.exs b/generate_deps_changelogs.exs
index 2df783db27..7bdf6832a4 100644
--- a/generate_deps_changelogs.exs
+++ b/generate_deps_changelogs.exs
@@ -60,5 +60,7 @@ master
         IO.puts("* Now using git-version #{repo} @ #{sha2}")
       {{:git, repo, sha1}, {:hex, v2}} ->
         IO.puts("* Now using https://hex.pm/packages/#{dep} instead of #{repo} @ #{sha1}")
+      {{:hex, v1}, nil} ->
+        IO.puts("* REMOVED: #{dep}@#{v1}")
     end
 end)
diff --git a/mix.lock b/mix.lock
index c0e16a3188..f0c5713c9d 100644
--- a/mix.lock
+++ b/mix.lock
@@ -22,14 +22,13 @@
   "db_connection": {:hex, :db_connection, "2.6.0", "77d835c472b5b67fc4f29556dee74bf511bbafecdcaf98c27d27fa5918152086", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
-  "dialyxir": {:hex, :dialyxir, "1.4.2", "764a6e8e7a354f0ba95d58418178d486065ead1f69ad89782817c296d0d746a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"},
+  "dialyxir": {:hex, :dialyxir, "1.4.3", "edd0124f358f0b9e95bfe53a9fcf806d615d8f838e2202a9f430d59566b6b53b", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "earmark": {:hex, :earmark, "1.4.46", "8c7287bd3137e99d26ae4643e5b7ef2129a260e3dcf41f251750cb4563c8fb81", [:mix], [], "hexpm", "798d86db3d79964e759ddc0c077d5eb254968ed426399fbf5a62de2b5ff8910a"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
   "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
   "ecto_erd": {:hex, :ecto_erd, "0.5.1", "a7bab3428b7b586d7e4a7d7182d79e129a92b1b404f72eac49f493b141aa88bc", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:html_entities, "~> 0.5", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "d38d84f5f3ef0489cdb2a21d41ea35615f47afd1d5f42ee9ff4727b323de51b2"},
   "ecto_interval": {:hex, :ecto_interval, "0.2.5", "4169ffc2c212a56aa5a73998788f9aa1f90e4d45c76cccc67bf37f65a70cb83e", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0 or ~> 0.15.0 or ~> 0.16.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "70802ffb4941724d90846efa326b92ff32e50d59cec3b97b6a12c93229a823a6"},
-  "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.14", "7a20cfe913b0476542b43870e67386461258734896035e3f284039fd18bd4c4c", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "22f5f98592dd597db9416fcef00effae0787669fdcb6faf447e982b553798e98"},
+  "ecto_psql_extras": {:hex, :ecto_psql_extras, "0.7.15", "0fc29dbae0e444a29bd6abeee4cf3c4c037e692a272478a234a1cc765077dbb1", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1 or ~> 4.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "b6127f3a5c6fc3d84895e4768cc7c199f22b48b67d6c99b13fbf4a374e73f039"},
   "ecto_sql": {:hex, :ecto_sql, "3.11.1", "e9abf28ae27ef3916b43545f9578b4750956ccea444853606472089e7d169470", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.11.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.6.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.16.0 or ~> 0.17.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ce14063ab3514424276e7e360108ad6c2308f6d88164a076aac8a387e1fea634"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
   "etag_plug": {:hex, :etag_plug, "1.0.0", "2252e16ac5da6bc5367907437bd760740bb209a7e73e821b756f6c9ea808d210", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "fcde90c1f7fa20c624036d4b5e023714f7945031bc8bcf03d1ec43bf462800c1"},
@@ -80,9 +79,8 @@
   "oauth2": {:hex, :oauth2, "2.1.0", "beb657f393814a3a7a8a15bd5e5776ecae341fd344df425342a3b6f1904c2989", [:mix], [{:tesla, "~> 1.5", [hex: :tesla, repo: "hexpm", optional: false]}], "hexpm", "8ac07f85b3307dd1acfeb0ec852f64161b22f57d0ce0c15e616a1dfc8ebe2b41"},
   "oban": {:hex, :oban, "2.17.1", "42d6221a1c17b63d81c19e3bad9ea82b59e39c47c1f9b7670ee33628569a449b", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:ecto_sqlite3, "~> 0.9", [hex: :ecto_sqlite3, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c02686ada7979b00e259c0efbafeae2749f8209747b3460001fe695c5bdbeee6"},
   "open_api_spex": {:hex, :open_api_spex, "3.18.1", "0a73cd5dbcba7d32952dd9738c6819892933d9bae1642f04c9f200281524dd31", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 3.0 or ~> 4.0 or ~> 5.0", [hex: :poison, repo: "hexpm", optional: true]}, {:ymlr, "~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :ymlr, repo: "hexpm", optional: true]}], "hexpm", "f52933cddecca675e42ead660379ae2d3853f57f5a35d201eaed85e2e81517d1"},
-  "parallel_stream": {:hex, :parallel_stream, "1.1.0", "f52f73eb344bc22de335992377413138405796e0d0ad99d995d9977ac29f1ca9", [:mix], [], "hexpm", "684fd19191aedfaf387bbabbeb8ff3c752f0220c8112eb907d797f4592d6e871"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
-  "phoenix": {:hex, :phoenix, "1.6.16", "e5bdd18c7a06da5852a25c7befb72246de4ddc289182285f8685a40b7b5f5451", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e15989ff34f670a96b95ef6d1d25bad0d9c50df5df40b671d8f4a669e050ac39"},
+  "phoenix": {:hex, :phoenix, "1.7.10", "02189140a61b2ce85bb633a9b6fd02dff705a5f1596869547aeb2b2b95edd729", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"},
   "phoenix_ddos": {:hex, :phoenix_ddos, "1.1.14", "8bc29595f221361cec86f798d15ca7ac8228a0ce30fea25dd75d99027e73762c", [:mix], [{:cachex, ">= 3.0.0", [hex: :cachex, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, ">= 0.0.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c0f7e2debd72af4fe90d5083a569f3f576bced9d38010b1a8631bb43c70a005d"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"},
   "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"},
@@ -97,7 +95,7 @@
   "plug": {:hex, :plug, "1.15.2", "94cf1fa375526f30ff8770837cb804798e0045fd97185f0bb9e5fcd858c792a3", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"},
   "plug_canonical_host": {:hex, :plug_canonical_host, "2.0.3", "3d96c3340cc8a434eb6758a4a34de6c152bd781be96bb8439545da2d17ecf576", [:make, :mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "aca98ac6d0036391b84d5a40af6f946c839fb0d588bf0064029a2e8931431ea6"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.6.1", "9a3bbfceeb65eff5f39dab529e5cd79137ac36e913c02067dba3963a26efe9b2", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"},
-  "plug_crypto": {:hex, :plug_crypto, "1.2.5", "918772575e48e81e455818229bf719d4ab4181fcbf7f85b68a35620f78d89ced", [:mix], [], "hexpm", "26549a1d6345e2172eb1c233866756ae44a9609bd33ee6f99147ab3fd87fd842"},
+  "plug_crypto": {:hex, :plug_crypto, "2.0.0", "77515cc10af06645abbfb5e6ad7a3e9714f805ae118fa1a70205f80d2d70fe73", [:mix], [], "hexpm", "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"},
   "postgrex": {:hex, :postgrex, "0.16.5", "fcc4035cc90e23933c5d69a9cd686e329469446ef7abba2cf70f08e2c4b69810", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "edead639dc6e882618c01d8fc891214c481ab9a3788dfe38dd5e37fd1d5fb2e8"},
   "protobuf": {:hex, :protobuf, "0.12.0", "58c0dfea5f929b96b5aa54ec02b7130688f09d2de5ddc521d696eec2a015b223", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "75fa6cbf262062073dd51be44dd0ab940500e18386a6c4e87d5819a58964dc45"},
   "quantum": {:hex, :quantum, "3.5.0", "8d2c5ba68c55991e8975aca368e3ab844ba01f4b87c4185a7403280e2c99cf34", [:mix], [{:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}, {:gen_stage, "~> 0.14 or ~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_registry, "~> 0.2", [hex: :telemetry_registry, repo: "hexpm", optional: false]}], "hexpm", "cab737d1d9779f43cb1d701f46dd05ea58146fd96238d91c9e0da662c1982bb6"},
@@ -109,16 +107,16 @@
   "saxy": {:hex, :saxy, "1.5.0", "0141127f2d042856f135fb2d94e0beecda7a2306f47546dbc6411fc5b07e28bf", [:mix], [], "hexpm", "ea7bb6328fbd1f2aceffa3ec6090bfb18c85aadf0f8e5030905e84235861cf89"},
   "scrivener": {:hex, :scrivener, "2.7.2", "1d913c965ec352650a7f864ad7fd8d80462f76a32f33d57d1e48bc5e9d40aba2", [:mix], [], "hexpm", "7866a0ec4d40274efbee1db8bead13a995ea4926ecd8203345af8f90d2b620d9"},
   "scrivener_ecto": {:hex, :scrivener_ecto, "2.7.0", "cf64b8cb8a96cd131cdbcecf64e7fd395e21aaa1cb0236c42a7c2e34b0dca580", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:scrivener, "~> 2.4", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm", "e809f171687806b0031129034352f5ae44849720c48dd839200adeaf0ac3e260"},
-  "scrivener_html": {:git, "https://github.com/etalab/scrivener_html.git", "f0245703abf7d0ce2b48a0f7e96997def7649e5f", [ref: "f0245703abf7d0ce2b48a0f7e96997def7649e5f"]},
+  "scrivener_html": {:git, "https://github.com/transportdatagouvfr/scrivener_html.git", "d6ac5ac4c0c94fc871a42817817b6d5c7b5d6b0c", [ref: "d6ac5ac4c0c94fc871a42817817b6d5c7b5d6b0c"]},
   "scrivener_list": {:hex, :scrivener_list, "2.0.1", "2b3b5c6aaf21d13b76071e755af498b641f37a069e34e68585ba4c624095d719", [:mix], [{:scrivener_ecto, "~> 1.0 or ~> 2.0", [hex: :scrivener_ecto, repo: "hexpm", optional: false]}], "hexpm", "dc82a317268e24b29891b2de659cd82d15654f49ceee86846de2c96b3c4f4e5d"},
   "sentry": {:hex, :sentry, "10.1.0", "5d73c23deb5d95f3027fbb09801bd8e787065be61f0065418aed3961becbbe9f", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_options, "~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:plug, "~> 1.6", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, "~> 2.3", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm", "f4319e7491133046912b4cf7cbe6f5226b309275d1a6d05386cce2ac7f97b2d2"},
   "sizeable": {:hex, :sizeable, "1.0.2", "625fe06a5dad188b52121a140286f1a6ae1adf350a942cf419499ecd8a11ee29", [:mix], [], "hexpm", "4bab548e6dfba777b400ca50830a9e3a4128e73df77ab1582540cf5860601762"},
   "sleeplocks": {:hex, :sleeplocks, "1.1.2", "d45aa1c5513da48c888715e3381211c859af34bee9b8290490e10c90bb6ff0ca", [:rebar3], [], "hexpm", "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
   "sweet_xml": {:hex, :sweet_xml, "0.7.4", "a8b7e1ce7ecd775c7e8a65d501bc2cd933bff3a9c41ab763f5105688ef485d08", [:mix], [], "hexpm", "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"},
-  "swoosh": {:hex, :swoosh, "1.14.2", "cf686f92ad3b21e6651b20c50eeb1781f581dc7097ef6251b4d322a9f1d19339", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.4 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "01d8fae72930a0b5c1bb9725df0408602ed8c5c3d59dc6e7a39c57b723cd1065"},
+  "swoosh": {:hex, :swoosh, "1.14.3", "949e6bf6dd469449238a94ec6f19ec10b63fc8753de7f3ebe3d3aeaf772f4c6b", [:mix], [{:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.4 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "6c565103fc8f086bdd96e5c948660af8e20922b7a90a75db261f06a34f805c8b"},
   "table": {:hex, :table, "0.1.2", "87ad1125f5b70c5dea0307aa633194083eb5182ec537efc94e96af08937e14a8", [:mix], [], "hexpm", "7e99bc7efef806315c7e65640724bf165c3061cdc5d854060f74468367065029"},
-  "table_rex": {:hex, :table_rex, "3.1.1", "0c67164d1714b5e806d5067c1e96ff098ba7ae79413cc075973e17c38a587caa", [:mix], [], "hexpm", "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"},
+  "table_rex": {:hex, :table_rex, "4.0.0", "3c613a68ebdc6d4d1e731bc973c233500974ec3993c99fcdabb210407b90959b", [:mix], [], "hexpm", "c35c4d5612ca49ebb0344ea10387da4d2afe278387d4019e4d8111e815df8f55"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"},
   "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"},
@@ -133,6 +131,8 @@
   "unzip": {:hex, :unzip, "0.9.0", "8a4be70b49e28c58811c9ef11e78df991f4ba39c770c63ad2d88a69c29e4d8e2", [:mix], [], "hexpm", "084a774070d87ae415afe2b4dbd3ec275b31933ad909c235fd772055c2decea1"},
   "vega_lite": {:hex, :vega_lite, "0.1.8", "7f6119126ecaf4bc2c1854084370d7091424f5cce4795fbac044eee9963f0752", [:mix], [{:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: false]}], "hexpm", "6c8a9271f850612dd8a90de8d1ebd433590ed07ffef76fc2397c240dc04d3fdc"},
   "vex": {:hex, :vex, "0.9.1", "cb65348ebd1c4002861b65bef36e524c29d9a879c90119b2d0e674e323124277", [:mix], [], "hexpm", "a0f9f3959d127ad6a6a617c3f607ecfb1bc6f3c59f9c3614a901a46d1765bafe"},
+  "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
+  "websock_adapter": {:hex, :websock_adapter, "0.5.5", "9dfeee8269b27e958a65b3e235b7e447769f66b5b5925385f5a569269164a210", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"},
   "yamerl": {:hex, :yamerl, "0.10.0", "4ff81fee2f1f6a46f1700c0d880b24d193ddb74bd14ef42cb0bcf46e81ef2f8e", [:rebar3], [], "hexpm", "346adb2963f1051dc837a2364e4acf6eb7d80097c0f53cbdc3046ec8ec4b4e6e"},
   "yaml_elixir": {:hex, :yaml_elixir, "2.9.0", "9a256da867b37b8d2c1ffd5d9de373a4fda77a32a45b452f1708508ba7bbcb53", [:mix], [{:yamerl, "~> 0.10", [hex: :yamerl, repo: "hexpm", optional: false]}], "hexpm", "0cb0e7d4c56f5e99a6253ed1a670ed0e39c13fc45a6da054033928607ac08dfc"},
   "ymlr": {:hex, :ymlr, "4.2.0", "8e6ad682695d829d49ec7cc9973fd05cb743612c734d628e0c7478c44054e5b9", [:mix], [], "hexpm", "57479aba306115fadacf1dde649b590c346ba724acf83a4254669268e9800aeb"},