diff --git a/apps/events/CHANGELOG.md b/apps/events/CHANGELOG.md
index 628ba53..7d28a8e 100644
--- a/apps/events/CHANGELOG.md
+++ b/apps/events/CHANGELOG.md
@@ -7,6 +7,20 @@ and this project follows [Semantic Versioning](https://semver.org/).
## [Unreleased]
+## [1.47.4] - 2026-10-28
+
+### Fixed
+
+- **Update requested, then a newer version came out** — the Licence page said the newer version
+ was requested ("Version 1.47.3 is available. Update requested …") when the request was for an
+ older one, and there was no way to ask for the newer version; the update banner stayed hidden.
+ Now it shows the request ("You asked for version 1.47.0 on …") and, below it, that a newer
+ version has come out with **Ask for 1.47.3 instead** (Withdraw request stays). The banner shows
+ again and says to change the request. Changing it is audited as `hub_update_requested` with
+ `changedFrom`.
+- With Cross Events Hub 1.5.0 the Hub moves the open request on to the new version and emails the
+ provider once; with an older Hub the site withdraws the request and makes it again.
+
## [1.47.3] - 2026-10-28
### Added
diff --git a/apps/events/FEATURES.md b/apps/events/FEATURES.md
index d46259e..c4035c5 100644
--- a/apps/events/FEATURES.md
+++ b/apps/events/FEATURES.md
@@ -814,7 +814,8 @@ can't start, the same jobs run on in-process timers.
created or edited; no new registrations or payments; tickets still scan, data can be exported).
The site checks in 30 seconds after starting and after a licence key is connected. Admins see when an update is available, with
**what's new** in each version, and press **Request update**, which tells the provider through the Hub (the site never updates
- itself). A request can be **withdrawn**. **Not now** hides the update banner until the next version; urgent updates (security or
+ itself). A request can be **withdrawn**; when a newer version comes out after asking, the page shows
+ the version asked for and **Ask for … instead** moves the request on to the newer one. **Not now** hides the update banner until the next version; urgent updates (security or
serious bug fixes) can't be put off and show a red banner.
- **Notices from the provider** — maintenance and other messages the provider posts in the Hub show as a banner on the dashboard
for site admins and supervisors, in their time window; each can be closed (per browser) and stays listed on Site settings →
diff --git a/apps/events/WHATS-NEW.md b/apps/events/WHATS-NEW.md
index b539934..cdf5fc2 100644
--- a/apps/events/WHATS-NEW.md
+++ b/apps/events/WHATS-NEW.md
@@ -12,6 +12,12 @@ Write for church admins, not developers: no environment variables, endpoints or
developer log is CHANGELOG.md. A tagged version without a section here shows "No details given".
-->
+## 1.47.4
+
+- **Asked for an update, and a newer one came out?** The Licence page now shows which version you
+ asked for, tells you when a newer one is out, and lets you ask for that one instead with one
+ button.
+
## 1.47.3
- **Season passes.** Sell a ticket for several events in a series at one price — say all of next
diff --git a/apps/events/backend/package-lock.json b/apps/events/backend/package-lock.json
index 957df77..ac33d12 100644
--- a/apps/events/backend/package-lock.json
+++ b/apps/events/backend/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "event-management-backend",
- "version": "1.47.3",
+ "version": "1.47.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "event-management-backend",
- "version": "1.47.3",
+ "version": "1.47.4",
"hasInstallScript": true,
"dependencies": {
"@prisma/adapter-pg": "^7.10.1",
diff --git a/apps/events/backend/package.json b/apps/events/backend/package.json
index 52b258a..17824cc 100644
--- a/apps/events/backend/package.json
+++ b/apps/events/backend/package.json
@@ -1,6 +1,6 @@
{
"name": "event-management-backend",
- "version": "1.47.3",
+ "version": "1.47.4",
"description": "Event Management System Backend",
"main": "src/index.js",
"scripts": {
diff --git a/apps/events/backend/src/controllers/hubController.js b/apps/events/backend/src/controllers/hubController.js
index 67640f3..0fef3d7 100644
--- a/apps/events/backend/src/controllers/hubController.js
+++ b/apps/events/backend/src/controllers/hubController.js
@@ -13,10 +13,13 @@ function compareVersions(a, b) {
return 0;
}
-/** An update request still waiting: until this site runs the version that was asked for. */
-function pendingUpdateRequest(version, requestedAt, requestedVersion) {
+/**
+ * An update request still waiting: until this site runs the version that was asked for.
+ * `outdated`: a newer version than the one asked for is out, so the request can be changed to it.
+ */
+function pendingUpdateRequest(version, requestedAt, requestedVersion, latestVersion = null) {
if (!requestedAt || !requestedVersion || compareVersions(version, requestedVersion) >= 0) return null;
- return { requestedAt, version: requestedVersion };
+ return { requestedAt, version: requestedVersion, outdated: !!latestVersion && compareVersions(latestVersion, requestedVersion) > 0 };
}
const str = (v, max) => String(v ?? '').slice(0, max);
@@ -87,7 +90,7 @@ async function statusPayload({ fresh = false } = {}) {
urgentUpdate,
updateSnoozed: updateAvailable && updateSnoozed({ latestVersion: s.latestVersion, snoozedVersion: s.updateSnoozedVersion, urgent: urgentUpdate }),
releases,
- updateRequest: pendingUpdateRequest(APP_VERSION, s.updateRequestedAt, s.updateRequestedVersion),
+ updateRequest: pendingUpdateRequest(APP_VERSION, s.updateRequestedAt, s.updateRequestedVersion, s.latestVersion),
notices: activeNotices(s.notices),
};
}
@@ -139,8 +142,11 @@ const heartbeatNow = async (req, res) => {
const requestUpdate = async (req, res) => {
try {
const result = await hub.requestUpdate();
- if (!result.alreadyRequested) {
- logAdminAction({ actorId: req.user.id, actorRole: req.user.role, action: 'hub_update_requested', targetType: 'hub', metadata: { from: APP_VERSION, to: result.version }, ip: getClientIp(req) });
+ if (!result.alreadyRequested || result.changed) {
+ logAdminAction({
+ actorId: req.user.id, actorRole: req.user.role, action: 'hub_update_requested', targetType: 'hub',
+ metadata: { from: APP_VERSION, to: result.version, ...(result.changed ? { changedFrom: result.previousVersion || null } : {}) }, ip: getClientIp(req),
+ });
}
res.json(await statusPayload({ fresh: true }));
} catch (e) {
diff --git a/apps/events/backend/src/hub/client.js b/apps/events/backend/src/hub/client.js
index 69dad0d..4b5dc4c 100644
--- a/apps/events/backend/src/hub/client.js
+++ b/apps/events/backend/src/hub/client.js
@@ -145,17 +145,36 @@ async function heartbeat() {
}
}
+/** a < b as x.y.z versions. */
+function olderThan(a, b) {
+ const pa = String(a || '').split('.').map(n => parseInt(n, 10) || 0);
+ const pb = String(b || '').split('.').map(n => parseInt(n, 10) || 0);
+ for (let i = 0; i < 3; i++) if (pa[i] !== pb[i]) return pa[i] < pb[i];
+ return false;
+}
+
/**
* Ask the Hub for this site to be updated (§3a). Joshua is told; the site never updates itself.
- * Returns { requestedAt, version, alreadyRequested }.
+ * Asking again after a newer version came out moves the request on to it (`changed`). A Hub before
+ * 1.5.0 can't do that (it doesn't send `changed`), so the old request is withdrawn and made again.
+ * Returns { requestedAt, version, alreadyRequested, changed, previousVersion }.
*/
async function requestUpdate() {
- let data;
- try {
- data = await signedPost('/api/installs/update-request', { protocolVersion: PROTOCOL_VERSION, version: report.APP_VERSION });
- } catch (e) {
- if (e.code === 'NOT_FOUND') throw new HubError('The Hub doesn\'t take update requests yet. Please contact your provider.', 'NOT_SUPPORTED', 502);
- throw e;
+ const ask = async () => {
+ try {
+ return await signedPost('/api/installs/update-request', { protocolVersion: PROTOCOL_VERSION, version: report.APP_VERSION });
+ } catch (e) {
+ if (e.code === 'NOT_FOUND') throw new HubError('The Hub doesn\'t take update requests yet. Please contact your provider.', 'NOT_SUPPORTED', 502);
+ throw e;
+ }
+ };
+ let data = await ask();
+ if (data.alreadyRequested && data.changed === undefined) {
+ const asked = (await read(['hub_update_requested_version'])).hub_update_requested_version || null;
+ if (!asked || olderThan(asked, data.version)) {
+ await cancelUpdateRequest();
+ data = { ...(await ask()), changed: true, previousVersion: asked };
+ }
}
await save({ hub_update_requested_at: data.requestedAt, hub_update_requested_version: data.version || null });
return data;
diff --git a/apps/events/backend/tests/hub.test.js b/apps/events/backend/tests/hub.test.js
index 0092a90..f5dbafb 100644
--- a/apps/events/backend/tests/hub.test.js
+++ b/apps/events/backend/tests/hub.test.js
@@ -148,12 +148,18 @@ test('version comparison for "update available"', () => {
test('an update request shows until the site runs the version asked for', () => {
const at = '2026-10-27T09:00:00.000Z';
- expect(pendingUpdateRequest('1.41.2', at, '1.42.0')).toEqual({ requestedAt: at, version: '1.42.0' });
+ expect(pendingUpdateRequest('1.41.2', at, '1.42.0')).toEqual({ requestedAt: at, version: '1.42.0', outdated: false });
expect(pendingUpdateRequest('1.42.0', at, '1.42.0')).toBeNull();
expect(pendingUpdateRequest('1.43.0', at, '1.42.0')).toBeNull();
expect(pendingUpdateRequest('1.41.2', null, null)).toBeNull();
});
+test('a request for a version that has since been overtaken can be changed', () => {
+ const at = '2026-10-27T09:00:00.000Z';
+ expect(pendingUpdateRequest('1.46.2', at, '1.47.0', '1.47.3')).toEqual({ requestedAt: at, version: '1.47.0', outdated: true });
+ expect(pendingUpdateRequest('1.46.2', at, '1.47.3', '1.47.3')).toEqual({ requestedAt: at, version: '1.47.3', outdated: false });
+});
+
describe("what's new", () => {
const releases = [
{ version: '1.46.0', notes: 'Older', urgent: false, releasedAt: '2026-10-20T10:00:00.000Z' },
diff --git a/apps/events/backend/tests/hubUpdateRequest.test.js b/apps/events/backend/tests/hubUpdateRequest.test.js
new file mode 100644
index 0000000..b37c2ec
--- /dev/null
+++ b/apps/events/backend/tests/hubUpdateRequest.test.js
@@ -0,0 +1,67 @@
+// Asking for an update again after a newer version came out: the request moves on to it — on the
+// Hub itself (1.5.0, `changed`), or by withdrawing and asking again with an older Hub.
+const mockSettings = new Map();
+jest.mock('../src/config/db', () => ({
+ appSetting: {
+ findMany: jest.fn(async ({ where }) => [...mockSettings].filter(([key]) => where.key.in.includes(key)).map(([key, value]) => ({ key, value }))),
+ upsert: jest.fn(async ({ where, create }) => { mockSettings.set(where.key, create.value); }),
+ deleteMany: jest.fn(async ({ where }) => { mockSettings.delete(where.key); }),
+ },
+}));
+jest.mock('../src/hub/report', () => ({ APP_VERSION: '1.46.2' }));
+
+const { encrypt } = require('../src/utils/encryption');
+const hub = require('../src/hub/client');
+
+const reply = (status, body) => ({ ok: status < 400, status, json: async () => body });
+
+describe('changing an update request', () => {
+ let calls;
+ beforeEach(() => {
+ mockSettings.clear();
+ mockSettings.set('hub_install_id', 'install-1');
+ mockSettings.set('hub_install_secret', encrypt('secret'));
+ mockSettings.set('hub_update_requested_at', '2026-10-20T09:00:00.000Z');
+ mockSettings.set('hub_update_requested_version', '1.47.0');
+ calls = [];
+ });
+ afterEach(() => { delete global.fetch; });
+
+ test('Hub 1.5.0 moves the open request on to the latest version', async () => {
+ global.fetch = jest.fn(async url => {
+ calls.push(new URL(url).pathname);
+ return reply(200, { requestedAt: '2026-10-28T09:00:00.000Z', version: '1.47.3', alreadyRequested: true, changed: true, previousVersion: '1.47.0' });
+ });
+ const out = await hub.requestUpdate();
+ expect(calls).toEqual(['/api/installs/update-request']);
+ expect(out).toMatchObject({ version: '1.47.3', changed: true, previousVersion: '1.47.0' });
+ expect(mockSettings.get('hub_update_requested_version')).toBe('1.47.3');
+ expect(mockSettings.get('hub_update_requested_at')).toBe('2026-10-28T09:00:00.000Z');
+ });
+
+ test('an older Hub (no `changed`): the old request is withdrawn and made again', async () => {
+ let open = true;
+ global.fetch = jest.fn(async url => {
+ const path = new URL(url).pathname;
+ calls.push(path);
+ if (path.endsWith('/cancel')) { open = false; return reply(200, { cancelled: true }); }
+ return open
+ ? reply(200, { requestedAt: '2026-10-20T09:00:00.000Z', version: '1.47.3', alreadyRequested: true })
+ : reply(201, { requestedAt: '2026-10-28T09:00:00.000Z', version: '1.47.3', alreadyRequested: false });
+ });
+ const out = await hub.requestUpdate();
+ expect(calls).toEqual(['/api/installs/update-request', '/api/installs/update-request/cancel', '/api/installs/update-request']);
+ expect(out).toMatchObject({ version: '1.47.3', changed: true, previousVersion: '1.47.0' });
+ expect(mockSettings.get('hub_update_requested_version')).toBe('1.47.3');
+ });
+
+ test('asking again for the version already asked for changes nothing', async () => {
+ mockSettings.set('hub_update_requested_version', '1.47.3');
+ global.fetch = jest.fn(async url => {
+ calls.push(new URL(url).pathname);
+ return reply(200, { requestedAt: '2026-10-20T09:00:00.000Z', version: '1.47.3', alreadyRequested: true });
+ });
+ await hub.requestUpdate();
+ expect(calls).toEqual(['/api/installs/update-request']);
+ });
+});
diff --git a/apps/events/docs/HANDOVER.md b/apps/events/docs/HANDOVER.md
index 587f25e..e54977f 100644
--- a/apps/events/docs/HANDOVER.md
+++ b/apps/events/docs/HANDOVER.md
@@ -1,6 +1,6 @@
# Handover — where things stand and how to carry on
-Last updated: 2026-10-28, after **1.47.3** (and Hub 1.4.0). The plan itself is in
+Last updated: 2026-10-28, after **1.47.4** (and Hub 1.5.0). The plan itself is in
[ROADMAP-v2.md](./ROADMAP-v2.md) (decisions table at the end); the previous round of
features is in [FEATURES-ROUND-1.md](./FEATURES-ROUND-1.md).
@@ -14,6 +14,7 @@ encrypted settings unreadable or break existing installs.
| Version | What |
|---------|------|
+| 1.47.4 | Fix: an update request for a version that has since been overtaken shows as such, with **Ask for … instead** (and the banner again). Hub 1.5.0 moves the open request on (`changed`); with an older Hub `requestUpdate` withdraws and asks again |
| 1.47.3 | **Season passes** (§6 part 4): passes on the Event series page, buy on the series page (a registration per event, one checkout), price split by normal prices, one Payment per event from the webhook. Migration `20261028150000_season_pass` |
| 1.47.2 | **Series: year on year** report (§6 part 3): `GET /api/series/:id/compare` (`compareSeries` in `utils/series.js`), report `seriesComparison` in `ReportsV2`, "Compare" on the Event series page |
| 1.47.1 | **Event series** (§6 part 2): Event series page, Series box on events, public `/series/
Version {status.latestVersion} is available. Update requested on {fmt(status.updateRequest.requestedAt)} — your provider will install it.
- {status.connected && ( - ++ You asked for version {status.updateRequest.version} on {fmt(status.updateRequest.requestedAt)} — your provider will install it. +
+ {status.connected && ( + + )} +Version {status.latestVersion} has come out since. Ask for it instead, and your provider installs that one.
+ {status.connected && ( + + )} +