| OLD | NEW |
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_utils.h" | 5 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_utils.h" |
| 6 | 6 |
| 7 #include "base/sha1.h" | 7 #include "base/sha1.h" |
| 8 #include "components/proximity_auth/cryptauth/base64url.h" | 8 #include "components/proximity_auth/cryptauth/base64url.h" |
| 9 #include "components/user_manager/user_id.h" |
| 9 | 10 |
| 10 namespace proximity_auth { | 11 namespace proximity_auth { |
| 11 | 12 |
| 12 std::string CalculateDeviceUserId(const std::string& device_id, | 13 std::string CalculateDeviceUserId(const std::string& device_id, |
| 13 const std::string& user_id) { | 14 const user_manager::UserID& user_id) { |
| 14 std::string device_user_id; | 15 std::string device_user_id; |
| 15 Base64UrlEncode(base::SHA1HashString(device_id + "|" + user_id), | 16 Base64UrlEncode(base::SHA1HashString(device_id + "|" + user_id.GetUserEmail())
, |
| 16 &device_user_id); | 17 &device_user_id); |
| 17 return device_user_id; | 18 return device_user_id; |
| 18 } | 19 } |
| 19 | 20 |
| 20 } // namespace proximity_auth | 21 } // namespace proximity_auth |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1165323004:
We should use UserID object to identify users instead of username.
Base URL: https://chromium.googlesource.com/chromium/src.git@master