commit c7fab1816836c8b3f4f2bd4f04065fae1b9c0d50
author Vitaly Buka <vitalybuka@google.com> Mon Feb 29 16:59:31 2016 -0800
committer Vitaly Buka <vitalybuka@google.com> Tue Mar 01 01:23:58 2016 +0000
tree c387c6142da1ba77275ee75fa36bdff9be5d6917
parent b18bead3cc5cf1f53555a9bcb2442f1f72475f8c

Update _accessRevocationList trait

BUG: 27313743
Change-Id: I68977c7badb0f7ae747d3d4567211eded31b45a3
Reviewed-on: https://weave-review.googlesource.com/2789
Reviewed-by: Gene Gutnik <gene@google.com>

src/access_api_handler.cc

diff --git a/src/access_api_handler.cc b/src/access_api_handler.cc
index dcfae45..ce92437 100644
--- a/src/access_api_handler.cc
+++ b/src/access_api_handler.cc
@@ -24,7 +24,7 @@
 const char kApplicationId[] = "applicationId";
 const char kExpirationTime[] = "expirationTime";
 const char kRevocationTimestamp[] = "revocationTimestamp";
-const char kRevocationList[] = "revocationListEntries";
+const char kRevocationList[] = "revocationList";
 
 bool GetIds(const base::DictionaryValue& parameters,
             std::vector<uint8_t>* user_id_decoded,
@@ -57,7 +57,7 @@
   device_->AddTraitDefinitionsFromJson(R"({
     "_accessRevocationList": {
       "commands": {
-        "revoke": {
+        "add": {
           "minimalRole": "owner",
           "parameters": {
             "userId": {
@@ -78,7 +78,7 @@
           "minimalRole": "owner",
           "parameters": {},
           "results": {
-            "revocationEntriesList": {
+            "revocationList": {
               "type": "array",
               "items": {
                 "type": "object",
@@ -114,7 +114,7 @@
   UpdateState();
 
   device_->AddCommandHandler(
-      kComponent, "_accessRevocationList.revoke",
+      kComponent, "_accessRevocationList.add",
       base::Bind(&AccessApiHandler::Block, weak_ptr_factory_.GetWeakPtr()));
   device_->AddCommandHandler(
       kComponent, "_accessRevocationList.list",

src/access_api_handler_unittest.cc

diff --git a/src/access_api_handler_unittest.cc b/src/access_api_handler_unittest.cc
index fda0748..b58facd 100644
--- a/src/access_api_handler_unittest.cc
+++ b/src/access_api_handler_unittest.cc
@@ -44,7 +44,7 @@
         }));
 
     EXPECT_CALL(device_,
-                AddCommandHandler(_, AnyOf("_accessRevocationList.revoke",
+                AddCommandHandler(_, AnyOf("_accessRevocationList.add",
                                            "_accessRevocationList.list"),
                                   _))
         .WillRepeatedly(
@@ -95,7 +95,7 @@
 
   auto expected = R"({
     "commands": {
-      "revoke": {
+      "add": {
         "minimalRole": "owner",
         "parameters": {
           "userId": {
@@ -116,7 +116,7 @@
         "minimalRole": "owner",
         "parameters": {},
         "results": {
-          "revocationEntriesList": {
+          "revocationList": {
             "type": "array",
             "items": {
               "type": "object",
@@ -168,7 +168,7 @@
   EXPECT_CALL(access_manager_, GetSize()).WillRepeatedly(Return(1));
 
   AddCommand(R"({
-    'name' : '_accessRevocationList.revoke',
+    'name' : '_accessRevocationList.add',
     'component': 'accessControl',
     'parameters': {
       'userId': 'AQID',
@@ -199,7 +199,7 @@
   EXPECT_CALL(access_manager_, GetSize()).WillRepeatedly(Return(4));
 
   auto expected = R"({
-    "revocationListEntries": [ {
+    "revocationList": [ {
       "applicationId": "FRYX",
       "userId": "CwwN"
     }, {