From ccb36aaa7adc9d07d74dd5c2e64763cc8749cf4c Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Tue, 23 Mar 2010 16:08:48 -0700
Subject: Bug 553770: Make the JSON-RPC WebService throw a proper error when
 you don't provide login credentials on a LOGIN_REQUIRED page. (Before this,
 it was attempting to display the HTML login page to JSON-RPC clients.) r=dkl,
 a=mkanat

---
 Bugzilla/Auth/Login/CGI.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Bugzilla/Auth')

diff --git a/Bugzilla/Auth/Login/CGI.pm b/Bugzilla/Auth/Login/CGI.pm
index 407582af4..8e877b951 100644
--- a/Bugzilla/Auth/Login/CGI.pm
+++ b/Bugzilla/Auth/Login/CGI.pm
@@ -57,10 +57,8 @@ sub fail_nodata {
     my $cgi = Bugzilla->cgi;
     my $template = Bugzilla->template;
 
-    if (Bugzilla->error_mode == Bugzilla::Constants::ERROR_MODE_DIE_SOAP_FAULT) {
-        die SOAP::Fault
-            ->faultcode(ERROR_AUTH_NODATA)
-            ->faultstring('Login Required');
+    if (Bugzilla->usage_mode != USAGE_MODE_BROWSER) {
+        ThrowUserError('login_required');
     }
 
     print $cgi->header();
-- 
cgit v1.2.3-24-g4f1b