From c2f13b16fed25ce7657f654bac92b8c5d225dfbf Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 23 Mar 2022 17:53:35 +0100 Subject: [PATCH] MecElectronics: Return proper error code on wrong authentication --- mecelectronics/integrationpluginmecelectronics.cpp | 6 ++++++ .../translations/5853701d-a335-4282-892f-f23670269505-de.ts | 5 +++++ .../5853701d-a335-4282-892f-f23670269505-en_US.ts | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/mecelectronics/integrationpluginmecelectronics.cpp b/mecelectronics/integrationpluginmecelectronics.cpp index 2078ac35..73bba846 100644 --- a/mecelectronics/integrationpluginmecelectronics.cpp +++ b/mecelectronics/integrationpluginmecelectronics.cpp @@ -93,7 +93,13 @@ void IntegrationPluginMecMeter::confirmPairing(ThingPairingInfo *info, const QSt connect(reply, &QNetworkReply::finished, info, [=](){ if (reply->error() != QNetworkReply::NoError) { qCWarning(dcMecElectronics()) << "Error connecting to mecmeter:" << reply->error() << reply->errorString(); + // Device responds with InternalServerError on wrong login + if (reply->error() == QNetworkReply::InternalServerError) { + info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("The login credentials are not valid.")); + return; + } info->finish(Thing::ThingErrorHardwareFailure); + return; } pluginStorage()->beginGroup(meterId); diff --git a/mecelectronics/translations/5853701d-a335-4282-892f-f23670269505-de.ts b/mecelectronics/translations/5853701d-a335-4282-892f-f23670269505-de.ts index adfd7688..d51202e5 100644 --- a/mecelectronics/translations/5853701d-a335-4282-892f-f23670269505-de.ts +++ b/mecelectronics/translations/5853701d-a335-4282-892f-f23670269505-de.ts @@ -8,6 +8,11 @@ Please enter your login credentials for the mecMeter. Bitte gib Deine Logindaten für das mecMeter ein. + + + The login credentials are not valid. + Die eingegebenen Login-Daten sind nicht korrekt. + mecElectronics diff --git a/mecelectronics/translations/5853701d-a335-4282-892f-f23670269505-en_US.ts b/mecelectronics/translations/5853701d-a335-4282-892f-f23670269505-en_US.ts index 54680200..532ea10f 100644 --- a/mecelectronics/translations/5853701d-a335-4282-892f-f23670269505-en_US.ts +++ b/mecelectronics/translations/5853701d-a335-4282-892f-f23670269505-en_US.ts @@ -8,6 +8,11 @@ Please enter your login credentials for the mecMeter. + + + The login credentials are not valid. + + mecElectronics