From c0156f20dfd3f5bfa3a0e1c2b6ca0f2de34797a4 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Wed, 12 Nov 2014 16:38:10 +0000 Subject: Bug 1001462: Bug.search causes error when using simple token auth and specifying 'token' instead of 'Bugzilla_token' r=glob,a=glob --- Bugzilla/WebService/Util.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Bugzilla/WebService/Util.pm') diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm index e2bc78002..a0a51a8de 100644 --- a/Bugzilla/WebService/Util.pm +++ b/Bugzilla/WebService/Util.pm @@ -266,8 +266,8 @@ sub fix_credentials { # even if not calling GET /login. We also do not delete them as # GET /login requires "login" and "password". if (exists $params->{'login'} && exists $params->{'password'}) { - $params->{'Bugzilla_login'} = $params->{'login'}; - $params->{'Bugzilla_password'} = $params->{'password'}; + $params->{'Bugzilla_login'} = delete $params->{'login'}; + $params->{'Bugzilla_password'} = delete $params->{'password'}; } # Allow user to pass api_key=12345678 as a convenience which becomes # "Bugzilla_api_key" which is what the auth code looks for. @@ -277,7 +277,7 @@ sub fix_credentials { # Allow user to pass token=12345678 as a convenience which becomes # "Bugzilla_token" which is what the auth code looks for. if (exists $params->{'token'}) { - $params->{'Bugzilla_token'} = $params->{'token'}; + $params->{'Bugzilla_token'} = delete $params->{'token'}; } # Allow extensions to modify the credential data before login -- cgit v1.2.3-24-g4f1b