mtan93/SmartThingsPublic
1
0
Fork 0
mirror of https://github.com/mtan93/SmartThingsPublic.git synced 2026-03-21 21:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1615 from jasonbio/netatmo-exceptions

Browse Source 
Netatmo Exceptions
This commit is contained in:
Jason Botello
2017-01-30 15:01:05 -08:00
committed by GitHub
parent 54da556c17 f334f6505a
commit 1383ab1e07
1 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy
View File

@@ -73,7 +73,7 @@ def authPage() {
return dynamicPage(name: "Credentials", title: "Authorize Connection", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) { return dynamicPage(name: "Credentials", title: "Authorize Connection", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) {
section() { section() {
paragraph "Tap below to log in to the netatmo and authorize SmartThings access." paragraph "Tap below to log in to the netatmo and authorize SmartThings access."
href url:redirectUrl, style:"embedded", required:false, title:"Connect to ${getVendorName()}:", description:description href url:redirectUrl, style:"embedded", required:false, title:"Connect to ${getVendorName()}", description:description
} }
} }
} else { } else {
@@ -146,19 +146,24 @@ def callback() {
// log.debug "PARAMS: ${params}" // log.debug "PARAMS: ${params}"
httpPost(params) { resp -> try {
httpPost(params) { resp ->
def slurper = new JsonSlurper() def slurper = new JsonSlurper()
resp.data.each { key, value -> resp.data.each { key, value ->
def data = slurper.parseText(key) def data = slurper.parseText(key)
log.debug "Data: $data"
state.refreshToken = data.refresh_token state.refreshToken = data.refresh_token
state.authToken = data.access_token state.authToken = data.access_token
state.tokenExpires = now() + (data.expires_in * 1000) //state.accessToken = data.access_token
// log.debug "swapped token: $resp.data" state.tokenExpires = now() + (data.expires_in * 1000)
} // log.debug "swapped token: $resp.data"
} }
}
} catch (Exception e) {
log.debug "callback: Call failed $e"
}
// Handle success and failure here, and render stuff accordingly // Handle success and failure here, and render stuff accordingly
if (state.authToken) { if (state.authToken) {
@@ -387,18 +392,18 @@ def getDeviceList() {
state.deviceDetail = [:] state.deviceDetail = [:]
state.deviceState = [:] state.deviceState = [:]
apiGet("/api/devicelist") { response -> apiGet("/api/getstationsdata") { response ->
response.data.body.devices.each { value -> response.data.body.devices.each { value ->
def key = value._id def key = value._id
deviceList[key] = "${value.station_name}: ${value.module_name}" deviceList[key] = "${value.station_name}: ${value.module_name}"
state.deviceDetail[key] = value state.deviceDetail[key] = value
state.deviceState[key] = value.dashboard_data state.deviceState[key] = value.dashboard_data
} value.modules.each { value2 ->
response.data.body.modules.each { value -> def key2 = value2._id
def key = value._id deviceList[key2] = "${value.station_name}: ${value2.module_name}"
deviceList[key] = "${state.deviceDetail[value.main_device].station_name}: ${value.module_name}" state.deviceDetail[key2] = value2
state.deviceDetail[key] = value state.deviceState[key2] = value2.dashboard_data
state.deviceState[key] = value.dashboard_data }
} }
} }
@@ -448,6 +453,7 @@ def listDevices() {
} }
def apiGet(String path, Map query, Closure callback) { def apiGet(String path, Map query, Closure callback) {
if(now() >= state.tokenExpires) { if(now() >= state.tokenExpires) {
refreshToken(); refreshToken();
} }
@@ -467,12 +473,16 @@ def apiGet(String path, Map query, Closure callback) {
} catch (Exception e) { } catch (Exception e) {
// This is most likely due to an invalid token. Try to refresh it and try again. // This is most likely due to an invalid token. Try to refresh it and try again.
log.debug "apiGet: Call failed $e" log.debug "apiGet: Call failed $e"
if(refreshToken()) { if(refreshToken()) {
log.debug "apiGet: Trying again after refreshing token" log.debug "apiGet: Trying again after refreshing token"
httpGet(params) { response -> try {
callback.call(response) httpGet(params) { response ->
} callback.call(response)
} }
} catch (Exception f) {
log.debug "apiGet: Call failed $f"
}
}
} }
} }