summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Auth/Login/Cookie.pm15
1 files changed, 6 insertions, 9 deletions
diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm
index 0b5842523..0a2386ee9 100644
--- a/Bugzilla/Auth/Login/Cookie.pm
+++ b/Bugzilla/Auth/Login/Cookie.pm
@@ -64,15 +64,7 @@ sub get_login_info {
# If the call is for a web service, and an api token is provided, check
# it is valid.
if (i_am_webservice()) {
- if ($login_cookie
- && Bugzilla->usage_mode == USAGE_MODE_REST
- && !exists Bugzilla->input_params->{Bugzilla_api_token})
- {
- # REST requires an api-token when using cookie authentication
- # fall back to a non-authenticated request
- $login_cookie = '';
-
- } elsif (Bugzilla->input_params->{Bugzilla_api_token}) {
+ if (exists Bugzilla->input_params->{Bugzilla_api_token}) {
my $api_token = Bugzilla->input_params->{Bugzilla_api_token};
my ($token_user_id, undef, undef, $token_type)
= Bugzilla::Token::GetTokenData($api_token);
@@ -84,6 +76,11 @@ sub get_login_info {
}
$is_internal = 1;
}
+ elsif ($login_cookie && Bugzilla->usage_mode == USAGE_MODE_REST) {
+ # REST requires an api-token when using cookie authentication
+ # fall back to a non-authenticated request
+ $login_cookie = '';
+ }
}
}