Add Client Resolver

Author: joselfonseca

app/Auth/EloquentClientResolver.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Auth;
+
+use App\Contracts\ClientResolverInterface;
+use App\Entities\Auth\Client;
+
+/**
+ * Class EloquentClientResolver
+ *
+ * @package App\Auth
+ */
+class EloquentClientResolver implements ClientResolverInterface
+{
+
+    /**
+     * @var
+     */
+    protected $model;
+
+    /**
+     * EloquentClientResolver constructor.
+     *
+     * @param Client $model
+     */
+    public function __construct(Client $model)
+    {
+        $this->model = $model;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolveById($id)
+    {
+        return $this->model->where('id', $id)->firstOrFail();
+    }
+
+}

app/Contracts/ClientResolverInterface.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Contracts;
+
+
+/**
+ * Interface ClientResolverInterface
+ *
+ * @package App\Contracts
+ */
+interface ClientResolverInterface
+{
+
+    /**
+     * Resolve a oAuth 2 client by ID
+     *
+     * @param  $id
+     * @return mixed
+     */
+    public function resolveById($id);
+
+}

app/Entities/Auth/Client.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Entities\Auth;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * Class Client
+ *
+ * @package App\Entities\Auth
+ */
+class Client extends Model
+{
+
+    /**
+     * @var string
+     */
+    public $table = "oauth_clients";
+
+}

app/Providers/AppServiceProvider.php

@@ -3,9 +3,11 @@
 namespace App\Providers;
 
 use App\Auth\EloquentUserResolver;
+use App\Auth\EloquentClientResolver;
 use Illuminate\Support\ServiceProvider;
 use App\Contracts\UserResolverInterface;
 use App\Exceptions\OAuthExceptionHandler;
+use App\Contracts\ClientResolverInterface;
 use App\Exceptions\UnauthorizedExceptionHandler;
 use League\OAuth2\Server\Exception\OAuthException;
 use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
@@ -26,6 +28,7 @@ public function boot()
     {
         $this->registerOAuthExceptionHandler();
         $this->app->bind(UserResolverInterface::class, EloquentUserResolver::class);
+        $this->app->bind(ClientResolverInterface::class, EloquentClientResolver::class);
     }
 
     /**

app/Providers/AuthServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Dingo\Api\Auth\Provider\OAuth2;
 use App\Contracts\UserResolverInterface;
+use App\Contracts\ClientResolverInterface;
 use Illuminate\Contracts\Auth\Access\Gate as GateContract;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
@@ -53,6 +54,8 @@ function ($id) {
 
                 $provider->setClientResolver(
                     function ($id) {
+                        $resolver = app(ClientResolverInterface::class);
+                        return $resolver->resolveById($id);
                     }
                 );
 

tests/Auth/OAuthServerTest.php

@@ -7,6 +7,7 @@
 use App\Tests\TestCase;
 use App\Entities\Users\User;
 use App\Contracts\UserResolverInterface;
+use App\Contracts\ClientResolverInterface;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 
 /**
@@ -211,4 +212,20 @@ public function itResolvesUserFromId()
         $resolved = $resolver->resolveById($user->id);
         $this->assertEquals($user->id, $resolved->id);
     }
+
+    /**
+     * @test
+     */
+    public function itResolvesClientFromId()
+    {
+        $resolver = app(ClientResolverInterface::class);
+        DB::table('oauth_clients')->insert([
+            'id' => '12345',
+            'secret' => '12345',
+            'name' => 'Testing Env',
+            'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
+            'updated_at' => Carbon::now()->format('Y-m-d H:i:s')
+        ]);
+        $this->assertEquals('12345', $resolver->resolveById('12345')->id);
+    }
 }