diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 04:30:56 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 04:30:56 +0000 |
| commit | cbf35fce48d4eac57f2ec521bad9e3309da5f83c (patch) | |
| tree | b2d91fad9c1bbbd2920ef2e5e7dd852251deec28 /remoting/host/signaling_connector.h | |
| parent | 6796ef404c298526294b2536b99fcc98a1fa379b (diff) | |
| download | chromium_src-cbf35fce48d4eac57f2ec521bad9e3309da5f83c.zip chromium_src-cbf35fce48d4eac57f2ec521bad9e3309da5f83c.tar.gz chromium_src-cbf35fce48d4eac57f2ec521bad9e3309da5f83c.tar.bz2 | |
Properly handle accounts that don't have GMail account.
1. Me2MeHostAuthenticatorFactory now verifies that the bare
JID of the remote client matches bare JID of the host.
Previously it was comparing it with the user's email,
which may be different from JID.
2. GaiaOAuthClient now fetches user's email.
3. SignalingConnector verifies that user's email matches
the expected value stored in xmpp_login. If it doesn't,
then the auth token was generated for a different account
and the host treats it as an authentication error.
BUG=128102
Review URL: https://chromiumcodereview.appspot.com/10332187
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/signaling_connector.h')
| -rw-r--r-- | remoting/host/signaling_connector.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/host/signaling_connector.h b/remoting/host/signaling_connector.h index a03ae64..4b432f3 100644 --- a/remoting/host/signaling_connector.h +++ b/remoting/host/signaling_connector.h @@ -71,7 +71,8 @@ class SignalingConnector virtual void OnOnlineStateChanged(bool online) OVERRIDE; // GaiaOAuthClient::Delegate interface. - virtual void OnRefreshTokenResponse(const std::string& access_token, + virtual void OnRefreshTokenResponse(const std::string& user_email, + const std::string& access_token, int expires_seconds) OVERRIDE; virtual void OnOAuthError() OVERRIDE; virtual void OnNetworkError(int response_code) OVERRIDE; |