Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[myq] Switch to using OAuth for logins #11183

Merged
merged 9 commits into from
Sep 11, 2021
Merged

[myq] Switch to using OAuth for logins #11183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d92e9fc
change MyQ binding to use now required oAuth for authentication
digitaldan Aug 31, 2021
221e2c4
Clean up error handling
digitaldan Sep 1, 2021
724476a
Cleanup checkstyle errors
digitaldan Sep 1, 2021
1a6b981
missing newline
digitaldan Sep 1, 2021
96c8c40
Remove unused classes
digitaldan Sep 1, 2021
3290da3
Add token listener
digitaldan Sep 2, 2021
c982282
add a redirect limit...just in case
digitaldan Sep 3, 2021
a92487c
Don't resue the oAuth service if we have been disosed or its closed. …
digitaldan Sep 4, 2021
50deca6
Force login if we get a 401 response
digitaldan Sep 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bundles/org.openhab.binding.myq/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ https://www.eclipse.org/legal/epl-2.0/.
== Source Code

https://github.com/openhab/openhab-addons

== Third-party Content

jsoup
* License: MIT License
* Project: https://jsoup.org/
* Source: https://github.com/jhy/jsoup
8 changes: 8 additions & 0 deletions bundles/org.openhab.binding.myq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,12 @@

<name>openHAB Add-ons :: Bundles :: MyQ Binding</name>

<dependencies>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.8.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions bundles/org.openhab.binding.myq/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

<feature name="openhab-binding-myq" description="MyQ Binding" version="${project.version}">
<feature>openhab-runtime-base</feature>
<bundle dependency="true">mvn:org.jsoup/jsoup/1.8.3</bundle>
<bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.myq/${project.version}</bundle>
</feature>
</features>
8 changes: 6 additions & 2 deletions ...openhab.binding.myq/src/main/java/org/openhab/binding/myq/internal/MyQHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.openhab.binding.myq.internal.handler.MyQAccountHandler;
import org.openhab.binding.myq.internal.handler.MyQGarageDoorHandler;
import org.openhab.binding.myq.internal.handler.MyQLampHandler;
import org.openhab.core.auth.client.oauth2.OAuthFactory;
import org.openhab.core.io.net.http.HttpClientFactory;
import org.openhab.core.thing.Bridge;
import org.openhab.core.thing.Thing;
Expand All @@ -41,10 +42,13 @@
@Component(configurationPid = "binding.myq", service = ThingHandlerFactory.class)
public class MyQHandlerFactory extends BaseThingHandlerFactory {
private final HttpClient httpClient;
private OAuthFactory oAuthFactory;

@Activate
public MyQHandlerFactory(final @Reference HttpClientFactory httpClientFactory) {
public MyQHandlerFactory(final @Reference HttpClientFactory httpClientFactory,
final @Reference OAuthFactory oAuthFactory) {
this.httpClient = httpClientFactory.getCommonHttpClient();
this.oAuthFactory = oAuthFactory;
}

@Override
Expand All @@ -57,7 +61,7 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) {
ThingTypeUID thingTypeUID = thing.getThingTypeUID();

if (THING_TYPE_ACCOUNT.equals(thingTypeUID)) {
return new MyQAccountHandler((Bridge) thing, httpClient);
return new MyQAccountHandler((Bridge) thing, httpClient, oAuthFactory);
}

if (THING_TYPE_GARAGEDOOR.equals(thingTypeUID)) {
Expand Down
30 changes: 0 additions & 30 deletions ...enhab.binding.myq/src/main/java/org/openhab/binding/myq/internal/dto/LoginRequestDTO.java
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...nhab.binding.myq/src/main/java/org/openhab/binding/myq/internal/dto/LoginResponseDTO.java
View file
Open in desktop

This file was deleted.

Loading