components/proximity_auth/cryptauth/cryptauth_enrollment_utils.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/proximity_auth/cryptauth/cryptauth_enrollment_utils.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_window.cc ('K') | « components/proximity_auth/cryptauth/cryptauth_enrollment_utils.h ('k') | components/proximity_auth/screenlock_bridge.h » ('j') | components/user_manager/user_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/proximity_auth/cryptauth/cryptauth_enrollment_utils.cc

diff --git a/components/proximity_auth/cryptauth/cryptauth_enrollment_utils.cc b/components/proximity_auth/cryptauth/cryptauth_enrollment_utils.cc

index 476721c97c5caef0306f5bc113514e99fa7b52ac..1147ee3a8a61f89b0dcd372b3ebf7d9e20d7a2b4 100644

--- a/components/proximity_auth/cryptauth/cryptauth_enrollment_utils.cc

+++ b/components/proximity_auth/cryptauth/cryptauth_enrollment_utils.cc

@@ -6,13 +6,14 @@

#include "base/sha1.h"

#include "components/proximity_auth/cryptauth/base64url.h"

+#include "components/user_manager/user_id.h"

namespace proximity_auth {

std::string CalculateDeviceUserId(const std::string& device_id,

- const std::string& user_id) {

+ const user_manager::UserID& user_id) {

std::string device_user_id;

- Base64UrlEncode(base::SHA1HashString(device_id + "|" + user_id),

+ Base64UrlEncode(base::SHA1HashString(device_id + "|" + user_id.GetUserEmail()),

&device_user_id);

return device_user_id;

}