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 958464 - Report cause of 401 error from token server. r=ckarlof

Browse Source
This commit is contained in:
Jed Parsons 2014-01-28 15:01:23 -08:00
parent 17142620fc
commit ed85114ff4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/common/tests/unit/test_tokenserverclient.js
View File

@ -335,15 +335,15 @@ add_test(function test_400_response() {
}); });
}); });
add_test(function test_401_response() { add_test(function test_401_with_error_cause() {
_("Ensure HTTP 401 is converted to invalid-credentials."); _("Ensure 401 cause is specified in body.status");
let server = httpd_setup({ let server = httpd_setup({
"/1.0/foo/1.0": function(request, response) { "/1.0/foo/1.0": function(request, response) {
response.setStatusLine(request.httpVersion, 401, "Unauthorized"); response.setStatusLine(request.httpVersion, 401, "Unauthorized");
response.setHeader("Content-Type", "application/json; charset=utf-8"); response.setHeader("Content-Type", "application/json; charset=utf-8");
let body = "{}"; // Actual content may not be used. let body = JSON.stringify({status: "no-soup-for-you"});
response.bodyOutputStream.write(body, body.length); response.bodyOutputStream.write(body, body.length);
} }
}); });
@ -354,7 +354,7 @@ add_test(function test_401_response() {
do_check_neq(null, error); do_check_neq(null, error);
do_check_eq("TokenServerClientServerError", error.name); do_check_eq("TokenServerClientServerError", error.name);
do_check_neq(null, error.response); do_check_neq(null, error.response);
do_check_eq(error.cause, "invalid-credentials"); do_check_eq(error.cause, "no-soup-for-you");
server.stop(run_next_test); server.stop(run_next_test);
}); });

4
services/common/tokenserverclient.js
View File

@ -326,8 +326,10 @@ TokenServerClient.prototype = {
error.message = "Malformed request."; error.message = "Malformed request.";
error.cause = "malformed-request"; error.cause = "malformed-request";
} else if (response.status == 401) { } else if (response.status == 401) {
// Cause can be invalid-credentials, invalid-timestamp, or
// invalid-generation.
error.message = "Authentication failed."; error.message = "Authentication failed.";
error.cause = "invalid-credentials"; error.cause = result.status;
} }
// 403 should represent a "condition acceptance needed" response. // 403 should represent a "condition acceptance needed" response.