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

Unified Diff: remoting/webapp/crd/js/crd_connect.js

Issue 1008003002: [Webapp Refactor] Implements Me2MeConnectFlow as an object. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 9 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
« no previous file with comments | « remoting/webapp/crd/js/client_plugin_impl.js ('k') | remoting/webapp/crd/js/credentials_provider.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/crd/js/crd_connect.js
diff --git a/remoting/webapp/crd/js/crd_connect.js b/remoting/webapp/crd/js/crd_connect.js
index 6dfbb51850e3aae34ab1b822023f70dd46ef1784..a3d90753c551bd64927fab82394105bf09ccfdfd 100644
--- a/remoting/webapp/crd/js/crd_connect.js
+++ b/remoting/webapp/crd/js/crd_connect.js
@@ -19,8 +19,8 @@ remoting.connectIT2Me = function() {
var connector = remoting.app.getSessionConnector();
var accessCode = document.getElementById('access-code-entry').value;
remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
- remoting.It2MeConnectFlow.start(connector, accessCode).
- catch(function(/** !remoting.Error */ reason){
+ remoting.It2MeConnectFlow.start(connector, accessCode).catch(
+ function(/** remoting.Error */ reason){
var errorDiv = document.getElementById('connect-error-message');
l10n.localizeElementFromTag(errorDiv, reason.getTag());
remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
@@ -36,78 +36,7 @@ remoting.connectIT2Me = function() {
*/
remoting.connectMe2Me = function(hostId) {
var host = remoting.hostList.getHostForId(hostId);
- if (!host) {
- remoting.app.onError(new remoting.Error(
- remoting.Error.Tag.HOST_IS_OFFLINE));
- return;
- }
- var webappVersion = chrome.runtime.getManifest().version;
- var needsUpdateDialog = new remoting.HostNeedsUpdateDialog(
- document.getElementById('host-needs-update-dialog'), host);
-
- needsUpdateDialog.showIfNecessary(webappVersion).then(function() {
- remoting.connectMe2MeHostVersionAcknowledged_(host);
- }).catch(function(/** remoting.Error */ error) {
- if (error.hasTag(remoting.Error.Tag.CANCELLED)) {
- remoting.setMode(remoting.AppMode.HOME);
- }
- });
-};
-
-/**
- * Shows PIN entry screen localized to include the host name, and registers
- * a host-specific one-shot event handler for the form submission.
- *
- * @param {remoting.Host} host The Me2Me host to which to connect.
- * @return {void} Nothing.
- */
-remoting.connectMe2MeHostVersionAcknowledged_ = function(host) {
- /** @type {remoting.SessionConnector} */
var connector = remoting.app.getSessionConnector();
- remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
-
- /**
- * @param {string} tokenUrl Token-issue URL received from the host.
- * @param {string} hostPublicKey Host public key (DER and Base64 encoded).
- * @param {string} scope OAuth scope to request the token for.
- * @param {function(string, string):void} onThirdPartyTokenFetched Callback.
- */
- var fetchThirdPartyToken = function(
- tokenUrl, hostPublicKey, scope, onThirdPartyTokenFetched) {
- var thirdPartyTokenFetcher = new remoting.ThirdPartyTokenFetcher(
- tokenUrl, hostPublicKey, scope, host.tokenUrlPatterns,
- onThirdPartyTokenFetched);
- thirdPartyTokenFetcher.fetchToken();
- };
-
- /**
- * @param {boolean} supportsPairing
- * @param {function(string):void} onPinFetched
- */
- var requestPin = function(supportsPairing, onPinFetched) {
- var pinDialog =
- new remoting.PinDialog(document.getElementById('pin-dialog'), host);
- pinDialog.show(supportsPairing).then(function(/** string */ pin) {
- onPinFetched(pin);
- /** @type {boolean} */
- remoting.pairingRequested = pinDialog.pairingRequested();
- });
- };
-
- /** @param {Object} settings */
- var connectMe2MeHostSettingsRetrieved = function(settings) {
- /** @type {string} */
- var clientId = '';
- /** @type {string} */
- var sharedSecret = '';
- var pairingInfo = /** @type {Object} */ (settings['pairingInfo']);
- if (pairingInfo) {
- clientId = /** @type {string} */ (pairingInfo['clientId']);
- sharedSecret = /** @type {string} */ (pairingInfo['sharedSecret']);
- }
- connector.connectMe2Me(host, requestPin, fetchThirdPartyToken,
- clientId, sharedSecret);
- }
-
- remoting.HostSettings.load(host.hostId, connectMe2MeHostSettingsRetrieved);
-};
+ var flow = new remoting.Me2MeConnectFlow(connector, host);
+ flow.start();
+};
« no previous file with comments | « remoting/webapp/crd/js/client_plugin_impl.js ('k') | remoting/webapp/crd/js/credentials_provider.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698