Change user_id into string
Cloud users are going to be represented by strings, probably email
address. Integer prefix is used to avoid collisions between
pairing/anonymous and local users.
BUG=25768507
Change-Id: I27249c0b98f919e9527498be74ddaa82218b4041
Reviewed-on: https://weave-review.googlesource.com/2063
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
diff --git a/src/privet/security_manager_unittest.cc b/src/privet/security_manager_unittest.cc
index 7085e83..3c15d7e 100644
--- a/src/privet/security_manager_unittest.cc
+++ b/src/privet/security_manager_unittest.cc
@@ -131,26 +131,27 @@
&task_runner_};
};
-TEST_F(SecurityManagerTest, CreateAccessToken) {
- std::string token;
- AuthScope scope;
- base::TimeDelta ttl;
- EXPECT_TRUE(security_.CreateAccessToken(AuthType::kAnonymous, "",
- AuthScope::kUser, &token, &scope,
- &ttl, nullptr));
- EXPECT_EQ("Cfz+qcndz8/Mo3ytgYlD7zn8qImkkdPsJVUNBmSOiXwyOjE6MTQxMDAwMzYwMA==",
- token);
- EXPECT_EQ(AuthScope::kUser, scope);
- EXPECT_EQ(base::TimeDelta::FromHours(1), ttl);
-}
+TEST_F(SecurityManagerTest, AccessToken) {
+ AuthScope scopes[] = {
+ AuthScope::kViewer, AuthScope::kUser, AuthScope::kManager,
+ AuthScope::kOwner,
+ };
+ for (size_t i = 1; i < 100; ++i) {
+ const AuthScope requested_scope = scopes[i % arraysize(scopes)];
+ std::string token;
+ AuthScope scope;
+ base::TimeDelta ttl;
+ EXPECT_TRUE(security_.CreateAccessToken(AuthType::kAnonymous, "",
+ requested_scope, &token, &scope,
+ &ttl, nullptr));
+ EXPECT_EQ(requested_scope, scope);
+ EXPECT_EQ(base::TimeDelta::FromHours(1), ttl);
-TEST_F(SecurityManagerTest, ParseAccessToken) {
- UserInfo info;
- EXPECT_TRUE(security_.ParseAccessToken(
- "MMe7FE+EMyG4OnD2457dF5Nqh9Uiaq2iRWRzkSOW+SAzOjk6MTQxMDAwMDkwMA==", &info,
- nullptr));
- EXPECT_EQ(AuthScope::kManager, info.scope());
- EXPECT_EQ(9u, info.user_id());
+ UserInfo info;
+ EXPECT_TRUE(security_.ParseAccessToken(token, &info, nullptr));
+ EXPECT_EQ(requested_scope, info.scope());
+ EXPECT_EQ("0/" + std::to_string(i), info.user_id());
+ }
}
TEST_F(SecurityManagerTest, PairingNoSession) {
