OpenHAB
/
openhab-addons
mirror of https://github.com/openhab/openhab-addons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[homeconnect] Remove the access token when the thing is removed (#14935) 

Related to #14818

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
pull/14945/head
lolodomo 2023-05-05 22:32:26 +02:00 committed by GitHub
parent 3ae72c92e5
commit 4e8e39cd9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bundles/org.openhab.binding.homeconnect/src/main/java/org/openhab/binding/homeconnect/internal/handler/HomeConnectBridgeHandler.java
View File

@ -84,7 +84,7 @@ public class HomeConnectBridgeHandler extends BaseBridgeHandler {
private @Nullable List<Event> eventHistory;
private @NonNullByDefault({}) OAuthClientService oAuthClientService;
private @NonNullByDefault({}) String oAuthServiceHandleId;
private @Nullable String oAuthServiceHandleId;
private @NonNullByDefault({}) HomeConnectApiClient apiClient;
private @NonNullByDefault({}) HomeConnectEventSourceClient eventSourceClient;
@ -221,6 +221,15 @@ public class HomeConnectBridgeHandler extends BaseBridgeHandler {
}
}
@Override
public void handleRemoval() {
String handleId = this.oAuthServiceHandleId;
if (handleId != null) {
oAuthFactory.deleteServiceAndAccessToken(handleId);
}
super.handleRemoval();
}
@Override
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singleton(HomeConnectDiscoveryService.class);
@ -285,7 +294,10 @@ public class HomeConnectBridgeHandler extends BaseBridgeHandler {
eventSourceClient.getLatestEvents().clear();
eventSourceClient.dispose(immediate);
oAuthFactory.ungetOAuthService(oAuthServiceHandleId);
String handleId = this.oAuthServiceHandleId;
if (handleId != null) {
oAuthFactory.ungetOAuthService(handleId);
}
homeConnectServlet.removeBridgeHandler(this);
}