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'); |