View | Details | Raw Unified | Return to bug 37286
Collapse All | Expand All

(-)a/Koha/App/Intranet.pm (-6 lines)
Lines 35-41 sub startup { Link Here
35
    $self->plugin('CGIBinKoha');
35
    $self->plugin('CGIBinKoha');
36
36
37
    # Create routes for API
37
    # Create routes for API
38
    # FIXME This generates routes like this: /api/api/v1/...
39
    $self->plugin('RESTV1');
38
    $self->plugin('RESTV1');
40
39
41
    $self->plugin('CSRF');
40
    $self->plugin('CSRF');
Lines 57-67 sub _before_dispatch { Link Here
57
    # Remove Koha version from URL
56
    # Remove Koha version from URL
58
    $path =~ s/_\d{2}\.\d{7}\.(js|css)/.$1/;
57
    $path =~ s/_\d{2}\.\d{7}\.(js|css)/.$1/;
59
58
60
    # See FIXME above
61
    if ( $path =~ m|^/api/v| ) {
62
        $path = '/api' . $path;
63
    }
64
65
    $c->req->url->path->parse($path);
59
    $c->req->url->path->parse($path);
66
}
60
}
67
61
(-)a/Koha/App/Opac.pm (-6 lines)
Lines 35-41 sub startup { Link Here
35
    $self->plugin( 'CGIBinKoha', opac => 1 );
35
    $self->plugin( 'CGIBinKoha', opac => 1 );
36
36
37
    # Create routes for API
37
    # Create routes for API
38
    # FIXME This generates routes like this: /api/api/v1/...
39
    $self->plugin('RESTV1');
38
    $self->plugin('RESTV1');
40
39
41
    $self->plugin('CSRF');
40
    $self->plugin('CSRF');
Lines 57-67 sub _before_dispatch { Link Here
57
    # Remove Koha version from URL
56
    # Remove Koha version from URL
58
    $path =~ s/_\d{2}\.\d{7}\.(js|css)/.$1/;
57
    $path =~ s/_\d{2}\.\d{7}\.(js|css)/.$1/;
59
58
60
    # See FIXME above
61
    if ( $path =~ m|^/api/v| ) {
62
        $path = '/api' . $path;
63
    }
64
65
    $c->req->url->path->parse($path);
59
    $c->req->url->path->parse($path);
66
}
60
}
67
61
(-)a/Koha/App/Plugin/RESTV1.pm (-1 / +2 lines)
Lines 26-32 use Koha::REST::V1; Link Here
26
sub register {
26
sub register {
27
    my ( $self, $app ) = @_;
27
    my ( $self, $app ) = @_;
28
28
29
    $app->routes->any('/api')->partial(1)->to( app => Koha::REST::V1->new );
29
    my $v1 = Koha::REST::V1->new( config => { route => '/v1' } );
30
    $app->routes->any('/api')->partial(1)->to( app => $v1 );
30
}
31
}
31
32
32
1;
33
1;
(-)a/Koha/REST/V1.pm (-2 / +3 lines)
Lines 110-119 sub startup { Link Here
110
            }
110
            }
111
        ) unless C4::Context->needs_install;    # load only if Koha is installed
111
        ) unless C4::Context->needs_install;    # load only if Koha is installed
112
112
113
        my $route = $self->config('route') // '/api/v1';
114
113
        $self->plugin(
115
        $self->plugin(
114
            OpenAPI => {
116
            OpenAPI => {
115
                spec  => $spec,
117
                spec  => $spec,
116
                route => $self->routes->under('/api/v1')->to('Auth#under'),
118
                route => $self->routes->under($route)->to('Auth#under'),
117
            }
119
            }
118
        );
120
        );
119
121
120
- 

Return to bug 37286