shlist

commit ca79ce97480565e7c28b5df55d8c8570827938b0
parent f2f817111e676616ef1077348050810581ff0d54
Author: David Engel <david@absentmindedproductions.ca>
Date:   Sat, 28 May 2016 15:51:02 -0400

Revert "server: check that received messages have a "data" key"

This reverts commit 27d9fe45f7e8f8699c511ac3480fc4a1068af0d6.

Diffstat:
M
server/sl
 | 
9
---------
M
server/t/zero_payload.t
 | 
4
++--

2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/server/sl b/server/sl
@@ -124,15 +124,6 @@ sub handle_message {
 		}
 	}
 
-	# Every message type needs a 'data' key
-	if (! exists $request->{data}) {
-		$logger->error("incoming request had no 'data' key\n");
-		send_msg($client_socket, $ver, $msg_type, make_error("missing 'data' key"));
-
-		$db->{dbh}->commit;
-		return;
-	}
-
 	# Call appropriate message handler. Each handler returns both data that
 	# should be sent back over the main socket and notification data that
 	# gets sent over vendor specific API.
diff --git a/server/t/zero_payload.t b/server/t/zero_payload.t
@@ -13,8 +13,8 @@ for ( $A->msg_str() ) {
 	my $msg_good = 'a missing message argument was required';
 	my $log_good = "/bad request, missing key 'device_id'/";
 	if ($_ eq 'device_add') {
-		$msg_good = "missing 'data' key";
-		$log_good = "/incoming request had no 'data' key/";
+		$msg_good = 'the sent phone number is not a number';
+		$log_good = "/phone number invalid/";
 	}
 
 	# Send empty dictionary