formatting

laravel · Sep 30, 2024 · c4368a3 · c4368a3
1 parent 7458bfd
commit c4368a3
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 23 deletions.
diff --git a/database/factories/ClientFactory.php b/database/factories/ClientFactory.php
@@ -88,6 +88,7 @@ public function asDeviceCodeClient(): static
     {
         return $this->state([
             'grant_types' => ['urn:ietf:params:oauth:grant-type:device_code', 'refresh_token'],
+            'redirect_uris' => [],
         ]);
     }
 }
diff --git a/src/DeviceCode.php b/src/DeviceCode.php
@@ -24,14 +24,14 @@ class DeviceCode extends Model
     /**
      * The guarded attributes on the model.
      *
-     * @var array
+     * @var array<string>|bool
      */
-    protected $guarded = [];
+    protected $guarded = false;
 
     /**
      * The attributes that should be cast to native types.
      *
-     * @var array
+     * @var array<string, \Illuminate\Contracts\Database\Eloquent\Castable|string>
      */
     protected $casts = [
         'scopes' => 'array',
@@ -57,6 +57,8 @@ class DeviceCode extends Model
 
     /**
      * Get the client that owns the authentication code.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo<\Laravel\Passport\Client, $this>
      */
     public function client(): BelongsTo
     {

diff --git a/src/Http/Controllers/ApproveDeviceAuthorizationController.php b/src/Http/Controllers/ApproveDeviceAuthorizationController.php
@@ -13,9 +13,10 @@ class ApproveDeviceAuthorizationController
     /**
      * Create a new controller instance.
      */
-    public function __construct(protected AuthorizationServer $server,
-                                protected ApprovedDeviceAuthorizationResponse $response)
-    {
+    public function __construct(
+        protected AuthorizationServer $server,
+        protected ApprovedDeviceAuthorizationResponse $response
+    ) {
     }
 
     /**

diff --git a/src/Http/Controllers/DenyDeviceAuthorizationController.php b/src/Http/Controllers/DenyDeviceAuthorizationController.php
@@ -13,9 +13,10 @@ class DenyDeviceAuthorizationController
     /**
      * Create a new controller instance.
      */
-    public function __construct(protected AuthorizationServer $server,
-                                protected DeniedDeviceAuthorizationResponse $response)
-    {
+    public function __construct(
+        protected AuthorizationServer $server,
+        protected DeniedDeviceAuthorizationResponse $response
+    ) {
     }
 
     /**

diff --git a/src/Http/Controllers/DeviceAuthorizationController.php b/src/Http/Controllers/DeviceAuthorizationController.php
@@ -13,8 +13,9 @@ class DeviceAuthorizationController
     /**
      * Create a new controller instance.
      */
-    public function __construct(protected DeviceAuthorizationViewResponse $viewResponse)
-    {
+    public function __construct(
+        protected DeviceAuthorizationViewResponse $viewResponse
+    ) {
     }
 
     /**

diff --git a/src/Http/Controllers/DeviceCodeController.php b/src/Http/Controllers/DeviceCodeController.php
@@ -14,8 +14,9 @@ class DeviceCodeController
     /**
      * Create a new controller instance.
      */
-    public function __construct(protected AuthorizationServer $server)
-    {
+    public function __construct(
+        protected AuthorizationServer $server
+    ) {
     }
 
     /**

diff --git a/src/Http/Controllers/DeviceUserCodeController.php b/src/Http/Controllers/DeviceUserCodeController.php
@@ -11,8 +11,9 @@ class DeviceUserCodeController
     /**
      * Create a new controller instance.
      */
-    public function __construct(protected DeviceUserCodeViewResponse $viewResponse)
-    {
+    public function __construct(
+        protected DeviceUserCodeViewResponse $viewResponse
+    ) {
     }
 
     /**

diff --git a/src/Passport.php b/src/Passport.php
@@ -598,6 +598,8 @@ public static function authorizationView(Closure|string $view): void
 
     /**
      * Specify which view should be used as the device authorization view.
+     *
+     * @param  (\Closure(array<string, mixed>): (\Symfony\Component\HttpFoundation\Response))|string  $view
      */
     public static function deviceAuthorizationView(Closure|string $view): void
     {
@@ -606,6 +608,8 @@ public static function deviceAuthorizationView(Closure|string $view): void
 
     /**
      * Specify which view should be used as the device user code view.
+     *
+     * @param  (\Closure(array<string, mixed>): (\Symfony\Component\HttpFoundation\Response))|string  $view
      */
     public static function deviceUserCodeView(Closure|string $view): void
     {

diff --git a/src/PassportServiceProvider.php b/src/PassportServiceProvider.php
@@ -232,19 +232,17 @@ protected function makeImplicitGrant(): ImplicitGrant
      */
     protected function makeDeviceCodeGrant(): DeviceCodeGrant
     {
-        $grant = new DeviceCodeGrant(
+        return tap(new DeviceCodeGrant(
             $this->app->make(DeviceCodeRepository::class),
             $this->app->make(RefreshTokenRepository::class),
             new DateInterval('PT10M'),
             route('passport.device'),
             5
-        );
-
-        $grant->setRefreshTokenTTL(Passport::refreshTokensExpireIn());
-        $grant->setIncludeVerificationUriComplete(true);
-        $grant->setIntervalVisibility(true);
-
-        return $grant;
+        ), function (DeviceCodeGrant $grant) {
+            $grant->setRefreshTokenTTL(Passport::refreshTokensExpireIn());
+            $grant->setIncludeVerificationUriComplete(true);
+            $grant->setIntervalVisibility(true);
+        });
     }
 
     /**