forked from openhab/openhab-addons
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[icloud] Rework authentication to reflect changes in iCloud API (open…
…hab#13691) * Implement Authentication (WIP) * Validation Code accepted * Refactor session state * RefreshClient working * Implement session persistence in openhab store * Integration in binding * Remove persistent cookies, which break authentication * Bugfixing * Add code configuration to UI * Improve documentation, error-handling and cleanup * Rework auth order * Rework auth process * Add 2-FA-auth to documentation * Set bridge to online if data refresh works * Case-sensitive rename ICloudAPIResponseException * Include authentication in refresh flow * Fix regression for data not being updated * Fix typo in i18n props * Fix review and checkstyle. * More javadoc, new RetryException * Introduce @NonNullByDefault * Introduce server for RetryException, add NonNullbyDefault, fix warnings * Rework for contribution, e.g. null checks, ... * Fix checkstyle * Move JsonUtils to utilities package * Async initialize bridge handler. * Report Device OFFLINE if Bridge is OFFLINE * Set bridge thing status to UNKOWN in init * Move refresh init into async init * Cancel init task in dispose Also-by: Leo Siepel <leosiepel@gmail.com> Signed-off-by: Simon Spielmann <simon.spielmann@gmx.de>
- Loading branch information
Showing
34 changed files
with
1,733 additions
and
532 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
....icloud/src/main/java/org/openhab/binding/icloud/internal/FindMyIPhoneServiceManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /** | ||
| * Copyright (c) 2010-2022 Contributors to the openHAB project | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| */ | ||
| package org.openhab.binding.icloud.internal; | ||
|
|
||
| import java.io.IOException; | ||
| import java.net.URI; | ||
| import java.util.Map; | ||
|
|
||
| import org.eclipse.jdt.annotation.NonNullByDefault; | ||
| import org.openhab.binding.icloud.internal.utilities.JsonUtils; | ||
|
|
||
| /** | ||
| * This class gives access to the find my iPhone (FMIP) service. | ||
| * | ||
| * @author Simon Spielmann - Initial Contribution. | ||
| */ | ||
| @NonNullByDefault | ||
| public class FindMyIPhoneServiceManager { | ||
|
|
||
| private ICloudSession session; | ||
|
|
||
| private URI fmipRefreshUrl; | ||
|
|
||
| private URI fmipSoundUrl; | ||
|
|
||
| private static final String FMIP_ENDPOINT = "/fmipservice/client/web"; | ||
|
|
||
| /** | ||
| * The constructor. | ||
| * | ||
| * @param session {@link ICloudSession} to use for API calls. | ||
| * @param serviceRoot Root URL for FMIP service. | ||
| */ | ||
| public FindMyIPhoneServiceManager(ICloudSession session, String serviceRoot) { | ||
| this.session = session; | ||
| this.fmipRefreshUrl = URI.create(serviceRoot + FMIP_ENDPOINT + "/refreshClient"); | ||
| this.fmipSoundUrl = URI.create(serviceRoot + FMIP_ENDPOINT + "/playSound"); | ||
| } | ||
|
|
||
| /** | ||
| * Receive client information as JSON. | ||
| * | ||
| * @return Information about all clients as JSON | ||
| * {@link org.openhab.binding.icloud.internal.handler.dto.json.response.ICloudDeviceInformation}. | ||
| * | ||
| * @throws IOException if I/O error occurred | ||
| * @throws InterruptedException if this blocking request was interrupted | ||
| * @throws ICloudApiResponseException if the request failed (e.g. not OK HTTP return code) | ||
| * | ||
| */ | ||
| public String refreshClient() throws IOException, InterruptedException, ICloudApiResponseException { | ||
| Map<String, Object> request = Map.of("clientContext", | ||
| Map.of("fmly", true, "shouldLocate", true, "selectedDevice", "All", "deviceListVersion", 1)); | ||
| return session.post(this.fmipRefreshUrl.toString(), JsonUtils.toJson(request), null); | ||
| } | ||
|
|
||
| /** | ||
| * Play sound (find my iPhone) on given device. | ||
| * | ||
| * @param deviceId ID of the device to play sound on | ||
| * @throws IOException if I/O error occurred | ||
| * @throws InterruptedException if this blocking request was interrupted | ||
| * @throws ICloudApiResponseException if the request failed (e.g. not OK HTTP return code) | ||
| */ | ||
| public void playSound(String deviceId) throws IOException, InterruptedException, ICloudApiResponseException { | ||
| Map<String, Object> request = Map.of("device", deviceId, "fmyl", true, "subject", "Message from openHAB."); | ||
| session.post(this.fmipSoundUrl.toString(), JsonUtils.toJson(request), null); | ||
| } | ||
| } |
46 changes: 46 additions & 0 deletions
46
....icloud/src/main/java/org/openhab/binding/icloud/internal/ICloudApiResponseException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /** | ||
| * Copyright (c) 2010-2022 Contributors to the openHAB project | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| */ | ||
| package org.openhab.binding.icloud.internal; | ||
|
|
||
| import org.eclipse.jdt.annotation.NonNullByDefault; | ||
|
|
||
| /** | ||
| * | ||
| * Exception for errors during calls of the iCloud API. | ||
| * | ||
| * @author Simon Spielmann - Initial contribution | ||
| */ | ||
| @NonNullByDefault | ||
| public class ICloudApiResponseException extends Exception { | ||
|
|
||
| private static final long serialVersionUID = 1L; | ||
| private int statusCode; | ||
|
|
||
| /** | ||
| * The constructor. | ||
| * | ||
| * @param url URL for which the exception occurred | ||
| * @param statusCode HTTP status code which was reported | ||
| */ | ||
| public ICloudApiResponseException(String url, int statusCode) { | ||
| super(String.format("Request %s failed with %s.", url, statusCode)); | ||
| this.statusCode = statusCode; | ||
| } | ||
|
|
||
| /** | ||
| * @return statusCode HTTP status code of failed request. | ||
| */ | ||
| public int getStatusCode() { | ||
| return this.statusCode; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 0 additions & 93 deletions
93
...ab.binding.icloud/src/main/java/org/openhab/binding/icloud/internal/ICloudConnection.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 0 additions & 36 deletions
36
...loud/src/main/java/org/openhab/binding/icloud/internal/ICloudDeviceInformationParser.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.