From 99589d82d943bedcd9a8ade3d91f84d770fcd5c5 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Thu, 29 Aug 2013 17:25:24 -0400
Subject: Bug 909634 - backport upstream bug 893195 to bmo/4.2 for token auth
 support in webservices

---
 Bugzilla/WebService/Server/JSONRPC.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/WebService/Server/JSONRPC.pm')

diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm
index 4bf3fb191..109c530b7 100644
--- a/Bugzilla/WebService/Server/JSONRPC.pm
+++ b/Bugzilla/WebService/Server/JSONRPC.pm
@@ -37,7 +37,7 @@ BEGIN {
 
 use Bugzilla::Error;
 use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Util qw(taint_data);
+use Bugzilla::WebService::Util qw(taint_data fix_credentials);
 use Bugzilla::Util;
 
 use HTTP::Message;
@@ -385,6 +385,10 @@ sub _argument_type_check {
         }
     }
 
+    # Update the params to allow for several convenience key/values
+    # use for authentication
+    fix_credentials($params);
+
     Bugzilla->input_params($params);
 
     if ($self->request->method eq 'POST') {
-- 
cgit v1.2.3-24-g4f1b