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
This commit is contained in:
Clark Boylan
2025-06-25 08:16:51 -07:00
parent 820160765b
commit f3147b37c8
3 changed files with 4 additions and 2 deletions

View File

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

View File

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

View File

@@ -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'