Working on deleting the expired sessions

Author: Luca Degasperi

src/LucaDegasperi/OAuth2Server/Commands/ExpiredTokensCommand.php

@@ -3,10 +3,10 @@
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
+use LucaDegasperi\Repositories\SessionManagementInterface;
 
 class ExpiredTokensCommand extends Command
 {
-
 	/**
 	 * The console command name.
 	 *
@@ -21,14 +21,19 @@ class ExpiredTokensCommand extends Command
 	 */
 	protected $description = 'A command to delete the OAuth expired tokens';
 
+
+	protected $sessions;
+
 	/**
 	 * Create a new command instance.
 	 *
 	 * @return void
 	 */
-	public function __construct()
+	public function __construct(SessionManagementInterface $sessions)
 	{
 		parent::__construct();
+
+		$this->sessions = $sessions;
 	}
 
 	/**
@@ -38,8 +43,14 @@ public function __construct()
 	 */
 	public function fire()
 	{
-		//
-		var_dump('fails');
+		$value = $this->option('delete');
+		if ($value === true) {
+			$result = $this->deleteExpiredTokens();
+			$this->info('Expired OAuth tokens were deleted');
+		}
+		else {
+			$this->info('use the --delete option to trigger the delete of the expired tokens');
+		}
 	}
 
 	/**
@@ -64,4 +75,8 @@ protected function getOptions()
 		);
 	}
 
-}
+	protected function deleteExpiredTokens()
+	{
+		return $this->sessions->deleteExpired();
+	}
+}

src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php

@@ -4,7 +4,7 @@
 use DB;
 use Carbon\Carbon;
 
-class FluentSession implements SessionInterface
+class FluentSession implements SessionInterface, SessionManagementInterface
 {
 
     public function createSession($clientId, $ownerType, $ownerId)
@@ -175,4 +175,16 @@ public function removeRefreshToken($refreshToken)
             ->where('refresh_token', '=', $refreshToken)
             ->delete();
     }
+
+    public function deleteExpired()
+    {
+        $time = time();
+        $expiredSessions = DB::table('oauth_sessions')
+                            ->join('oauth_session_access_tokens', 'oauth_session_access_tokens.session_id', '=', 'oauth_sessions.id')
+                            ->join('oauth_session_refresh_tokens', 'oauth_session_refresh_tokens.session_access_token_id', '=', 'oauth_session_access_tokens.id')
+                            ->where('oauth_session_refresh_tokens.refresh_token_expires', '<', $time)
+                            ->where('oauth_session_access_tokens.access_token_expires', '<', $time)
+                            ->get();
+        var_dump($expiredSessions);
+    }
 }

src/LucaDegasperi/OAuth2Server/Repositories/SessionManagementInterface.php

@@ -0,0 +1,6 @@
+<?php namespace LucaDegasperi\OAuth2Server\Repositories;
+
+interface SessionManagementInterface
+{
+    public function deleteExpired();
+}