gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 24003: (follow-up) Move interface setting to a more readable place 

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
This commit is contained in:
Tomas Cohen Arazi 2020-06-05 09:47:47 -03:00 committed by Aleisha Amohia
parent 977130c7ae
commit 7d20f2cdc3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Koha/REST/V1/Auth.pm
View File

@ -178,7 +178,6 @@ sub authenticate_api_request {
if ($valid_token) {
my $patron_id = Koha::ApiKeys->find( $valid_token->{client_id} )->patron_id;
$user = Koha::Patrons->find($patron_id);
C4::Context->interface('api');
}
else {
# If we have "Authorization: Bearer" header and oauth authentication
@ -195,7 +194,6 @@ sub authenticate_api_request {
);
}
$user = $c->_basic_auth( $authorization_header );
C4::Context->interface('api');
unless ( $user ) {
# If we have "Authorization: Basic" header and authentication
# failed, do not try other authentication means
@ -244,6 +242,7 @@ sub authenticate_api_request {
}
$c->stash('koha.user' => $user);
C4::Context->interface('api');
if ( $user and !$cookie_auth ) { # cookie-auth sets this and more, don't mess with that
C4::Context->_new_userenv( $user->borrowernumber );