From f670031d9800414d5c7f1372e3231e379f3ab2cd Mon Sep 17 00:00:00 2001
From: Ed J <mohawk2@users.noreply.github.com>
Date: Wed, 7 Nov 2018 05:57:50 +0000
Subject: [PATCH 1/2] de-hardcode "/yancy" in 404 template, make configurable

---
 lib/Mojolicious/Plugin/Yancy.pm | 28 ++++++++++++++++++++--------
 lib/Yancy.pm                    |  2 +-
 lib/Yancy/Help/Config.pod       | 17 +++++++++++++++++
 t/api.t                         |  9 +++++++++
 t/plugin/auth/basic.t           |  2 +-
 t/standalone.t                  | 15 +++++++++++++++
 6 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/lib/Mojolicious/Plugin/Yancy.pm b/lib/Mojolicious/Plugin/Yancy.pm
index ccac6da6..8021914a 100644
--- a/lib/Mojolicious/Plugin/Yancy.pm
+++ b/lib/Mojolicious/Plugin/Yancy.pm
@@ -54,12 +54,21 @@ connections.
     helper pg => sub { state $pg = Mojo::Pg->new( 'postgres:///myapp' ) };
     plugin Yancy => { backend => { Pg => app->pg } };
 
+=item editor
+
+Configuration for the Yancy web application. A hash, permitting these
+keys:
+
+=over
+
 =item route
 
 A base route to add Yancy to. This allows you to customize the URL
-and add authentication or authorization. Defaults to allowing access
-to the Yancy web application under C</yancy>, and the REST API under
-C</yancy/api>.
+and add authentication or authorization. If a string is supplied, it
+will be turned into a L<Mojolicious::Routes::Route> object with that
+path, under the app. Defaults to C</yancy>.
+
+=back
 
 =item return_to
 
@@ -410,8 +419,11 @@ has _filters => sub { {} };
 
 sub register {
     my ( $self, $app, $config ) = @_;
-    my $route = $config->{route} // $app->routes->any( '/yancy' );
-    $route->to( return_to => $config->{return_to} // '/' );
+    my $editor_route = $config->{editor}{route} // '/yancy';
+    $editor_route = $app->routes->any( $editor_route )
+        if !UNIVERSAL::isa( $editor_route, 'Mojolicious::Routes::Route' );
+    $editor_route->to( return_to => $config->{return_to} // '/' );
+    my $api_route = $editor_route->any( '/api' )->name( 'yancy.api' );
     $config->{api_controller} //= 'Yancy::API';
     $config->{openapi} = _ensure_json_data( $app, $config->{openapi} );
 
@@ -423,7 +435,7 @@ sub register {
 
     # Helpers
     $app->helper( 'yancy.config' => sub { return $config } );
-    $app->helper( 'yancy.route' => sub { return $route } );
+    $app->helper( 'yancy.route' => sub { return $editor_route } );
     $app->helper( 'yancy.backend' => sub {
         state $backend = load_backend( $config->{backend}, $config->{collections} || $config->{openapi}{definitions} );
     } );
@@ -444,7 +456,7 @@ sub register {
     $app->helper( 'yancy.filter.apply' => curry( \&_helper_filter_apply, $self ) );
 
     # Routes
-    $route->get( '/' )->name( 'yancy.index' )
+    $editor_route->get( '/' )->name( 'yancy.index' )
         ->to(
             template => 'yancy/index',
             controller => $config->{api_controller},
@@ -497,7 +509,7 @@ sub register {
     $self->_openapi_spec_add_mojo( $spec, $config );
 
     my $openapi = $app->plugin( OpenAPI => {
-        route => $route->any( '/api' )->name( 'yancy.api' ),
+        route => $api_route,
         spec => $spec,
         default_response_name => '_Error',
     } );
diff --git a/lib/Yancy.pm b/lib/Yancy.pm
index cd1966da..56eb4096 100644
--- a/lib/Yancy.pm
+++ b/lib/Yancy.pm
@@ -190,7 +190,7 @@ __DATA__
             <p>This is the default not found page.</p>
 
             <h2>Getting Started</h2>
-            <p>To edit your data, go to <a href="/yancy">/yancy</a>.</p>
+            <p>To edit your data, go to <a href="<%== url_for 'yancy.index' %>"><%== url_for 'yancy.index' %></a>.</p>
             <p>Add your templates to <tt><%= app->home->child( 'templates' ) %></tt>. Each template becomes a URL in your
             site:</p>
             <ul>
diff --git a/lib/Yancy/Help/Config.pod b/lib/Yancy/Help/Config.pod
index 6e08fa37..9864f427 100644
--- a/lib/Yancy/Help/Config.pod
+++ b/lib/Yancy/Help/Config.pod
@@ -489,6 +489,23 @@ To customize how Yancy responds to API requests with data, you can
 create a custom controller and set the class name here. For details how
 to create a custom API controller, see L<Yancy::Controller::Yancy::API>.
 
+=head2 C<editor>
+
+A hash, under which lives configuration for the Yancy editor, with these
+possible keys:
+
+=over
+
+=item route
+
+To customize the URL under which the Yancy editor is found. If not given,
+defaults to C</yancy>. If a L<Mojolicious::Routes::Route> object is not
+given, it will be treated as a string, and used to create one.
+
+Note, the various assets will still live on the web app under C</yancy>.
+
+=back
+
 =head1 SEE ALSO
 
 L<Yancy>, L<Mojolicious::Plugin::Yancy>
diff --git a/t/api.t b/t/api.t
index e183a46d..f6755c56 100644
--- a/t/api.t
+++ b/t/api.t
@@ -144,6 +144,15 @@ subtest 'read_schema collections' => \&test_api,
     } ),
     '/yancy/api';
 
+( $backend_url, $backend, %items ) = init_backend( $collections, %data );
+subtest 'different Yancy URL' => \&test_api,
+    Test::Mojo->new( 'Yancy', {
+        backend => $backend_url,
+        collections => $collections,
+        editor => { route => '/yancy2' },
+    } ),
+    '/yancy2/api';
+
 my $openapi = decode_json path ( $Bin, 'share', 'openapi-spec.json' )->slurp;
 ( $backend_url, $backend, %items ) = init_backend( $collections, %data );
 subtest 'pass openapi' => \&test_api,
diff --git a/t/plugin/auth/basic.t b/t/plugin/auth/basic.t
index cd9b43e3..6741520c 100644
--- a/t/plugin/auth/basic.t
+++ b/t/plugin/auth/basic.t
@@ -239,7 +239,7 @@ subtest 'standalone plugin' => sub {
     $t->app->plugin( 'Yancy', {
         backend => $backend_url,
         collections => $collections,
-        route => $base_route->any( '/yancy' ),
+        editor => { route => $base_route->any( '/yancy' ) },
     } );
 
     unshift @{$t->app->plugins->namespaces}, 'Yancy::Plugin';
diff --git a/t/standalone.t b/t/standalone.t
index 6ef00079..13204781 100644
--- a/t/standalone.t
+++ b/t/standalone.t
@@ -173,4 +173,19 @@ subtest 'with openapi spec file' => sub {
       ;
 };
 
+subtest 'configurable editor path' => sub {
+    my $t = Test::Mojo->new( 'Yancy', {
+        backend => $backend_url,
+        collections => $collections,
+        read_schema => 1,
+        editor => { route => '/notyancy' },
+    } );
+    $t->get_ok( '/notyancy/api' ) # if just /notyancy, SEGV w/Devel::Cover
+      ->status_is( 200 )
+      ;
+    $t->get_ok( '/yancy/bootstrap.css' ) # still located there, static
+      ->status_is( 200 )
+      ;
+};
+
 done_testing;

From ba07b50e8685abb1c79335e07abe6bf251eea382 Mon Sep 17 00:00:00 2001
From: Ed J <mohawk2@users.noreply.github.com>
Date: Tue, 13 Nov 2018 17:12:18 +0000
Subject: [PATCH 2/2] de-hardcode "/yancy/api", make configurable

---
 lib/Mojolicious/Plugin/Yancy.pm | 26 ++++++++++++++++++++++++--
 lib/Yancy/Help/Config.pod       |  6 ++++++
 t/api.t                         | 18 ++++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/lib/Mojolicious/Plugin/Yancy.pm b/lib/Mojolicious/Plugin/Yancy.pm
index 8021914a..8b8fc939 100644
--- a/lib/Mojolicious/Plugin/Yancy.pm
+++ b/lib/Mojolicious/Plugin/Yancy.pm
@@ -68,6 +68,12 @@ and add authentication or authorization. If a string is supplied, it
 will be turned into a L<Mojolicious::Routes::Route> object with that
 path, under the app. Defaults to C</yancy>.
 
+=item api_route
+
+A route as above, for the editor's REST API, living under the editor's
+route. A string may also be supplied, defaulting to C</api>. This means
+the default REST API path will be C</yancy/api>.
+
 =back
 
 =item return_to
@@ -112,6 +118,19 @@ authentication or authorization checks:
     } );
     $auth_route->add_child( $_ ) for @need_auth;
 
+=head2 yancy.api_route
+
+Get the route where the Yancy API will appear. Useful for adding
+authentication or authorization checks:
+
+    my $api_route = $c->yancy->api_route;
+    my @need_auth = @{ $api_route->children };
+    my $auth_route = $api_route->under( sub {
+        # ... Check auth
+        return 1;
+    } );
+    $auth_route->add_child( $_ ) for @need_auth;
+
 =head2 yancy.plugin
 
 Add a Yancy plugin. Yancy plugins are Mojolicious plugins that require
@@ -423,7 +442,9 @@ sub register {
     $editor_route = $app->routes->any( $editor_route )
         if !UNIVERSAL::isa( $editor_route, 'Mojolicious::Routes::Route' );
     $editor_route->to( return_to => $config->{return_to} // '/' );
-    my $api_route = $editor_route->any( '/api' )->name( 'yancy.api' );
+    my $api_route = $config->{editor}{api_route} // '/api';
+    $api_route = $editor_route->any( $api_route )->name( 'yancy.api' )
+        if !UNIVERSAL::isa( $api_route, 'Mojolicious::Routes::Route' );
     $config->{api_controller} //= 'Yancy::API';
     $config->{openapi} = _ensure_json_data( $app, $config->{openapi} );
 
@@ -513,6 +534,7 @@ sub register {
         spec => $spec,
         default_response_name => '_Error',
     } );
+    $app->helper( 'yancy.api_route' => sub { $api_route } );
     $app->helper( 'yancy.openapi' => sub { $openapi } );
 
     # Add supported formats to silence warnings from JSON::Validator
@@ -754,7 +776,7 @@ sub _openapi_spec_from_schema {
         info => $config->{info} || { title => 'Yancy', version => 1 },
         swagger => '2.0',
         host => $config->{host} // hostname(),
-        basePath => '/api',
+        basePath => $config->{editor}{api_route} // '/api',
         schemes => [qw( http )],
         consumes => [qw( application/json )],
         produces => [qw( application/json )],
diff --git a/lib/Yancy/Help/Config.pod b/lib/Yancy/Help/Config.pod
index 9864f427..71c800e6 100644
--- a/lib/Yancy/Help/Config.pod
+++ b/lib/Yancy/Help/Config.pod
@@ -504,6 +504,12 @@ given, it will be treated as a string, and used to create one.
 
 Note, the various assets will still live on the web app under C</yancy>.
 
+=item api_route
+
+A route as above, for the editor's REST API, living under the editor's
+route. A string may also be supplied, defaulting to C</api>. This means
+the default REST API path will be C</yancy/api>.
+
 =back
 
 =head1 SEE ALSO
diff --git a/t/api.t b/t/api.t
index f6755c56..da563492 100644
--- a/t/api.t
+++ b/t/api.t
@@ -153,6 +153,24 @@ subtest 'different Yancy URL' => \&test_api,
     } ),
     '/yancy2/api';
 
+( $backend_url, $backend, %items ) = init_backend( $collections, %data );
+subtest 'different API URL' => \&test_api,
+    Test::Mojo->new( 'Yancy', {
+        backend => $backend_url,
+        collections => $collections,
+        editor => { api_route => '/api2' },
+    } ),
+    '/yancy/api2';
+
+( $backend_url, $backend, %items ) = init_backend( $collections, %data );
+subtest 'different API and Yancy URLs' => \&test_api,
+    Test::Mojo->new( 'Yancy', {
+        backend => $backend_url,
+        collections => $collections,
+        editor => { route => '/yancy2', api_route => '/api2' },
+    } ),
+    '/yancy2/api2';
+
 my $openapi = decode_json path ( $Bin, 'share', 'openapi-spec.json' )->slurp;
 ( $backend_url, $backend, %items ) = init_backend( $collections, %data );
 subtest 'pass openapi' => \&test_api,