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

broken refactor but need to leave now...

Browse Source
This commit is contained in:
Oliver Gorwits
2019-03-22 09:10:19 +00:00
parent 3e0af5888c
commit bd9ba3bcb8
6 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,7 @@ use HTML::Entities (); # to ensure dependency is met
use URI::QueryParam (); # part of URI, to add helper methods
use Path::Class 'dir';
use Module::Load ();
use App::Netdisco::Util::Web
qw/request_is_api interval_to_daterange/;
use App::Netdisco::Util::Web 'interval_to_daterange';
use App::Netdisco::Web::AuthN;
use App::Netdisco::Web::OpenAPI;
@@ -202,7 +201,7 @@ hook 'after' => sub {
};
any qr{.*} => sub {
if (request_is_api()) {
if (request->is_api) {
status(404);
return to_json { error => 'not found' };
}
@@ -222,6 +221,16 @@ any qr{.*} => sub {
$response->status($status || 302);
$response->headers('Location' => $destination);
};
# helper for handlers of more than one method type
*Dancer::Request::is_api = sub {
my $self = shift;
vars->{'orig_path'} = request->path unless request->is_forward;
my $path = ($self->is_forward ? vars->{'orig_path'} : $self->path);
return (setting('api_token_lifetime')
and $self->accept =~ m/(?:json|javascript)/
and index($path, uri_for('/api')->path) == 0);
};
}
true;