Merge branch 'track-approved-scopes' into 5.x

laravel · Jan 27, 2022 · d5891f1 · d5891f1
2 parents 4b19992 + 94cf54c
commit d5891f1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Two/AbstractProvider.php b/src/Two/AbstractProvider.php
@@ -244,7 +244,8 @@ public function user()
 
         return $this->user->setToken($token)
                     ->setRefreshToken(Arr::get($response, 'refresh_token'))
-                    ->setExpiresIn(Arr::get($response, 'expires_in'));
+                    ->setExpiresIn(Arr::get($response, 'expires_in'))
+                    ->setApprovedScopes(explode($this->scopeSeparator, Arr::get($response, 'scope', '')));
     }
 
     /**

diff --git a/src/Two/User.php b/src/Two/User.php
@@ -27,6 +27,13 @@ class User extends AbstractUser
      */
     public $expiresIn;
 
+    /**
+     * The scopes the user authorized. The approved scopes may be a subset of the requested scopes.
+     *
+     * @var array
+     */
+    public $approvedScopes;
+
     /**
      * Set the token on the user.
      *
@@ -65,4 +72,17 @@ public function setExpiresIn($expiresIn)
 
         return $this;
     }
+
+    /**
+     * Set the scopes that were approved by the user during authentication.
+     *
+     * @param  array  $approvedScopes
+     * @return $this
+     */
+    public function setApprovedScopes($approvedScopes)
+    {
+        $this->approvedScopes = $approvedScopes;
+
+        return $this;
+    }
 }