ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve password handling and clean up in case the password is not valid.

Browse Source
This commit is contained in:
Simon Stürz 2022-02-21 09:44:57 +01:00
parent b6e9d7a1a1
commit 8c05586901
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sma/integrationpluginsma.cpp
View File

@ -186,13 +186,19 @@ void IntegrationPluginSma::confirmPairing(ThingPairingInfo *info, const QString
{ {
Q_UNUSED(username) Q_UNUSED(username)
// On speedwire the password length has a maximum of 12 characters
if (secret.count() > 12) {
info->finish(Thing::ThingErrorInvalidParameter, QT_TR_NOOP("The password can not be longer than 12 characters."));
return;
}
// Init with the default password // Init with the default password
QString password = "0000"; QString password = "0000";
if (!secret.isEmpty()) { if (!secret.isEmpty()) {
qCDebug(dcSma()) << "Pairing: Using password" << secret; qCDebug(dcSma()) << "Pairing: Using password" << secret;
password = secret; password = secret;
} else { } else {
qCDebug(dcSma()) << "Pairing: Secret is empty. Using default password" << password; qCDebug(dcSma()) << "Pairing: The given password is empty. Using default password" << password;
} }
// Just store details, we'll test the login in setupDevice // Just store details, we'll test the login in setupDevice
@ -315,6 +321,12 @@ void IntegrationPluginSma::setupThing(ThingSetupInfo *info)
connect(inverter, &SpeedwireInverter::loginFinished, info, [=](bool success){ connect(inverter, &SpeedwireInverter::loginFinished, info, [=](bool success){
if (!success) { if (!success) {
qCWarning(dcSma()) << "Failed to set up inverter. Wrong password."; qCWarning(dcSma()) << "Failed to set up inverter. Wrong password.";
// Remove invalid password from settings
pluginStorage()->beginGroup(info->thing()->id().toString());
pluginStorage()->remove("");
pluginStorage()->endGroup();
delete inverter; delete inverter;
info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("Failed to log in with the given password. Please try again.")); info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("Failed to log in with the given password. Please try again."));
return; return;
@ -329,7 +341,6 @@ void IntegrationPluginSma::setupThing(ThingSetupInfo *info)
// Make sure an aborted setup will clean up the object // Make sure an aborted setup will clean up the object
connect(info, &ThingSetupInfo::aborted, inverter, &SpeedwireInverter::deleteLater); connect(info, &ThingSetupInfo::aborted, inverter, &SpeedwireInverter::deleteLater);
// Runtime connections // Runtime connections
connect(inverter, &SpeedwireInverter::reachableChanged, thing, [=](bool reachable){ connect(inverter, &SpeedwireInverter::reachableChanged, thing, [=](bool reachable){
thing->setStateValue(speedwireInverterConnectedStateTypeId, reachable); thing->setStateValue(speedwireInverterConnectedStateTypeId, reachable);
@ -410,6 +421,7 @@ void IntegrationPluginSma::onConnectedChanged(bool connected)
Thing *thing = m_sunnyWebBoxes.key(static_cast<SunnyWebBox *>(sender())); Thing *thing = m_sunnyWebBoxes.key(static_cast<SunnyWebBox *>(sender()));
if (!thing) if (!thing)
return; return;
thing->setStateValue(sunnyWebBoxConnectedStateTypeId, connected); thing->setStateValue(sunnyWebBoxConnectedStateTypeId, connected);
} }
@ -446,6 +458,7 @@ void IntegrationPluginSma::setupRefreshTimer()
} }
foreach (SpeedwireInverter *inverter, m_speedwireInverters) { foreach (SpeedwireInverter *inverter, m_speedwireInverters) {
// Note: refresh will not be triggered if there is already a refresh process running
inverter->refresh(); inverter->refresh();
} }
}); });