Prototype implementation

Author: Luca Degasperi

src/LucaDegasperi/OAuth2Server/Commands/ExpiredTokensCommand.php

@@ -46,7 +46,7 @@ public function fire()
 		$value = $this->option('delete');
 		if ($value === true) {
 			$result = $this->deleteExpiredTokens();
-			$this->info('Expired OAuth tokens were deleted');
+			$this->info($result . ' expired OAuth tokens were deleted');
 		}
 		else {
 			$this->info('use the --delete option to trigger the delete of the expired tokens');

src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php

@@ -181,10 +181,24 @@ 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)
+                            ->leftJoin('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(function ($query) use ($time) {
+                                $query->where('oauth_session_access_tokens.access_token_expires', '<', $time)
+                                      ->orWhereRaw('oauth_session_access_tokens.access_token_expires IS NULL');
+                            })
                             ->get();
-        var_dump($expiredSessions);
+        if (count($expiredSessions) == 0) {
+            return 0;
+        }
+        else {
+            foreach ($expiredSessions as $session) {
+                DB::table('oauth_sessions')
+                    ->where('id', '=', $session->id)
+                    ->delete();
+            }
+            
+            return count($expiredSessions);
+        }
     }
 }