2 files changed, 63 insertions, 12 deletions
diff --git a/perllib/Catalyst/Authentication/Store/FixMyStreetUser.pm b/perllib/Catalyst/Authentication/Store/FixMyStreetUser.pm
new file mode 100644
index 000000000..240f4b1de
--- /dev/null
+++ b/perllib/Catalyst/Authentication/Store/FixMyStreetUser.pm
@@ -0,0 +1,54 @@
+package Catalyst::Authentication::Store::FixMyStreetUser;
+
+use Moose;
+use namespace::autoclean;
+extends 'Catalyst::Authentication::Store::DBIx::Class::User';
+
+use Carp;
+use Try::Tiny;
+
+sub AUTOLOAD {
+    my $self = shift;
+    (my $method) = (our $AUTOLOAD =~ /([^:]+)$/);
+    return if $method eq "DESTROY";
+
+    if (my $code = $self->_user->can($method)) {
+        return $self->_user->$code(@_);
+    }
+    elsif (my $accessor =
+         try { $self->_user->result_source->column_info($method)->{accessor} }) {
+        return $self->_user->$accessor(@_);
+    } else {
+        croak sprintf("Can't locate object method '%s'", $method);
+    }
+}
+
+__PACKAGE__->meta->make_immutable(inline_constructor => 0);
+
+1;
+__END__
+
+=head1 NAME
+
+Catalyst::Authentication::Store::FixMyStreetUser - The backing user
+class for the Catalyst::Authentication::Store::DBIx::Class storage
+module, adjusted to die on unknown lookups.
+
+=head1 DESCRIPTION
+
+The Catalyst::Authentication::Store::FixMyStreetUser class implements user
+storage connected to an underlying DBIx::Class schema object.
+
+=head1 SUBROUTINES / METHODS
+
+=head2 AUTOLOAD
+
+Delegates method calls to the underlying user row.
+Unlike the default, dies if an unknown method is called.
+
+=head1 LICENSE
+
+Copyright (c) 2007-2019. All rights reserved. This program is free software;
+you can redistribute it and/or modify it under the same terms as Perl itself.
+
+=cut
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,
         },
     },
 );