Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 00cead8f21d4 (bug 965464, should have been bug 965474)

Browse Source 
--HG--
extra : rebase_source : 43997ecb392c716aa147407985b6f823ac087db8
This commit is contained in:
Gavin Sharp 2014-01-30 19:08:08 -08:00
parent 39881bb81f
commit 9c3c787f78
3 changed files with 96 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
browser/components/preferences/sync.js
View File

@ -129,14 +129,21 @@ let gSyncPane = {
// So we think we are logged in, so login problems are next.
// (Although if the Sync identity manager is still initializing, we
// ignore login errors and assume all will eventually be good.)
} else if (Weave.Service.identity.readyToAuthenticate &&
Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
fxaLoginStatus.selectedIndex = FXA_LOGIN_FAILED;
enginesListDisabled = true;
// Else we must be golden!
} else {
fxaLoginStatus.selectedIndex = FXA_LOGIN_VERIFIED;
enginesListDisabled = false;
// Weave might not have got around to re-checking if auth is OK,
// so tell it to do that now.
if (Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
Weave.Service.verifyLogin();
}
if (Weave.Service.identity.readyToAuthenticate &&
Weave.Status.login != Weave.LOGIN_SUCCEEDED) {
fxaLoginStatus.selectedIndex = FXA_LOGIN_FAILED;
enginesListDisabled = true;
// Else we must be golden!
} else {
fxaLoginStatus.selectedIndex = FXA_LOGIN_VERIFIED;
enginesListDisabled = false;
}
}
document.getElementById("fxaEmailAddress1").textContent = data.email;
document.getElementById("fxaEmailAddress2").textContent = data.email;

12
services/fxaccounts/FxAccounts.jsm
View File

@ -143,10 +143,16 @@ InternalMethods.prototype = {
return data;
}
if (!this.whenKeysReadyPromise) {
this.whenKeysReadyPromise = this.fetchAndUnwrapKeys(data.keyFetchToken);
this.whenKeysReadyPromise = Promise.defer();
return this.fetchAndUnwrapKeys(data.keyFetchToken)
.then((data) => {
if (this.whenKeysReadyPromise) {
this.whenKeysReadyPromise.resolve(data);
}
});
}
return this.whenKeysReadyPromise;
});
return this.whenKeysReadyPromise.promise;
});
},
fetchAndUnwrapKeys: function(keyFetchToken) {

141
services/sync/modules/browserid_identity.js
View File

@ -83,12 +83,12 @@ this.BrowserIDManager.prototype = {
},
initialize: function() {
Services.obs.addObserver(this, fxAccountsCommon.ONLOGIN_NOTIFICATION, false);
Services.obs.addObserver(this, fxAccountsCommon.ONVERIFIED_NOTIFICATION, false);
Services.obs.addObserver(this, fxAccountsCommon.ONLOGOUT_NOTIFICATION, false);
return this.initializeWithCurrentIdentity();
},
initializeWithCurrentIdentity: function(isInitialSync=false) {
initializeWithCurrentIdentity: function() {
this._log.trace("initializeWithCurrentIdentity");
Components.utils.import("resource://services-sync/main.js");
@ -103,43 +103,31 @@ this.BrowserIDManager.prototype = {
return;
}
this._account = accountData.email;
// The user must be verified before we can do anything at all; we kick
// this and the rest of initialization off in the background (ie, we
// don't return the promise)
this._log.info("Waiting for user to be verified.");
fxAccounts.whenVerified(accountData).then(accountData => {
// We do the background keybundle fetch...
this._log.info("Starting fetch for key bundle.");
if (this.needsCustomization) {
// If the user chose to "Customize sync options" when signing
// up with Firefox Accounts, ask them to choose what to sync.
const url = "chrome://browser/content/sync/customize.xul";
const features = "centerscreen,chrome,modal,dialog,resizable=no";
let win = Services.wm.getMostRecentWindow("navigator:browser");
if (this.needsCustomization) {
// If the user chose to "Customize sync options" when signing
// up with Firefox Accounts, ask them to choose what to sync.
const url = "chrome://browser/content/sync/customize.xul";
const features = "centerscreen,chrome,modal,dialog,resizable=no";
let win = Services.wm.getMostRecentWindow("navigator:browser");
let data = {accepted: false};
win.openDialog(url, "_blank", features, data);
let data = {accepted: false};
win.openDialog(url, "_blank", features, data);
if (data.accepted) {
Services.prefs.clearUserPref(PREF_SYNC_SHOW_CUSTOMIZATION);
} else {
// Log out if the user canceled the dialog.
return fxAccounts.signOut();
}
if (data.accepted) {
Services.prefs.clearUserPref(PREF_SYNC_SHOW_CUSTOMIZATION);
} else {
// Log out if the user canceled the dialog.
return fxAccounts.signOut();
}
}).then(() => {
return this._fetchSyncKeyBundle();
}).then(() => {
}
this._account = accountData.email;
// We start a background keybundle fetch...
this._log.info("Starting background fetch for key bundle.");
this._fetchSyncKeyBundle().then(() => {
this._shouldHaveSyncKeyBundle = true; // and we should actually have one...
this.whenReadyToAuthenticate.resolve();
this._log.info("Background fetch for key bundle done");
if (isInitialSync) {
this._log.info("Doing initial sync actions");
Weave.Service.resetClient();
Services.obs.notifyObservers(null, "weave:service:setup-complete", null);
Weave.Utils.nextTick(Weave.Service.sync, Weave.Service);
}
}).then(null, err => {
this._shouldHaveSyncKeyBundle = true; // but we probably don't have one...
this.whenReadyToAuthenticate.reject(err);
@ -155,8 +143,14 @@ this.BrowserIDManager.prototype = {
observe: function (subject, topic, data) {
switch (topic) {
case fxAccountsCommon.ONVERIFIED_NOTIFICATION:
case fxAccountsCommon.ONLOGIN_NOTIFICATION:
this.initializeWithCurrentIdentity(true);
// For now, we just assume it's the same user logging back in.
// Bug 958927 exists to work out what to do if that's not true. It might
// be that the :onlogout observer does a .startOver (or maybe not - TBD)
// But for now, do nothing, and sync will just start re-synching in its
// own sweet time...
this.initializeWithCurrentIdentity();
break;
case fxAccountsCommon.ONLOGOUT_NOTIFICATION:
@ -358,25 +352,58 @@ this.BrowserIDManager.prototype = {
_fetchSyncKeyBundle: function() {
// Fetch a sync token for the logged in user from the token server.
return this._fxaService.getKeys().then(userData => {
return this._refreshTokenForLoggedInUser(
).then(token => {
this._token = token;
return this._fxaService.getKeys();
}).then(userData => {
// unlikely, but if the logged in user somehow changed between these
// calls we better fail.
if (!userData || userData.email !== this.account) {
throw new Error("The currently logged-in user has changed.");
}
return this._fetchTokenForUser(userData).then(token => {
this._token = token;
// Set the username to be the uid returned by the token server.
this.username = this._token.uid.toString();
// both Jelly and FxAccounts give us kA/kB as hex.
let kB = Utils.hexToBytes(userData.kB);
this._syncKeyBundle = deriveKeyBundle(kB);
return;
});
// Set the username to be the uid returned by the token server.
this.username = this._token.uid.toString();
// both Jelly and FxAccounts give us kA/kB as hex.
let kB = Utils.hexToBytes(userData.kB);
this._syncKeyBundle = deriveKeyBundle(kB);
});
},
// Refresh the sync token for the specified Firefox Accounts user.
// Refresh the sync token for the currently logged in Firefox Accounts user.
// This method requires that this module has been intialized for a user.
_refreshTokenForLoggedInUser: function() {
return this._fxaService.getSignedInUser().then(function (userData) {
if (!userData || userData.email !== this.account) {
// This means the logged in user changed or the identity module
// wasn't properly initialized. TODO: figure out what needs to
// happen here.
this._log.error("Currently logged in FxA user differs from what was locally noted. TODO: do proper error handling.");
return null;
}
return this._fetchTokenForUser(userData);
}.bind(this));
},
_refreshTokenForLoggedInUserSync: function() {
let cb = Async.makeSpinningCallback();
this._refreshTokenForLoggedInUser().then(function (token) {
cb(null, token);
},
function (err) {
cb(err);
});
try {
return cb.wait();
} catch (err) {
this._log.info("refreshTokenForLoggedInUserSync: " + err.message);
return null;
}
},
// This is a helper to fetch a sync token for the given user data.
_fetchTokenForUser: function(userData) {
let tokenServerURI = Svc.Prefs.get("tokenServerURI");
let log = this._log;
@ -411,31 +438,9 @@ this.BrowserIDManager.prototype = {
.then(token => {
token.expiration = this._now() + (token.duration * 1000);
return token;
})
.then(null, err => {
Cu.reportError("Failed to fetch token: " + err);
// XXX - TODO - work out how to set sync to an error state.
});
},
_fetchTokenForLoggedInUserSync: function() {
let cb = Async.makeSpinningCallback();
this._fxaService.getSignedInUser().then(userData => {
this._fetchTokenForUser(userData).then(token => {
cb(null, token);
}, err => {
cb(err);
});
});
try {
return cb.wait();
} catch (err) {
this._log.info("_fetchTokenForLoggedInUserSync: " + err.message);
return null;
}
},
getResourceAuthenticator: function () {
return this._getAuthenticationHeader.bind(this);
},
@ -454,7 +459,7 @@ this.BrowserIDManager.prototype = {
_getAuthenticationHeader: function(httpObject, method) {
if (!this.hasValidToken()) {
// Refresh token for the currently logged in FxA user
this._token = this._fetchTokenForLoggedInUserSync();
this._token = this._refreshTokenForLoggedInUserSync();
if (!this._token) {
return null;
}