- 
- We have located your """ + getVendorName() + """ account.
-Tap 'Done' to process your credentials.
+ + + + +
+ ![Vendor icon]()
+
+
+ ${message}
- """
+ """
render contentType: 'text/html', data: html
}
-def receivedToken() {
- log.debug "In receivedToken"
-
- def html = """
-
-
-
-
-
+
+ ${message}
- ![Vendor icon]()
-
-
-
-
-
- """
- render contentType: 'text/html', data: html
-}
-
-// "
-
def refreshToken() {
log.debug "In refreshToken"
@@ -308,8 +275,8 @@ def refreshToken() {
client_secret: getClientSecret(),
client_id: getClientId(),
grant_type: "refresh_token",
- refresh_token: state.vendorRefreshToken
- ]
+ refresh_token: state.refreshToken
+ ]
def tokenUrl = getVendorTokenPath()
def params = [
@@ -318,7 +285,7 @@ def refreshToken() {
body: oauthParams,
]
- /* OAuth Step 2: Request access token with our client Secret and OAuth "Code" */
+ // OAuth Step 2: Request access token with our client Secret and OAuth "Code"
try {
httpPost(params) { response ->
def slurper = new JsonSlurper();
@@ -327,9 +294,9 @@ def refreshToken() {
def data = slurper.parseText(key);
log.debug "Data: $data"
- state.vendorRefreshToken = data.refresh_token
- state.vendorAccessToken = data.access_token
- state.vendorTokenExpires = now() + (data.expires_in * 1000)
+ state.refreshToken = data.refresh_token
+ state.accessToken = data.access_token
+ state.tokenExpires = now() + (data.expires_in * 1000)
return true
}
@@ -338,9 +305,8 @@ def refreshToken() {
log.debug "Error: $e"
}
- log.debug "State: $state"
-
- if ( !state.vendorAccessToken ) { //We didn't get an access token
+ // We didn't get an access token
+ if ( !state.accessToken ) {
return false
}
}
@@ -482,13 +448,13 @@ def listDevices() {
}
def apiGet(String path, Map query, Closure callback) {
- if(now() >= state.vendorTokenExpires) {
+ if(now() >= state.tokenExpires) {
refreshToken();
}
- query['access_token'] = state.vendorAccessToken
+ query['access_token'] = state.accessToken
def params = [
- uri: apiUrl(),
+ uri: getApiUrl(),
path: path,
'query': query
]
diff --git a/smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy b/smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy
index 12cad96..6a1423d 100644
--- a/smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy
+++ b/smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy
@@ -370,9 +370,7 @@ def parse_api_response(resp, message) {
}
}
-def getServerUrl() {
- return "https://graph.api.smartthings.com"
-}
+def getServerUrl() { return getApiServerUrl() }
def debugEvent(message, displayEvent) {
def results = [
diff --git a/smartapps/roomieremote-roomieconnect/simple-control.src/simple-control.groovy b/smartapps/roomieremote-roomieconnect/simple-control.src/simple-control.groovy
index c2b3fdd..3b4bfaa 100644
--- a/smartapps/roomieremote-roomieconnect/simple-control.src/simple-control.groovy
+++ b/smartapps/roomieremote-roomieconnect/simple-control.src/simple-control.groovy
@@ -21,6 +21,12 @@ preferences()
section("Allow Simple Control to Monitor and Control These Things...")
{
input "switches", "capability.switch", title: "Which Switches?", multiple: true, required: false
+ input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
+ input "thermostats", "capability.thermostat", title: "Which Thermostats?", multiple: true, required: false
+ input "doorControls", "capability.doorControl", title: "Which Door Controls?", multiple: true, required: false
+ input "colorControls", "capability.colorControl", title: "Which Color Controllers?", multiple: true, required: false
+ input "musicPlayers", "capability.musicPlayer", title: "Which Music Players?", multiple: true, required: false
+ input "switchLevels", "capability.switchLevel", title: "Which Adjustable Switches?", multiple: true, required: false
}
page(name: "mainPage", title: "Simple Control Setup", content: "mainPage", refreshTimeout: 5)
@@ -31,12 +37,17 @@ preferences()
mappings {
path("/devices") {
+ action: [
+ GET: "getDevices"
+ ]
+ }
+ path("/:deviceType/devices") {
action: [
GET: "getDevices",
POST: "handleDevicesWithIDs"
]
- }
- path("/device/:id") {
+ }
+ path("/device/:deviceType/:id") {
action: [
GET: "getDevice",
POST: "updateDevice"
@@ -93,33 +104,40 @@ def handleDevicesWithIDs()
//log.debug("ids: ${ids}")
def command = data?.command
def arguments = data?.arguments
+ def type = params?.deviceType
+ //log.debug("device type: ${type}")
if (command)
{
- def success = false
+ def statusCode = 404
//log.debug("command ${command}, arguments ${arguments}")
for (devId in ids)
{
def device = allDevices.find { it.id == devId }
- if (device) {
- if (arguments) {
+ //log.debug("device: ${device}")
+ // Check if we have a device that responds to the specified command
+ if (validateCommand(device, type, command)) {
+ if (arguments) {
device."$command"(*arguments)
- } else {
- device."$command"()
- }
- success = true
+ }
+ else {
+ device."$command"()
+ }
+ statusCode = 200
} else {
- //log.debug("device not found ${devId}")
+ statusCode = 403
}
}
-
- if (success)
+ def responseData = "{}"
+ switch (statusCode)
{
- render status: 200, data: "{}"
- }
- else
- {
- render status: 404, data: '{"msg": "Device not found"}'
+ case 403:
+ responseData = '{"msg": "Access denied. This command is not supported by current capability."}'
+ break
+ case 404:
+ responseData = '{"msg": "Device not found"}'
+ break
}
+ render status: statusCode, data: responseData
}
else
{
@@ -164,25 +182,101 @@ def updateDevice()
def data = request.JSON
def command = data?.command
def arguments = data?.arguments
+ def type = params?.deviceType
+ //log.debug("device type: ${type}")
//log.debug("updateDevice, params: ${params}, request: ${data}")
if (!command) {
render status: 400, data: '{"msg": "command is required"}'
} else {
+ def statusCode = 404
def device = allDevices.find { it.id == params.id }
if (device) {
- if (arguments) {
- device."$command"(*arguments)
+ // Check if we have a device that responds to the specified command
+ if (validateCommand(device, type, command)) {
+ if (arguments) {
+ device."$command"(*arguments)
+ }
+ else {
+ device."$command"()
+ }
+ statusCode = 200
} else {
- device."$command"()
+ statusCode = 403
}
- render status: 204, data: "{}"
- } else {
- render status: 404, data: '{"msg": "Device not found"}'
}
+
+ def responseData = "{}"
+ switch (statusCode)
+ {
+ case 403:
+ responseData = '{"msg": "Access denied. This command is not supported by current capability."}'
+ break
+ case 404:
+ responseData = '{"msg": "Device not found"}'
+ break
+ }
+ render status: statusCode, data: responseData
}
}
+/**
+ * Validating the command passed by the user based on capability.
+ * @return boolean
+ */
+def validateCommand(device, deviceType, command) {
+ //log.debug("validateCommand ${command}")
+ def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
+ //log.debug("capabilityCommands: ${capabilityCommands}")
+ def currentDeviceCapability = getCapabilityName(deviceType)
+ //log.debug("currentDeviceCapability: ${currentDeviceCapability}")
+ if (capabilityCommands[currentDeviceCapability]) {
+ return command in capabilityCommands[currentDeviceCapability] ? true : false
+ } else {
+ // Handling other device types here, which don't accept commands
+ httpError(400, "Bad request.")
+ }
+}
+
+/**
+ * Need to get the attribute name to do the lookup. Only
+ * doing it for the device types which accept commands
+ * @return attribute name of the device type
+ */
+def getCapabilityName(type) {
+ switch(type) {
+ case "switches":
+ return "Switch"
+ case "locks":
+ return "Lock"
+ case "thermostats":
+ return "Thermostat"
+ case "doorControls":
+ return "Door Control"
+ case "colorControls":
+ return "Color Control"
+ case "musicPlayers":
+ return "Music Player"
+ case "switchLevels":
+ return "Switch Level"
+ default:
+ return type
+ }
+}
+
+/**
+ * Constructing the map over here of
+ * supported commands by device capability
+ * @return a map of device capability -> supported commands
+ */
+def getDeviceCapabilityCommands(deviceCapabilities) {
+ def map = [:]
+ deviceCapabilities.collect {
+ map[it.name] = it.commands.collect{ it.name.toString() }
+ }
+ return map
+}
+
def listSubscriptions()
{
//log.debug "listSubscriptions()"
@@ -361,7 +455,13 @@ def agentDiscovery(params=[:])
}
section("Allow Simple Control to Monitor and Control These Things...")
{
- input "switches", "capability.switch", title: "Which Switches?", multiple: true, required: false
+ input "switches", "capability.switch", title: "Which Switches?", multiple: true, required: false
+ input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
+ input "thermostats", "capability.thermostat", title: "Which Thermostats?", multiple: true, required: false
+ input "doorControls", "capability.doorControl", title: "Which Door Controls?", multiple: true, required: false
+ input "colorControls", "capability.colorControl", title: "Which Color Controllers?", multiple: true, required: false
+ input "musicPlayers", "capability.musicPlayer", title: "Which Music Players?", multiple: true, required: false
+ input "switchLevels", "capability.switchLevel", title: "Which Adjustable Switches?", multiple: true, required: false
}
}
}
@@ -672,5 +772,3 @@ def List getRealHubFirmwareVersions()
}
-
-
diff --git a/smartapps/smartthings/button-controller.src/button-controller.groovy b/smartapps/smartthings/button-controller.src/button-controller.groovy
index 4759e54..283a4e3 100644
--- a/smartapps/smartthings/button-controller.src/button-controller.groovy
+++ b/smartapps/smartthings/button-controller.src/button-controller.groovy
@@ -297,8 +297,8 @@ private getTimeOk() {
def result = true
if (starting && ending) {
def currTime = now()
- def start = timeToday(starting).time
- def stop = timeToday(ending).time
+ def start = timeToday(starting, location.timeZone).time
+ def stop = timeToday(ending, location.timeZone).time
result = start < stop ? currTime >= start && currTime <= stop : currTime <= stop || currTime >= start
}
log.trace "timeOk = $result"
diff --git a/smartapps/smartthings/hue-connect.src/hue-connect.groovy b/smartapps/smartthings/hue-connect.src/hue-connect.groovy
index 95faa6f..0ebf042 100644
--- a/smartapps/smartthings/hue-connect.src/hue-connect.groovy
+++ b/smartapps/smartthings/hue-connect.src/hue-connect.groovy
@@ -323,6 +323,8 @@ private getDeviceType(hueType) {
return "Hue Bulb"
else if (hueType?.equalsIgnoreCase("Color Light"))
return "Hue Bloom"
+ else if (hueType?.equalsIgnoreCase("Color Temperature Light"))
+ return "Hue White Ambiance Bulb"
else
return null
}
diff --git a/smartapps/smartthings/its-too-cold.src/its-too-cold.groovy b/smartapps/smartthings/its-too-cold.src/its-too-cold.groovy
index 0e66cc3..8364c20 100644
--- a/smartapps/smartthings/its-too-cold.src/its-too-cold.groovy
+++ b/smartapps/smartthings/its-too-cold.src/its-too-cold.groovy
@@ -73,7 +73,8 @@ def temperatureHandler(evt) {
// TODO: Send "Temperature back to normal" SMS, turn switch off
} else {
log.debug "Temperature dropped below $tooCold: sending SMS to $phone1 and activating $mySwitch"
- send("${temperatureSensor1.displayName} is too cold, reporting a temperature of ${evt.value}${evt.unit?:"F"}")
+ def tempScale = location.temperatureScale ?: "F"
+ send("${temperatureSensor1.displayName} is too cold, reporting a temperature of ${evt.value}${evt.unit?:tempScale}")
switch1?.on()
}
}
diff --git a/smartapps/smartthings/its-too-hot.src/its-too-hot.groovy b/smartapps/smartthings/its-too-hot.src/its-too-hot.groovy
index e9c8c0f..5b8e10d 100644
--- a/smartapps/smartthings/its-too-hot.src/its-too-hot.groovy
+++ b/smartapps/smartthings/its-too-hot.src/its-too-hot.groovy
@@ -73,7 +73,8 @@ def temperatureHandler(evt) {
// TODO: Send "Temperature back to normal" SMS, turn switch off
} else {
log.debug "Temperature rose above $tooHot: sending SMS to $phone1 and activating $mySwitch"
- send("${temperatureSensor1.displayName} is too hot, reporting a temperature of ${evt.value}${evt.unit?:"F"}")
+ def tempScale = location.temperatureScale ?: "F"
+ send("${temperatureSensor1.displayName} is too hot, reporting a temperature of ${evt.value}${evt.unit?:tempScale}")
switch1?.on()
}
}
diff --git a/smartapps/smartthings/life360-connect.src/life360-connect.groovy b/smartapps/smartthings/life360-connect.src/life360-connect.groovy
index b5d6555..cf07750 100644
--- a/smartapps/smartthings/life360-connect.src/life360-connect.groovy
+++ b/smartapps/smartthings/life360-connect.src/life360-connect.groovy
@@ -27,7 +27,6 @@ definition(
) {
appSetting "clientId"
appSetting "clientSecret"
- appSetting "serverUrl"
}
preferences {
@@ -192,7 +191,7 @@ def getSmartThingsClientId() {
return "pREqugabRetre4EstetherufrePumamExucrEHuc"
}
-def getServerUrl() { appSettings.serverUrl }
+def getServerUrl() { getApiServerUrl() }
def buildRedirectUrl()
{
diff --git a/smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy b/smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy
index 5cdfdff..83b6cc6 100644
--- a/smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy
+++ b/smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy
@@ -339,7 +339,7 @@ def initialize() {
state.aux = 0
if (selectedhubs || selectedactivities) {
addDevice()
- runEvery5Minutes("discovery")
+ runEvery5Minutes("poll")
}
}
@@ -394,9 +394,9 @@ def discovery() {
}
} catch (java.net.SocketTimeoutException e) {
log.warn "Connection to the hub timed out. Please restart the hub and try again."
- state.resethub = true
+ state.resethub = true
} catch (e) {
- log.warn "Hostname in certificate didn't match. Please try again later."
+ log.info "Logitech Harmony - Error: $e"
}
return null
}
@@ -474,7 +474,7 @@ def activity(dni,mode) {
def poll() {
// GET THE LIST OF ACTIVITIES
if (state.HarmonyAccessToken) {
- getActivityList()
+ getActivityList()
def Params = [auth: state.HarmonyAccessToken]
def url = "https://home.myharmony.com/cloudapi/state?${toQueryString(Params)}"
try {
@@ -520,14 +520,17 @@ def poll() {
return "Poll completed $map - $state.hubs"
}
} catch (groovyx.net.http.HttpResponseException e) {
- if (e.statusCode == 401) { // token is expired
- state.remove("HarmonyAccessToken")
- return "Harmony Access token has expired"
- }
- } catch(Exception e) {
- log.trace e
- }
- }
+ if (e.statusCode == 401) { // token is expired
+ state.remove("HarmonyAccessToken")
+ log.warn "Harmony Access token has expired"
+ }
+ } catch (java.net.SocketTimeoutException e) {
+ log.warn "Connection to the hub timed out. Please restart the hub and try again."
+ state.resethub = true
+ } catch (e) {
+ log.info "Logitech Harmony - Error: $e"
+ }
+ }
}
diff --git a/smartapps/smartthings/ubi.src/ubi.groovy b/smartapps/smartthings/ubi.src/ubi.groovy
index a00f5ab..6e8d357 100644
--- a/smartapps/smartthings/ubi.src/ubi.groovy
+++ b/smartapps/smartthings/ubi.src/ubi.groovy
@@ -107,8 +107,8 @@ mappings {
path("/locks") {
action: [
GET: "listLocks",
- PUT: "updateLock",
- POST: "updateLock"
+ PUT: "updateLocks",
+ POST: "updateLocks"
]
}
path("/locks/:id") {
@@ -442,31 +442,87 @@ def executePhrase() {
}
private void updateAll(devices) {
+ def type = params.param1
def command = request.JSON?.command
- if (command)
- {
- command = command.toLowerCase()
- devices."$command"()
+ if (!devices) {
+ httpError(404, "Devices not found")
+ }
+ if (command){
+ devices.each { device ->
+ executeCommand(device, type, command)
+ }
}
}
private void update(devices) {
log.debug "update, request: ${request.JSON}, params: ${params}, devices: $devices.id"
- //def command = request.JSON?.command
- def command = params.command
- if (command)
- {
- command = command.toLowerCase()
- def device = devices.find { it.id == params.id }
- if (!device)
- {
+ def type = params.param1
+ def command = request.JSON?.command
+ def device = devices?.find { it.id == params.id }
+
+ if (!device) {
httpError(404, "Device not found")
- }
- else
- {
- device."$command"()
- }
}
+
+ if (command) {
+ executeCommand(device, type, command)
+ }
+}
+
+/**
+ * Validating the command passed by the user based on capability.
+ * @return boolean
+ */
+def validateCommand(device, deviceType, command) {
+ def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
+ def currentDeviceCapability = getCapabilityName(deviceType)
+ if (capabilityCommands[currentDeviceCapability]) {
+ return command in capabilityCommands[currentDeviceCapability] ? true : false
+ } else {
+ // Handling other device types here, which don't accept commands
+ httpError(400, "Bad request.")
+ }
+}
+
+/**
+ * Need to get the attribute name to do the lookup. Only
+ * doing it for the device types which accept commands
+ * @return attribute name of the device type
+ */
+def getCapabilityName(type) {
+ switch(type) {
+ case "switches":
+ return "Switch"
+ case "locks":
+ return "Lock"
+ default:
+ return type
+ }
+}
+
+/**
+ * Constructing the map over here of
+ * supported commands by device capability
+ * @return a map of device capability -> supported commands
+ */
+def getDeviceCapabilityCommands(deviceCapabilities) {
+ def map = [:]
+ deviceCapabilities.collect {
+ map[it.name] = it.commands.collect{ it.name.toString() }
+ }
+ return map
+}
+
+/**
+ * Validates and executes the command
+ * on the device or devices
+ */
+def executeCommand(device, type, command) {
+ if (validateCommand(device, type, command)) {
+ device."$command"()
+ } else {
+ httpError(403, "Access denied. This command is not supported by current capability.")
+ }
}
private show(devices, type) {
-
- Tap 'Done' to continue to Devices.
-