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

Pushing PR #14123 to OH4 (#14140)

Browse Source 
Signed-off-by: clinique <gael@lhopital.org>
This commit is contained in:
Gaël L'hopital
2023-01-02 19:06:24 +01:00
committed by GitHub
parent ce6b331518
commit c7275c8946
6 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/config/ApiHandlerConfiguration.java
View File

@@ -29,6 +29,7 @@ public class ApiHandlerConfiguration {
public String clientSecret = "";
public String refreshToken = "";
public String webHookUrl = "";
public String webHookPostfix = "";
public int reconnectInterval = 300;
public ConfigurationLevel check() {

2
bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/ApiBridgeHandler.java
View File

@@ -160,7 +160,7 @@ public class ApiBridgeHandler extends BaseBridgeHandler {
SecurityApi securityApi = getRestManager(SecurityApi.class);
if (securityApi != null) {
WebhookServlet servlet = new WebhookServlet(this, httpService, deserializer, securityApi,
configuration.webHookUrl);
configuration.webHookUrl, configuration.webHookPostfix);
servlet.startListening();
this.webHookServlet = servlet;
}

6
bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/servlet/WebhookServlet.java
View File

@@ -50,21 +50,23 @@ public class WebhookServlet extends NetatmoServlet {
private final SecurityApi securityApi;
private final NADeserializer deserializer;
private final String webHookUrl;
private final String webHookPostfix;
private boolean hookSet = false;
public WebhookServlet(ApiBridgeHandler handler, HttpService httpService, NADeserializer deserializer,
SecurityApi securityApi, String webHookUrl) {
SecurityApi securityApi, String webHookUrl, String webHookPostfix) {
super(handler, httpService, "webhook");
this.deserializer = deserializer;
this.securityApi = securityApi;
this.webHookUrl = webHookUrl;
this.webHookPostfix = webHookPostfix;
}
@Override
public void startListening() {
super.startListening();
URI uri = UriBuilder.fromUri(webHookUrl).path(path).build();
URI uri = UriBuilder.fromUri(webHookUrl).path(path + webHookPostfix).build();
try {
logger.info("Setting up WebHook at Netatmo to {}", uri.toString());
hookSet = securityApi.addwebhook(uri);

5
bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/config/config.xml
View File

@@ -29,6 +29,11 @@
<description>@text/config.webHookUrl.description</description>
</parameter>
<parameter name="webHookPostfix" type="text" required="false">
<label>@text/config.webHookPostfix.label</label>
<description>@text/config.webHookPostfix.description</description>
</parameter>
<parameter name="reconnectInterval" type="integer" unit="s">
<label>@text/config.reconnectInterval.label</label>
<description>@text/config.reconnectInterval.description</description>

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

@@ -423,6 +423,8 @@ config.clientSecret.label = Client Secret
config.clientSecret.description = Client Secret provided for the application you created.
config.refreshToken.label = Refresh Token
config.refreshToken.description = Refresh token provided by the oAuth2 authentication process.
config.webHookPostfix.label = Webhook Postfix
config.webHookPostfix.description = String appended to the generated webhook address (should start with `/`).
config.webHookUrl.label = Webhook Address
config.webHookUrl.description = Protocol, public IP or hostname and port to access openHAB server from Internet.
config.reconnectInterval.label = Reconnect Interval