Index: chrome/browser/resources/gaia_auth_host/authenticator.js |
diff --git a/chrome/browser/resources/gaia_auth_host/authenticator.js b/chrome/browser/resources/gaia_auth_host/authenticator.js |
index baf6d8e1a0667a4ea8982565d5d20972e8a03c64..101aaf05517d34b222826ea9a52b9fa938ef065b 100644 |
--- a/chrome/browser/resources/gaia_auth_host/authenticator.js |
+++ b/chrome/browser/resources/gaia_auth_host/authenticator.js |
@@ -19,6 +19,7 @@ cr.define('cr.login', function() { |
var SIGN_IN_HEADER = 'google-accounts-signin'; |
var EMBEDDED_FORM_HEADER = 'google-accounts-embedded'; |
var SAML_HEADER = 'google-accounts-saml'; |
+ var SERVICE_ID = 'chromeoslogin'; |
/** |
* The source URL parameter for the constrained signin flow. |
@@ -152,6 +153,8 @@ cr.define('cr.login', function() { |
['responseHeaders']); |
window.addEventListener( |
'message', this.onMessage_.bind(this), false); |
+ |
+ this.loaded_ = false; |
}; |
/** |
@@ -160,13 +163,14 @@ cr.define('cr.login', function() { |
Authenticator.prototype.reload = function() { |
this.webview_.src = this.reloadUrl_; |
this.authFlow_ = AuthFlow.DEFAULT; |
+ this.loaded_ = false; |
}; |
Authenticator.prototype.constructInitialFrameUrl_ = function(data) { |
var url = this.idpOrigin_ + (data.gaiaPath || IDP_PATH); |
url = appendParam(url, 'continue', this.continueUrl_); |
- url = appendParam(url, 'service', data.service); |
+ url = appendParam(url, 'service', data.service || SERVICE_ID); |
if (data.hl) |
url = appendParam(url, 'hl', data.hl); |
if (data.email) |
@@ -288,7 +292,7 @@ cr.define('cr.login', function() { |
this.listener_.onSuccess({email: this.email_, |
gaiaId: this.gaiaId_, |
- password: this.password_, |
+ password: this.password_ || '', |
usingSAML: this.authFlow_ == AuthFlow.SAML, |
chooseWhatToSync: this.chooseWhatToSync_, |
skipForNow: this.skipForNow_, |