Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

1 files changed, 6 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm
index b0a05d0b7..e5be14abf 100644
--- a/perllib/FixMyStreet/DB/Result/User.pm
+++ b/perllib/FixMyStreet/DB/Result/User.pm
@@ -179,6 +179,11 @@ sub check_password {
     }
 }
 
+sub access_token {
+    my $self = shift;
+    return $self->get_extra_metadata('access_token');
+}
+
 around password => sub {
     my ($orig, $self) = (shift, shift);
     if (@_) {
@@ -444,7 +449,7 @@ sub permissions {
 
     my $body_id = $problem->bodies_str;
 
-    return unless $self->belongs_to_body($body_id);
+    return {} unless $self->belongs_to_body($body_id);
 
     my @permissions = grep { $_->{body_id} == $self->from_body->id } @{$self->body_permissions};
     return { map { $_->{permission} => 1 } @permissions };