Chromad: added AD Join ui, authpolicy_client

chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

 // Copyright 2015 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.
 
 login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
   /* Code which is embedded inside of the webview. See below for details.
   /** @const */ var INJECTED_WEBVIEW_SCRIPT = String.raw`
                       (function() {
                          <include src="../keyboard/keyboard_utils.js">
                          keyboard.initializeKeyboardFlow(true);
                        })();`;
 
   /** @const */ var STEP_SIGNIN = 'signin';
+  /** @const */ var STEP_AD_JOIN = 'ad-join';
   /** @const */ var STEP_WORKING = 'working';
   /** @const */ var STEP_ATTRIBUTE_PROMPT = 'attribute-prompt';
   /** @const */ var STEP_ERROR = 'error';
   /** @const */ var STEP_SUCCESS = 'success';
   /** @const */ var STEP_ABE_SUCCESS = 'abe-success';
 
   /* TODO(dzhioev): define this step on C++ side.
   /** @const */ var STEP_ATTRIBUTE_PROMPT_ERROR = 'attribute-prompt-error';
 
   /** @const */ var HELP_TOPIC_ENROLLMENT = 4631259;
 
   return {
     EXTERNAL_API: [
       'showStep',
       'showError',
       'doReload',
       'showAttributePromptStep',
       'showAttestationBasedEnrollmentSuccess',
+      'invalidateAD',
     ],
 
     /**
      * Authenticator object that wraps GAIA webview.
      */
     authenticator_: null,
 
     /**
      * The current step. This is the last value passed to showStep().
      */
@@ skipping 10 matching lines @@
       this.isCancelDisabled_ = disabled;
     },
 
     isManualEnrollment_: undefined,
 
     /**
      * An element containg navigation buttons.
      */
     navigation_: undefined,
 
+    offline_ad_ui_: undefined,

[xiyuan, 2016/10/26 22:03:16]

offline_ad_ui_ -> offlineAdUi_ to fit JS var name convention

[Roman Sorokin (ftl), 2016/10/27 13:10:45]

Done.

+
     /**
      * Value contained in the last received 'backButton' event.
      * @type {boolean}
      * @private
      */
     lastBackMessageValue_: false,
 
     /** @override */
     decorate: function() {
       this.navigation_ = $('oauth-enroll-navigation');
+      this.offline_ad_ui_ = $('oauth-enroll-ad-join-ui');
 
       this.authenticator_ =
           new cr.login.Authenticator($('oauth-enroll-auth-view'));
 
       // Establish an initial messaging between content script and
       // host script so that content script can message back.
       $('oauth-enroll-auth-view').addEventListener('loadstop',
           function(e) {
             e.target.contentWindow.postMessage(
                 'initialMessage', $('oauth-enroll-auth-view').src);
@@ skipping 23 matching lines @@
             if (!detail.email || !detail.authCode) {
               this.showError(
                   loadTimeData.getString('fatalEnrollmentError'),
                   false);
               return;
             }
             chrome.send('oauthEnrollCompleteLogin', [detail.email,
                                                      detail.authCode]);
           }).bind(this));
 
+      this.offline_ad_ui_.addEventListener('authCompleted',
+          (function(e) {
+            this.offline_ad_ui_.disabled = true;
+            chrome.send('oauthEnrollADCompleteLogin',
+                [e.detail.machinename, e.detail.username, e.detail.password]);
+          }).bind(this));
+
+

[xiyuan, 2016/10/26 22:03:16]

nit: nuke one empty line ?

[Roman Sorokin (ftl), 2016/10/27 13:10:45]

Done.

       this.authenticator_.addEventListener('authFlowChange',
           (function(e) {
             var isSAML = this.authenticator_.authFlow ==
                              cr.login.Authenticator.AuthFlow.SAML;
             if (isSAML) {
               $('oauth-saml-notice-message').textContent =
                   loadTimeData.getStringF('samlNotice',
                                           this.authenticator_.authDomain);
             }
             this.classList.toggle('saml', isSAML);
@@ skipping 35 matching lines @@
       $('oauth-enroll-success-card').addEventListener(
           'buttonclick', doneCallback);
       $('oauth-enroll-abe-success-card').addEventListener(
           'buttonclick', doneCallback);
 
       this.navigation_.addEventListener('close', this.cancel.bind(this));
       this.navigation_.addEventListener('refresh', this.cancel.bind(this));
 
       this.navigation_.addEventListener('back', function() {
         this.navigation_.backVisible = false;
-        $('oauth-enroll-auth-view').back();
+        if (this.currentStep_ == STEP_SIGNIN) {
+          $('oauth-enroll-auth-view').back();
+        }

[xiyuan, 2016/10/26 22:03:16]

What would "back" do for STEP_AD_JOIN ?

[Roman Sorokin (ftl), 2016/10/27 13:10:45]

We don't show the button on domain join screen yet. We show |close| button
though. (But UX is no finalised)

       }.bind(this));
 
       $('oauth-enroll-attribute-prompt-card').addEventListener('submit',
           this.onAttributesSubmitted.bind(this));
 
       $('oauth-enroll-learn-more-link').addEventListener('click',
           function(event) {
             chrome.send('oauthEnrollOnLearnMore');
           });
 
@@ skipping 106 matching lines @@
       } else if (step == STEP_ERROR) {
         $('oauth-enroll-error-card').submitButton.focus();
       } else if (step == STEP_SUCCESS) {
         $('oauth-enroll-success-card').submitButton.focus();
       } else if (step == STEP_ABE_SUCCESS) {
         $('oauth-enroll-abe-success-card').submitButton.focus();
       } else if (step == STEP_ATTRIBUTE_PROMPT) {
         $('oauth-enroll-asset-id').focus();
       } else if (step == STEP_ATTRIBUTE_PROMPT_ERROR) {
         $('oauth-enroll-attribute-prompt-error-card').submitButton.focus();
+      } else if (step == STEP_AD_JOIN) {
+        this.offline_ad_ui_.disabled = false;
+        this.offline_ad_ui_.setUser();
       }
 
       this.currentStep_ = step;
       this.lastBackMessageValue_ = false;
       this.updateControlsState();
     },
 
     /**
      * Sets an error message and switches to the error screen.
      * @param {string} message the error message.
@@ skipping 11 matching lines @@
           retry ? loadTimeData.getString('oauthEnrollRetry') : '';
       this.showStep(STEP_ERROR);
     },
 
     doReload: function() {
       this.lastBackMessageValue_ = false;
       this.authenticator_.reload();
       this.updateControlsState();
     },
 
+    invalidateAD: function(machineName, user) {
+      this.offline_ad_ui_.disabled = false;
+      this.offline_ad_ui_.setUser(user, machineName);
+    },
+
     /**
      * Retries the enrollment process after an error occurred in a previous
      * attempt. This goes to the C++ side through |chrome| first to clean up the
      * profile, so that the next attempt is performed with a clean state.
      */
     doRetry_: function() {
       chrome.send('oauthEnrollRetry');
     },
 
     /**
@@ skipping 21 matching lines @@
      * @type {boolean}
      */
     isAtTheBeginning: function() {
       return !this.navigation_.backVisible && this.currentStep_ == STEP_SIGNIN;
     },
 
     /**
      * Updates visibility of navigation buttons.
      */
     updateControlsState: function() {
-      this.navigation_.backVisible = this.currentStep_ == STEP_SIGNIN &&
+      this.navigation_.backVisible = (this.currentStep_ == STEP_SIGNIN ||
+                                      this.currentStep_ == STEP_AD_JOIN) &&
                                      this.lastBackMessageValue_;
       this.navigation_.refreshVisible = this.isAtTheBeginning() &&
                                         !this.isManualEnrollment_;
       this.navigation_.closeVisible = (this.currentStep_ == STEP_SIGNIN ||
-                                       this.currentStep_ == STEP_ERROR) &&
+                                       this.currentStep_ == STEP_ERROR ||
+                                       this.currentStep_ == STEP_AD_JOIN) &&
                                       !this.navigation_.refreshVisible;
       $('login-header-bar').updateUI_();
     }
   };
 });