From 13d1f8d4a7f8764adf9067cf6e36cfe9ef4981cf Mon Sep 17 00:00:00 2001
From: Tom Bloor <tom.bloor@googlemail.com>
Date: Tue, 18 Apr 2017 18:31:10 +0100
Subject: [PATCH] Refactor session helper

---
 lib/Pear/LocalLoop.pm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/Pear/LocalLoop.pm b/lib/Pear/LocalLoop.pm
index f0f7f3b..55aa9c3 100644
--- a/lib/Pear/LocalLoop.pm
+++ b/lib/Pear/LocalLoop.pm
@@ -272,20 +272,22 @@ $self->helper(get_session_expiry => sub {
 
 });
 
-#True for session was expire, false there was no session to expire.
-$self->helper(expire_current_session => sub {
-  my $self = shift;
+  #True for session was expire, false there was no session to expire.
+  $self->helper(expire_current_session => sub {
+    my $c = shift;
+    my $self = $c;
 
-  my $sessionToken = $self->get_session_token();
+    my $sessionToken = $self->get_session_token();
 
-  my $removeStatement = $self->db->prepare('DELETE FROM SessionTokens WHERE SessionTokenName = ?');
-  my $rowsRemoved = $removeStatement->execute($sessionToken);  
+    $c->schema->resultset('SessionToken')->search({
+      sessiontokenname => $sessionToken,
+    })->delete_all;
 
-  $self->session(expires => 1);
-  $self->session->{$self->app->config->{sessionTokenJsonName}} = $sessionToken;
+    $self->session(expires => 1);
+    $self->session->{$self->app->config->{sessionTokenJsonName}} = $sessionToken;
 
-  return $rowsRemoved != 0;
-});
+    return 1;
+  });
 
   $self->helper(is_token_unused => sub {
     my ( $c, $token ) = @_;