Updated scope to int mapping

Change-Id: Ib58a48b8df5fb484c55cafbd3d99eafab6353dc1
Reviewed-on: https://weave-review.googlesource.com/1869
Reviewed-by: Vitaly Buka <vitalybuka@google.com>
Reviewed-by: Alex Vakulenko <avakulenko@google.com>

src/privet/auth_manager_unittest.cc

diff --git a/src/privet/auth_manager_unittest.cc b/src/privet/auth_manager_unittest.cc
index a022538..3347aa8 100644
--- a/src/privet/auth_manager_unittest.cc
+++ b/src/privet/auth_manager_unittest.cc
@@ -108,19 +108,19 @@
 }
 
 TEST_F(AuthManagerTest, GetRootDeviceToken) {
-  EXPECT_EQ("UJdl3l856QHDzlohsiGpxseCQgEARgMaVArkgA==",
+  EXPECT_EQ("UFTBUcgd9d0HnPRnLeroN2mCQgECRgMaVArkgA==",
             Base64Encode(auth_.GetRootDeviceToken(time_)));
 }
 
 TEST_F(AuthManagerTest, GetRootDeviceTokenDifferentTime) {
-  EXPECT_EQ("UHwWhChuQzQ+yb8gRGURu3GCQgEARgMaVB6rAA==",
+  EXPECT_EQ("UGKqwMYGQNOd8jeYFDOsM02CQgECRgMaVB6rAA==",
             Base64Encode(auth_.GetRootDeviceToken(
                 time_ + base::TimeDelta::FromDays(15))));
 }
 
 TEST_F(AuthManagerTest, GetRootDeviceTokenDifferentSecret) {
   AuthManager auth{kSecret2, {}};
-  EXPECT_EQ("UJW4F3R0YMeRctcu8aC6VpyCQgEARgMaVArkgA==",
+  EXPECT_EQ("UK1ACOc3cWGjGBoTIX2bd3qCQgECRgMaVArkgA==",
             Base64Encode(auth.GetRootDeviceToken(time_)));
 }
 

third_party/libuweave/src/macaroon_caveat.h

diff --git a/third_party/libuweave/src/macaroon_caveat.h b/third_party/libuweave/src/macaroon_caveat.h
index 78373c8..2e01742 100644
--- a/third_party/libuweave/src/macaroon_caveat.h
+++ b/third_party/libuweave/src/macaroon_caveat.h
@@ -21,14 +21,14 @@
   kUwMacaroonCaveatTypeIssued = 3,
   kUwMacaroonCaveatTypeTTL = 4,
   kUwMacaroonCaveatTypeExpiration = 5,
-  kUwMacaroonCaveatTypeSessionIdentifier = 16
+  kUwMacaroonCaveatTypeSessionIdentifier = 16,
 } UwMacaroonCaveatType;
 
 typedef enum {
-  kUwMacaroonCaveatScopeTypeOwner = 0,
-  kUwMacaroonCaveatScopeTypeManager = 1,
-  kUwMacaroonCaveatScopeTypeUser = 2,
-  kUwMacaroonCaveatScopeTypeViewer = 3,
+  kUwMacaroonCaveatScopeTypeOwner = 2,
+  kUwMacaroonCaveatScopeTypeManager = 8,
+  kUwMacaroonCaveatScopeTypeUser = 14,
+  kUwMacaroonCaveatScopeTypeViewer = 20,
 } UwMacaroonCaveatScopeType;
 
 bool uw_macaroon_caveat_create_without_value_(UwMacaroonCaveatType type,