Merge tag 'v2.3' into fiksgatami-dev

1 files changed, 15 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index a0477ca40..e47336b7c 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -81,6 +81,19 @@ __PACKAGE__->config(
                 user_model => 'DB::User',
             },
         },
+        access_token => {
+            use_session => 0,
+            credential => {
+                class => 'AccessToken',
+                token_field => 'extra',
+                # This means the token has to be 18 characters long (as generated by AuthToken)
+                token_lookup => { like => "%access_token,T18:TOKEN,%" },
+            },
+            store => {
+                class => 'DBIx::Class',
+                user_model => 'DB::User',
+            },
+        },
     },
 );
 
@@ -212,6 +225,8 @@ sub setup_request {
     Memcached::set_namespace( FixMyStreet->config('FMS_DB_NAME') . ":" );
 
     FixMyStreet::Map::set_map_class( $cobrand->map_type || $c->get_param('map_override') );
+    # All pages need this, either loading it or prefetching it
+    $c->stash->{map_js} = FixMyStreet::Map::map_javascript();
 
     unless ( FixMyStreet->config('MAPIT_URL') ) {
         my $port = $c->req->uri->port;