MSA-1327: asd

PENG-158 UBI should not allow undefined commands

devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy

@@ -18,6 +18,7 @@ metadata {
 	definition (name: "Ecobee Sensor", namespace: "smartthings", author: "SmartThings") {
 		capability "Sensor"
 		capability "Temperature Measurement"
+		capability "Motion Sensor"
 		capability "Refresh"
 	}
 

devicetypes/smartthings/fibaro-smoke-sensor.src/fibaro-smoke-sensor.groovy

@@ -21,6 +21,7 @@ metadata {
         attribute "tamper", "enum", ["detected", "clear"]
         attribute "heatAlarm", "enum", ["overheat detected", "clear", "rapid temperature rise", "underheat detected"]
         fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x86, 0x72, 0x5A, 0x59, 0x85, 0x73, 0x84, 0x80, 0x71, 0x56, 0x70, 0x31, 0x8E, 0x22, 0x9C, 0x98, 0x7A", outClusters: "0x20, 0x8B"
+        fingerprint mfr:"010F", prod:"0C02", model:"1002"
     }
     simulator {
         //battery

devicetypes/smartthings/smartsense-multi.src/smartsense-multi.groovy

@@ -45,28 +45,17 @@ metadata {
 	}
 
 	preferences {
-		section {
-			input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
-			input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
-		}
-		section {
-			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", options: ["Yes", "No"], defaultValue: "No", required: false, displayDuringSetup: false)
-		}
+		input title: "Temperature Offset", description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph"
+		input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 	}
 
 	tiles(scale: 2) {
-		multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){
-			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
-				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
+		multiAttributeTile(name:"contact", type: "generic", width: 6, height: 4){
+			tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
 				attributeState "open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e"
-				attributeState "garage-closed", label:'Closed', icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821"
-				attributeState "garage-open", label:'Open', icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e"
+				attributeState "closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821"
 			}
 		}
-		standardTile("contact", "device.contact", width: 2, height: 2) {
-			state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
-			state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
-		}
 
 		standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
 			state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
@@ -89,8 +78,8 @@ metadata {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
 
-		main(["status", "acceleration", "temperature"])
-		details(["status", "acceleration", "temperature", "battery"])
+		main(["contact", "acceleration", "temperature"])
+		details(["contact", "acceleration", "temperature", "battery"])
 	}
 }
 
@@ -98,9 +87,7 @@ def parse(String description) {
 	def results
 
 	if (!isSupportedDescription(description) || zigbee.isZoneType19(description)) {
-		if (garageSensor != "Yes") {
-			results = parseSingleMessage(description)
-		}
+		results = parseSingleMessage(description)
 	}
 	else if (description == 'updated') {
 		//TODO is there a better way to handle this like the other device types?
@@ -216,9 +203,7 @@ private List parseContactMessage(String description) {
 	parts.each { part ->
 		part = part.trim()
 		if (part.startsWith('contactState:')) {
-			if (garageSensor != "Yes") {
-				results.addAll(getContactResult(part, description))
-			}
+			results.addAll(getContactResult(part, description))
 		}
 		else if (part.startsWith('accelerationState:')) {
 			results << getAccelerationResult(part, description)
@@ -240,29 +225,6 @@ private List parseContactMessage(String description) {
 	results
 }
 
-def updated() {
-	log.debug "updated called"
-	log.info "garage value : $garageSensor"
-	if (garageSensor == "Yes") {
-		def descriptionText = "Updating device to garage sensor"
-		if (device.latestValue("status") == "open") {
-			sendEvent(name: 'status', value: 'garage-open', descriptionText: descriptionText)
-		}
-		else if (device.latestValue("status") == "closed") {
-			sendEvent(name: 'status', value: 'garage-closed', descriptionText: descriptionText)
-		}
-	}
-	else {
-		def descriptionText = "Updating device to open/close sensor"
-		if (device.latestValue("status") == "garage-open") {
-			sendEvent(name: 'status', value: 'open', descriptionText: descriptionText)
-		}
-		else if (device.latestValue("status") == "garage-closed") {
-			sendEvent(name: 'status', value: 'closed', descriptionText: descriptionText)
-		}
-	}
-}
-
 private List parseOrientationMessage(String description) {
 	def results = []
 	def xyzResults = [x: 0, y: 0, z: 0]
@@ -292,34 +254,7 @@ private List parseOrientationMessage(String description) {
 		}
 	}
 
-	def xyz = getXyzResult(xyzResults, description)
-	results << xyz
-
-	if (garageSensor == "Yes") {
-		// Looks for Z-axis orientation as virtual contact state
-		def a = xyz.value.split(',').collect{it.toInteger()}
-		def absValueXY = Math.max(Math.abs(a[0]), Math.abs(a[1]))
-		def absValueZ = Math.abs(a[2])
-		log.debug "absValueXY: $absValueXY, absValueZ: $absValueZ"
-
-		def contactValue = null
-		def garageValue = null
-
-		if (absValueZ > 825 && absValueXY < 175) {
-			contactValue = 'open'
-			garageValue = 'garage-open'
-			log.debug "STATUS: open"
-		}
-		else if (absValueZ < 75 && absValueXY > 825) {
-			contactValue = 'closed'
-			garageValue = 'garage-closed'
-			log.debug "STATUS: closed"
-		}
-		def linkText = getLinkText(device)
-		def descriptionText = "${linkText} was ${contactValue == 'open' ? 'opened' : 'closed'}"
-		results << createEvent(name: "contact", value: contactValue, descriptionText: descriptionText, unit: "", displayed: false)
-		results << createEvent(name: "status", value: garageValue, descriptionText: descriptionText, unit: "")
-	}
+	results << getXyzResult(xyzResults, description)
 
 	results
 }

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) {

smartapps/vlaminck/-.src/-.groovy

@@ -0,0 +1,129 @@
+/**
+ *  Copyright 2015 SmartThings
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ *  Alfred Workflow
+ *
+ *  Author: SmartThings
+ */
+
+definition(
+    name: "김신동",
+    namespace: "vlaminck",
+    author: "SmartThings",
+    description: "This SmartApp allows you to interact with the things in your physical graph through Alfred.",
+    category: "Convenience",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/alfred-app.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/alfred-app@2x.png",
+    oauth: [displayName: "SmartThings Alfred Workflow", displayLink: ""]
+)
+
+preferences {
+	section("Allow Alfred to 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
+	}
+}
+
+mappings {
+	path("/switches") {
+		action: [
+			GET: "listSwitches",
+			PUT: "updateSwitches"
+		]
+	}
+	path("/switches/:id") {
+		action: [
+			GET: "showSwitch",
+			PUT: "updateSwitch"
+		]
+	}
+    path("/locks") {
+		action: [
+			GET: "listLocks",
+			PUT: "updateLocks"
+		]
+	}
+	path("/locks/:id") {
+		action: [
+			GET: "showLock",
+			PUT: "updateLock"
+		]
+	}
+}
+
+def installed() {}
+
+def updated() {}
+
+def listSwitches() {
+	switches.collect { device(it,"switch") }
+}
+void updateSwitches() {
+	updateAll(switches)
+}
+def showSwitch() {
+	show(switches, "switch")
+}
+void updateSwitch() {
+	update(switches)
+}
+
+def listLocks() {
+	locks.collect { device(it, "lock") }
+}
+void updateLocks() {
+	updateAll(locks)
+}
+def showLock() {
+	show(locks, "lock")
+}
+void updateLock() {
+	update(locks)
+}
+
+private void updateAll(devices) {
+	def command = request.JSON?.command
+	if (command) {
+		devices."$command"()
+	}
+}
+
+private void update(devices) {
+	log.debug "update, request: ${request.JSON}, params: ${params}, devices: $devices.id"
+	def command = request.JSON?.command
+	if (command) {
+		def device = devices.find { it.id == params.id }
+		if (!device) {
+			httpError(404, "Device not found")
+		} else {
+			device."$command"()
+		}
+	}
+}
+
+private show(devices, name) {
+	def device = devices.find { it.id == params.id }
+	if (!device) {
+		httpError(404, "Device not found")
+	}
+	else {
+		def s = device.currentState(name)
+		[id: device.id, label: device.displayName, name: device.displayName, state: s]
+	}
+}
+
+private device(it, name) {
+	if (it) {
+		def s = it.currentState(name)
+		[id: it.id, label: it.displayName, name: it.displayName, state: s]
+    }
+}