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 1076650: retry registration on a 401 response. r=mikedeboer

Browse Source
This commit is contained in:
Paul Kerr [:pkerr] 2014-12-23 12:39:52 +00:00
parent a0332fd40b
commit 3a4af941e5
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
browser/components/loop/MozLoopService.jsm
View File

@ -432,25 +432,25 @@ let MozLoopServiceInternal = {
* @param {String} method The request method, e.g. 'POST', 'GET'.
* @param {Object} payloadObj An object which is converted to JSON and
* transmitted with the request.
* @param {Boolean} [retryOn401=true] Whether to retry if authentication fails.
* @returns {Promise}
* Returns a promise that resolves to the response of the API call,
* or is rejected with an error. If the server response can be parsed
* as JSON and contains an 'error' property, the promise will be
* rejected with this JSON-parsed response.
*/
hawkRequestInternal: function(sessionType, path, method, payloadObj) {
hawkRequestInternal: function(sessionType, path, method, payloadObj, retryOn401 = true) {
if (!gHawkClient) {
gHawkClient = new HawkClient(this.loopServerUri);
}
let sessionToken;
let sessionToken, credentials;
try {
sessionToken = Services.prefs.getCharPref(this.getSessionTokenPrefName(sessionType));
} catch (x) {
// It is ok for this not to exist, we'll default to sending no-creds
}
let credentials;
if (sessionToken) {
// true = use a hex key, as required by the server (see bug 1032738).
credentials = deriveHawkCredentials(sessionToken, "sessionToken",
@ -471,27 +471,40 @@ let MozLoopServiceInternal = {
payloadObj = newPayloadObj;
}
return gHawkClient.request(path, method, credentials, payloadObj).then((result) => {
this.clearError("network");
return result;
}, (error) => {
if (error.code == 401) {
let handle401Error = (error) => {
if (sessionType === LOOP_SESSION_TYPE.FXA) {
MozLoopService.logOutFromFxA().then(() => {
// Set a user-visible error after logOutFromFxA clears existing ones.
this.setError("login", error);
});
} else if (this.urlExpiryTimeIsInFuture()) {
// If there are no Guest URLs in the future, don't use setError to notify the user since
// there isn't a need for a Guest registration at this time.
this.setError("registration", error);
}
};
return gHawkClient.request(path, method, credentials, payloadObj).then(
(result) => {
this.clearError("network");
return result;
},
(error) => {
if (error.code && error.code == 401) {
this.clearSessionToken(sessionType);
if (sessionType == LOOP_SESSION_TYPE.FXA) {
MozLoopService.logOutFromFxA().then(() => {
// Set a user-visible error after logOutFromFxA clears existing ones.
this.setError("login", error);
});
} else {
if (!this.urlExpiryTimeIsInFuture()) {
// If there are no Guest URLs in the future, don't use setError to notify the user since
// there isn't a need for a Guest registration at this time.
throw error;
}
this.setError("registration", error);
if (retryOn401 && sessionType === LOOP_SESSION_TYPE.GUEST) {
log.info("401 and INVALID_AUTH_TOKEN - retry registration");
return this.registerWithLoopServer(sessionType, false).then(
() => {
return this.hawkRequestInternal(sessionType, path, method, payloadObj, false);
},
() => {
handle401Error(error); //Process the original error that triggered the retry.
throw error;
}
);
}
handle401Error(error);
}
throw error;
});
@ -625,7 +638,7 @@ let MozLoopServiceInternal = {
rooms: roomsPushURL,
},
};
return this.hawkRequestInternal(sessionType, "/registration", "POST", msg)
return this.hawkRequestInternal(sessionType, "/registration", "POST", msg, false)
.then((response) => {
// If this failed we got an invalid token.
if (!this.storeSessionToken(sessionType, response.headers)) {