From f3147b37c89f60c41fb4a17a8480dff942b6855b Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 25 Jun 2025 08:16:51 -0700
Subject: [PATCH] Update etherpad to v2.3.2

We're updating through 2.3.1 which claims to be just a dependency update
release and then 2.3.2 fixes a bug.

  https://github.com/ether/etherpad-lite/blob/v2.3.2/CHANGELOG.md

Updates to the node-oidc-provider library seem to necessitate that we
pass a resource identifier in our token generation request. Update the
testing and our documentation to capture this.

Change-Id: Ib850f80772c146883fd245718425c9d3b1796b36
---
 doc/source/etherpad.rst    | 1 +
 docker/etherpad/Dockerfile | 4 ++--
 testinfra/test_etherpad.py | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/source/etherpad.rst b/doc/source/etherpad.rst
index 547e2eb67a..95f35a9c2a 100644
--- a/doc/source/etherpad.rst
+++ b/doc/source/etherpad.rst
@@ -52,6 +52,7 @@ With this secret we can make a request to get a token::
   curl --data grant_type=client_credentials \
        --data client_id=api_admin \
        --data client_secret="SECRETHERE" \
+       --data resource="http://localhost:9001" \
        http://localhost:9001/oidc/token
 
 This will return a Bearer token that is valid for one hour. You will need
diff --git a/docker/etherpad/Dockerfile b/docker/etherpad/Dockerfile
index 308e5db710..234b119019 100644
--- a/docker/etherpad/Dockerfile
+++ b/docker/etherpad/Dockerfile
@@ -45,7 +45,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     rm -rf /var/lib/apt/lists/*
 RUN npm install -g pnpm@latest
 RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
-RUN git checkout v2.3.0
+RUN git checkout v2.3.2
 RUN pnpm install
 RUN pnpm run build:ui
 
@@ -152,7 +152,7 @@ USER etherpad
 
 RUN git clone https://github.com/ether/etherpad-lite ${EP_DIR}
 WORKDIR "${EP_DIR}"
-RUN git checkout v2.3.0
+RUN git checkout v2.3.2
 
 # Upstream differentiates between a build copy and a build git source
 # for building etherpad. We only do build_git.
diff --git a/testinfra/test_etherpad.py b/testinfra/test_etherpad.py
index 61820bd674..dd1c0a8f28 100644
--- a/testinfra/test_etherpad.py
+++ b/testinfra/test_etherpad.py
@@ -46,6 +46,7 @@ def _get_bearer_token(host):
     secret = cmd.stdout.strip()
     cmd = host.run('curl --data grant_type=client_credentials '
                    '--data client_id=api_admin --data client_secret="%s" '
+                   '--data resource="http://localhost:9001/" '
                    'http://localhost:9001/oidc/token' % secret)
     ret = json.loads(cmd.stdout)
     assert ret['token_type'] == 'Bearer'