From 194e4f5ed69914becb7d388f6f17f0d8022a761e Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 24 Jan 2019 15:54:08 +0000 Subject: [PATCH] Bug 22132: (QA follow-up) Tests - use Mojo builtin for auth Mojolicious has built in handling for encoding/decoding of of basic auth paramenters. We should use it to simplify our test here. --- t/db_dependent/api/v1/auth_basic.t | 41 ++++++++++-------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/t/db_dependent/api/v1/auth_basic.t b/t/db_dependent/api/v1/auth_basic.t index d689678cce..3c29fa9eb2 100644 --- a/t/db_dependent/api/v1/auth_basic.t +++ b/t/db_dependent/api/v1/auth_basic.t @@ -23,8 +23,6 @@ use Test::Mojo; use t::lib::TestBuilder; use t::lib::Mocks; -use MIME::Base64; - my $schema = Koha::Database->new->schema; my $builder = t::lib::TestBuilder->new; @@ -44,22 +42,19 @@ subtest 'success tests' => sub { my $patron = $builder->build_object( { class => 'Koha::Patrons', value => { userid => 'tomasito', flags => 2**4 } } ); $patron->set_password($password); + my $userid = $patron->userid; - my $credentials = encode_base64( $patron->userid . ':' . $password ); - - $tx = $t->ua->build_tx( GET => "/api/v1/patrons" ); - $tx->req->headers->authorization("Basic $credentials"); - $t->request_ok($tx)->status_is( 200, 'Successful authentication and permissions check' ); + $t->get_ok("//$userid:$password@/api/v1/patrons") + ->status_is( 200, 'Successful authentication and permissions check' ); $patron->flags(undef)->store; - $tx = $t->ua->build_tx( GET => "/api/v1/patrons" ); - $tx->req->headers->authorization("Basic $credentials"); - $t->request_ok($tx)->status_is( 403, 'Successful authentication and not enough permissions' ) - ->json_is( + $t->get_ok("//$userid:$password@/api/v1/patrons") + ->status_is( 403, 'Successful authentication and not enough permissions' ) + ->json_is( '/error' => 'Authorization failure. Missing required permission(s).', 'Error message returned' - ); + ); $schema->storage->txn_rollback; }; @@ -78,26 +73,18 @@ subtest 'failure tests' => sub { my $patron = $builder->build_object( { class => 'Koha::Patrons', value => { userid => 'tomasito', flags => 2**4 } } ); $patron->set_password($password); + my $userid = $patron->userid; - $tx = $t->ua->build_tx( GET => "/api/v1/patrons" ); - $tx->req->headers->authorization("Basic "); - $t->request_ok($tx)->status_is( 401, 'No credentials passed' ); - - $patron->flags(undef)->store; - - my $credentials = encode_base64( $patron->userid . ':' . $bad_password ); - - $tx = $t->ua->build_tx( GET => "/api/v1/patrons" ); - $tx->req->headers->authorization("Basic $credentials"); - $t->request_ok($tx)->status_is( 403, 'Successful authentication and not enough permissions' ) - ->json_is( '/error' => 'Invalid password', 'Error message returned' ); + $t->get_ok("//$userid:@/api/v1/patrons") + ->status_is( 401, 'No credentials passed' ); + $t->get_ok("//$userid:$bad_password@/api/v1/patrons") + ->status_is( 403, 'Failed authentication, invalid password' ); + ->json_is( '/error' => 'Invalid password', 'Error message returned' ); t::lib::Mocks::mock_preference( 'RESTBasicAuth', 0 ); - $tx = $t->ua->build_tx( GET => "/api/v1/patrons" ); - $tx->req->headers->authorization("Basic $credentials"); - $t->request_ok($tx) + $t->get_ok("//$userid:$password@/api/v1/patrons") ->status_is( 401, 'Basic authentication is disabled' ) ->json_is( '/error' => 'Basic authentication disabled', 'Expected error message rendered' ); -- 2.20.1