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

Unified Diff: chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

Issue 902493003: cros: Pass gaia_auth init params via postMessage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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: chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
index df2e3a54314f47e3ae02aee8debc54ada0bbce5d..572b104764b0bbd589f875d6cd09df49d892fa31 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
@@ -23,6 +23,11 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
signInUrl_: null,
/**
+ * Gaia auth params for sign in frame.
+ */
+ signInParams_: {},
+
+ /**
* The current step. This is the last value passed to showStep().
*/
currentStep_: null,
@@ -132,18 +137,17 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
* URL.
*/
onBeforeShow: function(data) {
- var url = data.signin_url;
- url += '?gaiaUrl=' + encodeURIComponent(data.gaiaUrl);
- url += '&needPassword=0';
- this.signInUrl_ = url;
+ this.signInParams_ = {};
+ this.signInParams_['gaiaUrl'] = data.gaiaUrl;
+ this.signInParams_['needPassword'] = false;
+ this.signInUrl_ = data.signin_url;
var modes = ['manual', 'forced', 'recovery'];
for (var i = 0; i < modes.length; ++i) {
this.classList.toggle('mode-' + modes[i],
data.enrollment_mode == modes[i]);
}
this.managementDomain_ = data.management_domain;
- $('oauth-enroll-signin-frame').contentWindow.location.href =
- this.signInUrl_;
+ this.doReload();
this.learnMoreHelpTopicID_ = data.learn_more_help_topic_id;
this.updateLocalizedContent();
this.showStep(STEP_SIGNIN);
@@ -187,8 +191,16 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
},
doReload: function() {
- $('oauth-enroll-signin-frame').contentWindow.location.href =
- this.signInUrl_;
+ var signInFrame = $('oauth-enroll-signin-frame');
+
+ var sendParamsOnLoad = function() {
+ signInFrame.removeEventListener('load', sendParamsOnLoad);
+ signInFrame.contentWindow.postMessage(this.signInParams_,
+ 'chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik');
+ }.bind(this);
+
+ signInFrame.addEventListener('load', sendParamsOnLoad);
+ signInFrame.contentWindow.location.href = this.signInUrl_;
},
/**

Powered by Google App Engine
This is Rietveld 408576698