wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1121329 - fixes to promise handling in FxA and Hawk. r=ckarlof

Browse Source
This commit is contained in:
Mark Hammond 2015-01-23 12:05:14 +11:00
parent 45231676f2
commit 3a59e47a0a
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/common/hawkclient.js
View File

@ -279,11 +279,16 @@ this.HawkClient.prototype = {
};
let request = this.newHAWKAuthenticatedRESTRequest(uri, credentials, extra);
try {
if (method == "post" || method == "put" || method == "patch") {
request[method](payloadObj, onComplete);
} else {
request[method](onComplete);
}
} catch (ex) {
log.error("Failed to make hawk request", ex);
deferred.reject(ex);
}
return deferred.promise;
},

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

@ -512,7 +512,9 @@ this.BrowserIDManager.prototype = {
return true;
},
// Refresh the sync token for our user.
// Refresh the sync token for our user. Returns a promise that resolves
// with a token (which may be null in one sad edge-case), or rejects with an
// error.
_fetchTokenForUser: function() {
let tokenServerURI = Svc.Prefs.get("tokenServerURI");
if (tokenServerURI.endsWith("/")) { // trailing slashes cause problems...
@ -527,8 +529,7 @@ this.BrowserIDManager.prototype = {
// return null for the token - sync calling unlockAndVerifyAuthState()
// before actually syncing will setup the error states if necessary.
if (!this._canFetchKeys()) {
log.info("_fetchTokenForUser has no keys to use.");
return null;
return Promise.resolve(null);
}
let maybeFetchKeys = () => {
@ -593,7 +594,7 @@ this.BrowserIDManager.prototype = {
if (err.response && err.response.status === 401) {
err = new AuthenticationError(err);
// A hawkclient error.
} else if (err.code === 401) {
} else if (err.code && err.code === 401) {
err = new AuthenticationError(err);
}
@ -628,6 +629,9 @@ this.BrowserIDManager.prototype = {
this._log.debug("_ensureValidToken already has one");
return Promise.resolve();
}
// reset this._token as a safety net to reduce the possibility of us
// repeatedly attempting to use an invalid token if _fetchTokenForUser throws.
this._token = null;
return this._fetchTokenForUser().then(
token => {
this._token = token;
@ -707,6 +711,17 @@ BrowserIDClusterManager.prototype = {
_findCluster: function() {
let endPointFromIdentityToken = function() {
// The only reason (in theory ;) that we can end up with a null token
// is when this.identity._canFetchKeys() returned false. In turn, this
// should only happen if the master-password is locked or the credentials
// storage is screwed, and in those cases we shouldn't have started
// syncing so shouldn't get here anyway.
// But better safe than sorry! To keep things clearer, throw an explicit
// exception - the message will appear in the logs and the error will be
// treated as transient.
if (!this.identity._token) {
throw new Error("Can't get a cluster URL as we can't fetch keys.");
}
let endpoint = this.identity._token.endpoint;
// For Sync 1.5 storage endpoints, we use the base endpoint verbatim.
// However, it should end in "/" because we will extend it with

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

@ -95,6 +95,7 @@ add_task(function test_initialializeWithNoKeys() {
yield browseridManager.whenReadyToAuthenticate.promise;
do_check_eq(Status.login, LOGIN_SUCCEEDED, "login succeeded even without keys");
do_check_false(browseridManager._canFetchKeys(), "_canFetchKeys reflects lack of keys");
do_check_eq(browseridManager._token, null, "we don't have a token");
});
add_test(function test_getResourceAuthenticator() {