2 files changed, 13 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index e47336b7c..a3331d32a 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -18,13 +18,14 @@ use URI;
 use URI::QueryParam;
 
 use Catalyst (
-    'Static::Simple',    #
+    'Static::Simple',
     'Unicode::Encoding',
     'Session',
     'Session::Store::DBIC',
     'Session::State::Cookie',    # FIXME - we're using our own override atm
     'Authentication',
     'SmartURI',
+    'FixMyStreet::Session::StoreSessions',
 );
 
 extends 'Catalyst';
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index a1d301249..c2470e325 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1423,6 +1423,8 @@ sub user_edit : Path('user_edit') : Args(1) {
 
     if ( $c->get_param('submit') and $c->get_param('unban') ) {
         $c->forward('unban_user', [ $user ]);
+    } elsif ( $c->get_param('submit') and $c->get_param('logout_everywhere') ) {
+        $c->forward('user_logout_everywhere', [ $user ]);
     } elsif ( $c->get_param('submit') and $c->get_param('anon_everywhere') ) {
         $c->forward('user_anon_everywhere', [ $user ]);
     } elsif ( $c->get_param('submit') and $c->get_param('hide_everywhere') ) {
@@ -1756,6 +1758,15 @@ sub ban_user : Private {
     return 1;
 }
 
+sub user_logout_everywhere : Private {
+    my ( $self, $c, $user ) = @_;
+    my $sessions = $user->get_extra_metadata('sessions');
+    foreach (grep { $_ ne $c->sessionid } @$sessions) {
+        $c->delete_session_data("session:$_");
+    }
+    $c->stash->{status_message} = _('That user has been logged out.');
+}
+
 sub user_anon_everywhere : Private {
     my ( $self, $c, $user ) = @_;
     $user->problems->update({anonymous => 1});