Merge branch 'photo-caching'

1 files changed, 9 insertions, 12 deletions

diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 36f736cd2..e9c3fac8d 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -34,6 +34,12 @@ extends 'Catalyst';
 
 our $VERSION = '0.01';
 
+my $store = {         # Catalyst::Authentication::Store::DBIx::Class
+    class => 'DBIx::Class',
+    user_model => 'DB::User',
+    store_user_class => 'Catalyst::Authentication::Store::FixMyStreetUser',
+};
+
 __PACKAGE__->config(
 
     # Use REQUEST_URI, not PATH_INFO, to infer path. This fixes an issue
@@ -83,20 +89,14 @@ __PACKAGE__->config(
                   },
                 ],
             },
-            store => {         # Catalyst::Authentication::Store::DBIx::Class
-                class      => 'DBIx::Class',
-                user_model => 'DB::User',
-            },
+            store => $store,
         },
         no_password => {       # use post confirm etc
             credential => {    # Catalyst::Authentication::Credential::Password
                 class         => 'Password',
                 password_type => 'none',
             },
-            store => {         # Catalyst::Authentication::Store::DBIx::Class
-                class      => 'DBIx::Class',
-                user_model => 'DB::User',
-            },
+            store => $store,
         },
         access_token => {
             use_session => 0,
@@ -106,10 +106,7 @@ __PACKAGE__->config(
                 # 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',
-            },
+            store => $store,
         },
     },
 );