Merge branch 'refs/heads/develop'

Author: lucadegasperi

src/LucaDegasperi/OAuth2Server/Repositories/FluentClient.php

@@ -9,6 +9,8 @@ class FluentClient implements ClientInterface
 
     public function getClient($clientId, $clientSecret = null, $redirectUri = null, $grantType = null)
     {
+        $query = null;
+        
         if (! is_null($redirectUri) && is_null($clientSecret)) {
             $query = DB::table('oauth_clients')
                         ->join('oauth_client_endpoints', 'oauth_clients.id', '=', 'oauth_client_endpoints.client_id')
@@ -39,11 +41,14 @@ public function getClient($clientId, $clientSecret = null, $redirectUri = null,
             return false;
         }
 
+        $metadata = DB::table('oauth_client_metadata')->where('client_id', '=', $result->id)->lists('value', 'key');
+
         return array(
             'client_id'     =>  $result->id,
             'client_secret' =>  $result->secret,
             'redirect_uri'  =>  (isset($result->redirect_uri)) ? $result->redirect_uri : null,
-            'name'          =>  $result->name
+            'name'          =>  $result->name,
+            'metadata'      =>  $metadata
         );
     }
 }

src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php

@@ -201,7 +201,7 @@ public function deleteExpired()
                             ->where('oauth_session_access_tokens.access_token_expires', '<', $time)
                             ->where(function ($query) use ($time) {
                                 $query->where('oauth_session_refresh_tokens.refresh_token_expires', '<', $time)
-                                      ->orWhereRaw('oauth_session_refresh_tokens.refresh_token_expires IS NULL');
+                                      ->orWhereNull('oauth_session_refresh_tokens.refresh_token_expires');
                             })
                             ->get();
         if (count($expiredSessions) == 0) {

src/migrations/2013_08_07_183636_create_oauth_client_metadata_table.php

@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class CreateOauthClientMetadataTable extends Migration
+{
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('oauth_client_metadata', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('client_id', 40);
+            $table->string('key', 40);
+            $table->string('value');
+            $table->timestamps();
+
+            $table->foreign('client_id')
+                    ->references('id')->on('oauth_clients')
+                    ->onDelete('cascade');
+
+            $table->unique(array('client_id', 'key'), 'oauth_client_metadata_cid_key_unique');
+            $table->index('client_id');
+            
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('oauth_client_metadata', function ($table) {
+            $table->dropForeign('oauth_grant_scopes_client_id_foreign');
+        });
+        Schema::drop('oauth_client_metadata');
+    }
+}