arc: Use v2/auth LSO page.

chrome/browser/resources/chromeos/arc_support/background.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * UI Pages. Note the order must be in sync with the
  * ArcAuthService::UIPage enum.
  * @type {Array<string>}
  */
 var UI_PAGES = ['none',
@@ skipping 34 matching lines @@
  */
 function closeWindowInternally() {
   windowClosedInternally = true;
   appWindow.close();
   appWindow = null;
 }
 
 /**
  * Sends a native message to ArcSupportHost.
  * @param {string} code The action code in message.
+ * @param {Object=} opt_Props Extra properties for the message.
  */
-function sendNativeMessage(code) {
-  message = {'action': code};
+function sendNativeMessage(code, opt_Props) {
+  var message = Object.assign({'action': code}, opt_Props);
   port.postMessage(message);
 }
 
 /**
  * Applies localization for html content.
  * @param {!Object} data Localized strings and relevant information.
  */
 function setLocalization(data) {
   var doc = appWindow.contentWindow.document;
   var loadTimeData = appWindow.contentWindow.loadTimeData;
@@ skipping 49 matching lines @@
     return;
   }
 
   var doc = appWindow.contentWindow.document;
   var pages = doc.getElementsByClassName('section');
   for (var i = 0; i < pages.length; i++) {
     pages[i].hidden = pages[i].id != pageDivId;
   }
 
   if (pageDivId == 'lso-loading') {
-    webview.src = 'https://accounts.google.com/o/oauth2/programmatic_auth?' +
-                  'scope=https://www.google.com/accounts/OAuthLogin&client_id' +
-                  '=1070009224336-sdh77n7uot3oc99ais00jmuft6sk2fg9.apps.' +
-                  'googleusercontent.com';
+    webview.src = 'https://accounts.google.com/o/oauth2/v2/auth?client_id=' +
+                  '1070009224336-sdh77n7uot3oc99ais00jmuft6sk2fg9.apps.' +
+                  'googleusercontent.com&response_type=code&redirect_uri=oob&' +
+                  'scope=https://www.google.com/accounts/OAuthLogin';
   }
   appWindow.show();
 }
 
 /**
+ * Sets error message.
+ * @param {string} error message.
+ */
+function setErrorMessage(error) {
+  if (!appWindow) {
+    return;
+  }
+  var doc = appWindow.contentWindow.document;
+  var messageElement = doc.getElementById('error-message');
+  messageElement.innerText = error;
+}
+
+/**
  * Shows requested page.
  * @param {int} pageId Index of the page to show. Must be in the array range of
  * UI_PAGES.
  * @param {string} status associated with page string status, error message for
  *                        example.
  */
 function showPageWithStatus(pageId, status) {
   if (!appWindow) {
     return;
   }
 
   if (UI_PAGES[pageId] == 'error') {
-    var doc = appWindow.contentWindow.document;
-    var messageElement = doc.getElementById('error-message');
-    messageElement.innerText = status;
+    setErrorMessage(status);
   }
   showPage(UI_PAGES[pageId]);
 }
 
 chrome.app.runtime.onLaunched.addListener(function() {
   var onAppContentLoad = function() {
     var doc = appWindow.contentWindow.document;
     webview = doc.getElementById('arc-support');
 
-    var onWebviewRequestCompleted = function(details) {
-      showPage('lso');
-      var resultUrlPrefix =
-          'https://accounts.google.com/o/oauth2/programmatic_auth?';
-      if (details.statusCode == 200 &&
-          details.url.substring(0, resultUrlPrefix.length) == resultUrlPrefix) {
-        sendNativeMessage('checkAuthCode');
+    var isApprovalResponse = function(url) {
+      var resultUrlPrefix = 'https://accounts.google.com/o/oauth2/approval?';
+      return url.substring(0, resultUrlPrefix.length) == resultUrlPrefix;
+    };
+
+    var onWebviewRequestResponseStarted = function(details) {
+      if (isApprovalResponse(details.url)) {
+        showPage('arc-loading');
       }
     };
 
+    var onWebviewContentLoad = function() {
+      if (!isApprovalResponse(webview.src)) {
+        // Show LSO page when its content is ready.
+        showPage('lso');
+        return;
+      }
+
+      webview.executeScript({code: 'document.title;'}, function(results) {
+        var authCodePrefix = 'Success code=';
+        if (results[0].substring(0, authCodePrefix.length) ==
+            authCodePrefix) {
+          var authCode = results[0].substring(authCodePrefix.length);
+          sendNativeMessage('setAuthCode', {code: authCode});
+        } else {
+          setErrorMessage(appWindow.contentWindow.loadTimeData.getString(
+              'authorizationFailed'));
+          showPage('error');
+        }
+      });
+    };
+
     var requestFilter = {
       urls: ['<all_urls>'],
       types: ['main_frame']
     };
 
-    webview.request.onCompleted.addListener(onWebviewRequestCompleted,
-        requestFilter);
+    webview.request.onResponseStarted.addListener(
+        onWebviewRequestResponseStarted, requestFilter);
+    webview.addEventListener('contentload', onWebviewContentLoad);
 
     var onGetStarted = function() {
-      sendNativeMessage('checkAuthCode');
+      sendNativeMessage('startLSO');
     };
 
     var onRetry = function() {
-      sendNativeMessage('checkAuthCode');
+      sendNativeMessage('startLSO');
     };
 
     doc.getElementById('get-started').addEventListener('click', onGetStarted);
     doc.getElementById('retry').addEventListener('click', onRetry);
 
     connectPort();
   };
 
   var onWindowCreated = function(createdWindow) {
     appWindow = createdWindow;
@@ skipping 17 matching lines @@
       type: 'chrome',
       color: '#67a030'
     },
     'innerBounds': {
       'width': 800,
       'height': 600
     }
   };
   chrome.app.window.create('main.html', options, onWindowCreated);
 });