public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gardena] Adaptation of the login for API version 1.1 (#13050)

Browse Source 
* Adaptation of the login for API version 1.1
* Fixed logging statement
* Fixed logging message
* Reverted changes in the german translation

Signed-off-by: Gerhard Riegler <gerhard.riegler@gmail.com>
This commit is contained in:
Gerhard Riegler
2022-07-01 17:38:39 +02:00
committed by GitHub
parent b7df5abe8c
commit ad9b4fbf79
6 changed files with 31 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java
View File

@@ -241,11 +241,10 @@ public class GardenaSmartImpl implements GardenaSmart, GardenaSmartWebSocketList
PostOAuth2Response token = this.token;
if (token == null || token.isRefreshTokenExpired()) {
// new token
logger.debug("Gardena API login using password, reason: {}",
logger.debug("Gardena API login using apiSecret, reason: {}",
token == null ? "no token available" : "refresh token expired");
fields.add("grant_type", "password");
fields.add("username", config.getEmail());
fields.add("password", config.getPassword());
fields.add("grant_type", "client_credentials");
fields.add("client_secret", config.getApiSecret());
token = executeRequest(HttpMethod.POST, URL_API_TOKEN, fields, PostOAuth2Response.class);
token.postProcess();
this.token = token;

42
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/config/GardenaConfig.java
View File

@@ -24,8 +24,7 @@ import org.eclipse.jdt.annotation.Nullable;
public class GardenaConfig {
private static final Integer DEFAULT_CONNECTION_TIMEOUT = 10;
private @Nullable String email;
private @Nullable String password;
private @Nullable String apiSecret;
private @Nullable String apiKey;
private transient Integer connectionTimeout = DEFAULT_CONNECTION_TIMEOUT;
@@ -33,37 +32,23 @@ public class GardenaConfig {
public GardenaConfig() {
}
public GardenaConfig(String email, String password) {
this.email = email;
this.password = password;
public GardenaConfig(String apiKey, String apiSecret) {
this.apiKey = apiKey;
this.apiSecret = apiSecret;
}
/**
* Returns the email to connect to Gardena smart system.
* Returns the apiSecret to connect to Gardena smart system.
*/
public @Nullable String getEmail() {
return email;
public @Nullable String getApiSecret() {
return apiSecret;
}
/**
* Sets the email to connect to Gardena smart system.
* Sets the apiSecret to connect to Gardena smart system.
*/
public void setEmail(String email) {
this.email = email;
}
/**
* Returns the password to connect to Gardena smart system.
*/
public @Nullable String getPassword() {
return password;
}
/**
* Sets the password to connect to Gardena smart system.
*/
public void setPassword(String password) {
this.password = password;
public void setApiSecret(String apiSecret) {
this.apiSecret = apiSecret;
}
/**
@@ -98,17 +83,14 @@ public class GardenaConfig {
* Validate the config if email, password and apiKey is specified.
*/
public boolean isValid() {
final String email = this.email;
final String password = this.password;
final String apiSecret = this.apiSecret;
final String apiKey = this.apiKey;
return email != null && !email.isBlank() && password != null && !password.isBlank() && apiKey != null
&& !apiKey.isBlank();
return apiSecret != null && !apiSecret.isBlank() && apiKey != null && !apiKey.isBlank();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder(GardenaConfig.class.getSimpleName()).append("[");
sb.append("email: ").append(email).append(", ");
sb.append("connectionTimeout: ").append(connectionTimeout).append(", ");
sb.append("apiKey: ").append(apiKey);
return sb.append("]").toString();

6
bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena.properties
View File

@@ -38,10 +38,8 @@ thing-type.config.gardena.account.apiKey.label = API Key
thing-type.config.gardena.account.apiKey.description = The Gardena smart system integration API key
thing-type.config.gardena.account.connectionTimeout.label = Connection Timeout
thing-type.config.gardena.account.connectionTimeout.description = The timeout in seconds for connections to Gardena smart system integration API
thing-type.config.gardena.account.email.label = Email
thing-type.config.gardena.account.email.description = Email address for logging in to Gardena smart system
thing-type.config.gardena.account.password.label = Password
thing-type.config.gardena.account.password.description = Password for logging in to Gardena smart system
thing-type.config.gardena.account.apiSecret.label = API Secret
thing-type.config.gardena.account.apiSecret.description = The Gardena smart system integration API secret
# channel group types

2
bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/i18n/gardena_de.properties
View File

@@ -39,7 +39,7 @@ thing-type.config.gardena.account.apiKey.description = Der Gardena Smart System
thing-type.config.gardena.account.connectionTimeout.label = Verbindungszeitüberschreitung
thing-type.config.gardena.account.connectionTimeout.description = Der Timeout in Sekunden für Verbindungen zur Gardena Smart System Integrations API
thing-type.config.gardena.account.email.label = E-Mail
thing-type.config.gardena.account.email.description = E-Mail-Adresse für die Anmeldung im Gardena Smart System
thing-type.config.gardena.account.email.description = E-Mail-Adresse für die Anmeldung im Gardena Smart System
thing-type.config.gardena.account.password.label = Passwort
thing-type.config.gardena.account.password.description = Passwort zur Anmeldung im Gardena Smart System

10
bundles/org.openhab.binding.gardena/src/main/resources/OH-INF/thing/bridge.xml
View File

@@ -10,14 +10,10 @@
<description>The Gardena smart system account</description>
<config-description>
<parameter name="email" type="text" required="true">
<label>Email</label>
<description>Email address for logging in to Gardena smart system</description>
</parameter>
<parameter name="password" type="text" required="true">
<label>Password</label>
<parameter name="apiSecret" type="text" required="true">
<label>API Secret</label>
<context>password</context>
<description>Password for logging in to Gardena smart system</description>
<description>The Gardena smart system integration API secret</description>
</parameter>
<parameter name="apiKey" type="text" required="true">
<label>API Key</label>