Authenticator.prototype = {
email_: null,
+ gaiaId_: null,
// Depending on the key type chosen, this will contain the plain text password
// or a credential derived from it along with the information required to
// when support for key types other than plain text password is added.
passwordBytes_: null,
+ chooseWhatToSync_: false,
+ skipForNow_: false,
+ sessionIndex_: null,
attemptToken_: null,
// Input params from extension initialization URL.
this.GAIA_URL.indexOf(msg.origin) == 0;
},
- isInternalMessage_: function(msg) {
- return msg.origin == Authenticator.THIS_EXTENSION_ORIGIN;
- },
-
isParentMessage_: function(msg) {
return msg.origin == this.parentPage_;
},
});
this.supportChannel_.registerMessage(
'switchToFullTab', this.switchToFullTab_.bind(this));
- this.supportChannel_.registerMessage(
- 'completeLogin', this.completeLogin_.bind(this));
}
+ this.supportChannel_.registerMessage(
+ 'completeLogin', this.onCompleteLogin_.bind(this));
this.initSAML_();
this.maybeInitialized_();
}.bind(this));
/**
* Invoked when the background script sends a message to indicate that the
* current content does not fit in a constrained window.
- * @param {Object=} opt_extraMsg Optional extra info to send.
+ * @param {Object=} msg Extra info to send.
*/
switchToFullTab_: function(msg) {
var parentMsg = {
this.passwordBytes_,
'usingSAML': this.isSAMLFlow_,
'chooseWhatToSync': this.chooseWhatToSync_ || false,
- 'skipForNow': opt_extraMsg && opt_extraMsg.skipForNow,
- 'sessionIndex': opt_extraMsg && opt_extraMsg.sessionIndex
+ 'skipForNow': (opt_extraMsg && opt_extraMsg.skipForNow) ||
+ this.skipForNow_,
+ 'sessionIndex': (opt_extraMsg && opt_extraMsg.sessionIndex) ||
+ this.sessionIndex_,
+ 'gaiaId': (opt_extraMsg && opt_extraMsg.gaiaId) || this.gaiaId_
};
window.parent.postMessage(msg, this.parentPage_);
this.supportChannel_.send({name: 'resetAuth'});
* @param {!Object} msg Details sent with the message.
*/
onAuthPageLoaded_: function(msg) {
- var isSAMLPage = msg.url.indexOf(this.gaiaUrl_) != 0;
-
- if (isSAMLPage && !this.isSAMLFlow_) {
+ if (msg.isSAMLPage && !this.isSAMLFlow_) {
// GAIA redirected to a SAML login page. The credentials provided to this
// page will determine what user gets logged in. The credentials obtained
// from the GAIA login form are no longer relevant and can be discarded.
this.isSAMLFlow_ = true;
this.email_ = null;
+ this.gaiaId_ = null;
this.passwordBytes_ = null;
}
console.error('Authenticator.onAPICall_: unsupported key type');
return;
}
+ // Not setting |email_| and |gaiaId_| because this API call will
+ // eventually be followed by onCompleteLogin_() which does set it.
this.apiToken_ = call.token;
- this.email_ = call.user;
this.passwordBytes_ = call.passwordBytes;
} else if (call.method == 'confirm') {
if (call.token != this.apiToken_)
});
},
- onConfirmLogin_: function() {
- if (!this.isSAMLFlow_) {
- this.completeLogin_();
+ /**
+ * Callback invoked for 'completeLogin' message.
+ * @param {Object=} msg Message sent from background page.
+ */
+ onCompleteLogin_: function(msg) {
+ if (!msg.email || !msg.gaiaId || !msg.sessionIndex) {
+ console.error('Missing fields to complete login.');
+ window.parent.postMessage({method: 'missingGaiaInfo'}, this.parentPage_);
return;
}
- var apiUsed = !!this.passwordBytes_;
+ // Skip SAML extra steps for desktop flow and non-SAML flow.
+ if (!this.isSAMLFlow_ || this.desktopMode_) {
+ this.completeLogin_(msg);
+ return;
+ }
- // Retrieve the e-mail address of the user who just authenticated from GAIA.
- window.parent.postMessage({method: 'retrieveAuthenticatedUserEmail',
- attemptToken: this.attemptToken_,
- apiUsed: apiUsed},
- this.parentPage_);
+ this.email_ = msg.email;
+ this.gaiaId_ = msg.gaiaId;
+ // Password from |msg| is not used because ChromeOS SAML flow
+ // gets password by asking user to confirm.
+ this.skipForNow_ = msg.skipForNow;
+ this.sessionIndex_ = msg.sessionIndex;
- if (!apiUsed) {
+ if (this.passwordBytes_) {
+ window.parent.postMessage({method: 'samlApiUsed'}, this.parentPage_);
+ this.completeLogin_(msg);
+ } else {
this.supportChannel_.sendWithCallback(
{name: 'getScrapedPasswords'},
function(passwords) {
}
},
- maybeCompleteSAMLLogin_: function() {
- // SAML login is complete when the user's e-mail address has been retrieved
- // from GAIA and the user has successfully confirmed the password.
- if (this.email_ !== null && this.passwordBytes_ !== null)
- this.completeLogin_();
- },
-
onVerifyConfirmedPassword_: function(password) {
this.supportChannel_.sendWithCallback(
{name: 'getScrapedPasswords'},
for (var i = 0; i < passwords.length; ++i) {
if (passwords[i] == password) {
this.passwordBytes_ = passwords[i];
- this.maybeCompleteSAMLLogin_();
+ // SAML login is complete when the user has successfully
+ // confirmed the password.
+ if (this.passwordBytes_ !== null)
+ this.completeLogin_();
return;
}
}
onMessage: function(e) {
var msg = e.data;
if (msg.method == 'attemptLogin' && this.isGaiaMessage_(e)) {
+ // At this point GAIA does not yet know the gaiaId, so its not set here.
this.email_ = msg.email;
this.passwordBytes_ = msg.password;
this.attemptToken_ = msg.attemptToken;
this.maybeInitialized_();
}
this.email_ = null;
+ this.gaiaId_ = null;
+ this.sessionIndex_ = false;
this.passwordBytes_ = null;
this.attemptToken_ = null;
this.isSAMLFlow_ = false;
+ this.skipForNow_ = false;
+ this.chooseWhatToSync_ = false;
if (this.supportChannel_)
this.supportChannel_.send({name: 'resetAuth'});
- } else if (msg.method == 'setAuthenticatedUserEmail' &&
- this.isParentMessage_(e)) {
- if (this.attemptToken_ == msg.attemptToken) {
- this.email_ = msg.email;
- this.maybeCompleteSAMLLogin_();
- }
- } else if (msg.method == 'confirmLogin' && this.isInternalMessage_(e)) {
- // In the desktop mode, Chrome needs to wait for extra info such as
- // session index from the background JS.
- if (this.desktopMode_)
- return;
-
- if (this.attemptToken_ == msg.attemptToken)
- this.onConfirmLogin_();
- else
- console.error('Authenticator.onMessage: unexpected attemptToken!?');
} else if (msg.method == 'verifyConfirmedPassword' &&
this.isParentMessage_(e)) {
this.onVerifyConfirmedPassword_(msg.password);
projects / platform / framework / web / crosswalk.git / blobdiff