From 040eca1a1f9cad3e6d80a479769ed8dd5d70ca55 Mon Sep 17 00:00:00 2001 From: Sebastian Streich Date: Tue, 3 Sep 2024 19:06:18 +0200 Subject: [PATCH] EXT: Add the current client version (#9823) * add version info to the status * test that * fix test? * duh --- src/webextensionadapter.cpp | 1 + tests/functional/testWebExtensionApi.js | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/webextensionadapter.cpp b/src/webextensionadapter.cpp index 1ebae3f2e2..0c37650a34 100644 --- a/src/webextensionadapter.cpp +++ b/src/webextensionadapter.cpp @@ -132,6 +132,7 @@ QJsonObject WebExtensionAdapter::serializeStatus() { QJsonObject obj; obj["authenticated"] = App::isUserAuthenticated(); obj["location"] = locationObj; + obj["version"] = Constants::versionString(); obj["connectedSince"] = QString::number(vpn->controller()->connectionTimestamp()); { diff --git a/tests/functional/testWebExtensionApi.js b/tests/functional/testWebExtensionApi.js index 10b80853f8..eaa989f07a 100644 --- a/tests/functional/testWebExtensionApi.js +++ b/tests/functional/testWebExtensionApi.js @@ -12,7 +12,8 @@ const { getMessageStream, ExtensionMessage, readResponseOfType -} = require('./utils/webextension.js') +} = require('./utils/webextension.js'); + if(!vpn.runningOnWasm()) { @@ -23,8 +24,10 @@ describe('WebExtension API', function() { it('A Webextension can query the Status of the VPN', async () => { const sock = await connectExtension(); const messagePipe = getMessageStream(sock); + const statusPromise = readResponseOfType('status', messagePipe); sentToClient(new ExtensionMessage('status'), sock); - await readResponseOfType('status', messagePipe); + const msg = await statusPromise + assert(msg.status.version, `A Version is sent in msg: ${JSON.stringify(msg)}` ) sock.destroy(); }); it('A Webextension can activate the VPN', async () => {