Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 967120 - Follow-up to fix broken xpcshell and mochitests r=markh

Browse Source
This commit is contained in:
Tim Taubert 2014-02-04 12:03:18 +01:00
parent ccfeb9d238
commit 2d0c6570e7
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,8 @@ function AuthenticationError(message) {
}
this.BrowserIDManager = function BrowserIDManager() {
// NOTE: _fxaService and _tokenServerClient are replaced with mocks by
// the test suite.
this._fxaService = fxAccounts;
this._tokenServerClient = new TokenServerClient();
// will be a promise that resolves when we are ready to authenticate
@ -112,7 +114,7 @@ this.BrowserIDManager.prototype = {
this.whenReadyToAuthenticate = Promise.defer();
this._shouldHaveSyncKeyBundle = false;
return fxAccounts.getSignedInUser().then(accountData => {
return this._fxaService.getSignedInUser().then(accountData => {
if (!accountData) {
this._log.info("initializeWithCurrentIdentity has no user logged in");
this._account = null;
@ -124,7 +126,7 @@ this.BrowserIDManager.prototype = {
// 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 => {
this._fxaService.whenVerified(accountData).then(accountData => {
// We do the background keybundle fetch...
this._log.info("Starting fetch for key bundle.");
if (this.needsCustomization) {
@ -141,7 +143,7 @@ this.BrowserIDManager.prototype = {
Services.prefs.clearUserPref(PREF_SYNC_SHOW_CUSTOMIZATION);
} else {
// Log out if the user canceled the dialog.
return fxAccounts.signOut();
return this._fxaService.signOut();
}
}
}).then(() => {
@ -411,6 +413,7 @@ this.BrowserIDManager.prototype = {
let tokenServerURI = Svc.Prefs.get("tokenServerURI");
let log = this._log;
let client = this._tokenServerClient;
let fxa = this._fxaService;
// Both Jelly and FxAccounts give us kB as hex
let kBbytes = CommonUtils.hexToBytes(userData.kB);
@ -437,7 +440,7 @@ this.BrowserIDManager.prototype = {
function getAssertion() {
log.debug("Getting an assertion");
let audience = Services.io.newURI(tokenServerURI, null, null).prePath;
return fxAccounts.getAssertion(audience).then(null, err => {
return fxa.getAssertion(audience).then(null, err => {
if (err.code === 401) {
throw new AuthenticationError("Unable to get assertion for user");
} else {
@ -448,7 +451,7 @@ this.BrowserIDManager.prototype = {
// wait until the account email is verified and we know that
// getAssertion() will return a real assertion (not null).
return this._fxaService.whenVerified(userData)
return fxa.whenVerified(userData)
.then(() => getAssertion())
.then(assertion => getToken(tokenServerURI, assertion))
.then(token => {
@ -561,8 +564,9 @@ BrowserIDClusterManager.prototype = {
__proto__: ClusterManager.prototype,
_findCluster: function() {
let fxa = this.identity._fxaService; // will be mocked for tests.
let promiseClusterURL = function() {
return fxAccounts.getSignedInUser().then(userData => {
return fxa.getSignedInUser().then(userData => {
return this.identity._fetchTokenForUser(userData).then(token => {
let endpoint = token.endpoint;
// For Sync 1.5 storage endpoints, we use the base endpoint verbatim.

38
services/sync/tests/unit/test_browserid_identity.js
View File

@ -11,6 +11,7 @@ Cu.import("resource://testing-common/services/sync/utils.js");
Cu.import("resource://services-common/hawk.js");
Cu.import("resource://gre/modules/FxAccounts.jsm");
Cu.import("resource://gre/modules/FxAccountsClient.jsm");
Cu.import("resource://gre/modules/FxAccountsCommon.js");
const SECOND_MS = 1000;
const MINUTE_MS = SECOND_MS * 60;
@ -33,22 +34,25 @@ MockFxAccountsClient.prototype = {
__proto__: FxAccountsClient.prototype
};
let MockFxAccounts = function() {
this._now_is = Date.now();
function MockFxAccounts() {
return new FxAccounts({
_now_is: Date.now(),
let mockInternal = {
now: () => {
now: function () {
return this._now_is;
},
fxAccountsClient: new MockFxAccountsClient()
};
getCertificate: function(data, keyPair, mustBeValidUntil) {
this.cert = {
validUntil: Date.now() + CERT_LIFETIME,
cert: "certificate",
};
return Promise.resolve(this.cert.cert);
},
FxAccounts.apply(this, [mockInternal]);
};
MockFxAccounts.prototype = {
__proto__: FxAccounts.prototype,
};
fxAccountsClient: new MockFxAccountsClient()
});
}
function run_test() {
initTestLogging("Trace");
@ -129,7 +133,7 @@ add_test(function test_resourceAuthenticatorSkew() {
do_check_eq(fxaClient.localtimeOffsetMsec, localtimeOffsetMsec);
let fxa = new MockFxAccounts();
fxa._now_is = now;
fxa.internal._now_is = now;
fxa.internal.fxAccountsClient = fxaClient;
// Picked up by the signed-in user module
@ -141,6 +145,10 @@ add_test(function test_resourceAuthenticatorSkew() {
// Mocks within mocks...
configureFxAccountIdentity(browseridManager, identityConfig);
// Ensure the new FxAccounts mock has a signed-in user.
fxa.internal.signedInUser = browseridManager._fxaService.internal.signedInUser;
browseridManager._fxaService = fxa;
do_check_eq(browseridManager._fxaService.internal.now(), now);
@ -186,10 +194,14 @@ add_test(function test_RESTResourceAuthenticatorSkew() {
let fxaClient = new MockFxAccountsClient();
fxaClient.hawk = hawkClient;
let fxa = new MockFxAccounts();
fxa._now_is = now;
fxa.internal._now_is = now;
fxa.internal.fxAccountsClient = fxaClient;
configureFxAccountIdentity(browseridManager, identityConfig);
// Ensure the new FxAccounts mock has a signed-in user.
fxa.internal.signedInUser = browseridManager._fxaService.internal.signedInUser;
browseridManager._fxaService = fxa;
do_check_eq(browseridManager._fxaService.internal.now(), now);