Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2190)

Unified Diff: remoting/client/appengine/static_files/chromoting_session.js

Issue 7042022: Add separate nonce version of connect call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: combine connect calls Created 9 years, 7 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
Index: remoting/client/appengine/static_files/chromoting_session.js
diff --git a/remoting/client/appengine/static_files/chromoting_session.js b/remoting/client/appengine/static_files/chromoting_session.js
index 7c2a8b9fd3da6e84f8527ef036a5b04cc500b46d..d89ce6828fc4e393528b50c7acbca003c5a99b76 100644
--- a/remoting/client/appengine/static_files/chromoting_session.js
+++ b/remoting/client/appengine/static_files/chromoting_session.js
@@ -52,8 +52,8 @@ function registerConnection() {
var clientjid = xhr.responseText;
chromoting.plugin.sendIq = sendIq;
- // TODO:(jamiewalch): Pass in the correct nonce.
- chromoting.plugin.connectSandboxed(clientjid, chromoting.hostjid, '');
+ chromoting.plugin.connect(chromoting.hostjid, "AUTHENTICATE",
+ clientjid);
// TODO(ajwong): This should just be feedIq();
window.setTimeout(feedIq, 1000);
} else {
@@ -128,11 +128,12 @@ function init() {
// TODO(garykac): Clean exit if |connect| isn't a function.
if (typeof plugin.connect === 'function') {
if (chromoting.connectMethod == "sandboxed") {
+ plugin.setSandboxed(true);
registerConnection();
} else {
- // TODO:(jamiewalch): Pass in the correct nonce.
- plugin.connect(chromoting.username, chromoting.hostjid,
- chromoting.xmppAuthToken, '');
+ plugin.setSandboxed(false);
+ plugin.connect(chromoting.hostjid, "AUTHENTICATE",
+ chromoting.username, chromoting.xmppAuthToken);
}
} else {
addToDebugLog('ERROR: chromoting plugin not loaded');

Powered by Google App Engine
This is Rietveld 408576698