135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add more openapi defs

Browse Source
This commit is contained in:
Oliver Gorwits
2018-12-31 22:59:13 +00:00
parent 0866747688
commit 0151fc86a7
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/App/Netdisco/Web.pm
View File

@@ -72,6 +72,15 @@ my $skey = $sessions->find({id => 'dancer_session_cookie_key'});
setting('session_cookie_key' => $skey->get_column('a_session')) if $skey; setting('session_cookie_key' => $skey->get_column('a_session')) if $skey;
Dancer::Session::Cookie::init(session); Dancer::Session::Cookie::init(session);
# setup for swagger API
my $swagger = Dancer::Plugin::Swagger->instance->doc;
$swagger->{schemes} = ['http','https'];
$swagger->{consumes} = 'application/json';
$swagger->{produces} = 'application/json';
$swagger->{securityDefinitions} = { APIKeyHeader =>
{ type => 'apiKey', name => 'Authorization', in => 'header' } };
$swagger->{security} = [ { APIKeyHeader => [] } ];
# workaround for https://github.com/PerlDancer/Dancer/issues/935 # workaround for https://github.com/PerlDancer/Dancer/issues/935
hook after_error_render => sub { setting('layout' => 'main') }; hook after_error_render => sub { setting('layout' => 'main') };

2
lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
View File

@@ -64,7 +64,7 @@ sub validate_api_token {
my $users_table = $settings->{users_resultset} || 'User'; my $users_table = $settings->{users_resultset} || 'User';
my $token_column = $settings->{users_token_column} || 'token'; my $token_column = $settings->{users_token_column} || 'token';
$token =~ s/^Apikey //i or return; $token =~ s/^Apikey //i; # should be there but swagger-ui doesn't add it
my $user = try { my $user = try {
$database->resultset($users_table)->find({ $token_column => $token }); $database->resultset($users_table)->find({ $token_column => $token });
}; };