Merge pull request #1 from jeramyhing/additional-getter-methods

Additional Getter Methods For Retrieving User Information

src/AbstractUser.php

@@ -129,6 +129,16 @@ public function setRaw(array $user)
         return $this;
     }
 
+    /**
+     * Get the user's attributes.
+     *
+     * @return array
+     */
+    public function getAttributes()
+    {
+        return $this->attributes;
+    }
+
     /**
      * Map the given array onto the user's properties.
      *

src/Contracts/User.php

@@ -38,4 +38,18 @@ public function getEmail();
      * @return string|null
      */
     public function getAvatar();
+
+    /**
+     * Get the raw user array.
+     *
+     * @return array
+     */
+    public function getRaw();
+
+    /**
+     * Get the user's attributes.
+     *
+     * @return array
+     */
+    public function getAttributes();
 }

src/Two/User.php

@@ -34,6 +34,16 @@ class User extends AbstractUser
      */
     public $approvedScopes;
 
+    /**
+     * Get the access token for the user.
+     *
+     * @return string
+     */
+    public function getToken()
+    {
+        return $this->token;
+    }
+
     /**
      * Set the token on the user.
      *
@@ -47,6 +57,16 @@ public function setToken($token)
         return $this;
     }
 
+    /**
+     * Get the refresh token for the user.
+     *
+     * @return string
+     */
+    public function getRefreshToken()
+    {
+        return $this->refreshToken;
+    }
+
     /**
      * Set the refresh token required to obtain a new access token.
      *
@@ -60,6 +80,16 @@ public function setRefreshToken($refreshToken)
         return $this;
     }
 
+    /**
+     * Get the number of seconds the access token is valid for.
+     *
+     * @return int
+     */
+    public function getExpiresIn()
+    {
+        return $this->expiresIn;
+    }
+
     /**
      * Set the number of seconds the access token is valid for.
      *
@@ -73,6 +103,16 @@ public function setExpiresIn($expiresIn)
         return $this;
     }
 
+    /**
+     * Get the scopes that were approved by the user during authentication.
+     *
+     * @return array
+     */
+    public function getApprovedScopes()
+    {
+        return $this->approvedScopes;
+    }
+
     /**
      * Set the scopes that were approved by the user during authentication.
      *

tests/OAuthOneTest.php

@@ -67,6 +67,7 @@ public function testUserReturnsAUserInstanceForTheAuthenticatedRequest()
         $this->assertSame('uid', $user->id);
         $this->assertSame('foo@bar.com', $user->email);
         $this->assertSame(['extra' => 'extra'], $user->user);
+        $this->assertSame($user->getAttributes(), $user->attributes);
     }
 
     public function testExceptionIsThrownWhenVerifierIsMissing()

tests/OAuthTwoTest.php

@@ -114,6 +114,10 @@ public function testTokenRequestIncludesPKCECodeVerifier()
         $this->assertSame('refresh_token', $user->refreshToken);
         $this->assertSame(3600, $user->expiresIn);
         $this->assertSame($user->id, $provider->user()->id);
+        $this->assertSame($user->getAttributes(), $user->attributes);
+        $this->assertSame($user->getToken(), $user->token);
+        $this->assertSame($user->getRefreshToken(), $user->refreshToken);
+        $this->assertSame($user->getExpiresIn(), $user->expiresIn);
     }
 
     public function testUserReturnsAUserInstanceForTheAuthenticatedRequest()
@@ -135,6 +139,10 @@ public function testUserReturnsAUserInstanceForTheAuthenticatedRequest()
         $this->assertSame('refresh_token', $user->refreshToken);
         $this->assertSame(3600, $user->expiresIn);
         $this->assertSame($user->id, $provider->user()->id);
+        $this->assertSame($user->getAttributes(), $user->attributes);
+        $this->assertSame($user->getToken(), $user->token);
+        $this->assertSame($user->getRefreshToken(), $user->refreshToken);
+        $this->assertSame($user->getExpiresIn(), $user->expiresIn);
     }
 
     public function testUserReturnsAUserInstanceForTheAuthenticatedFacebookRequest()
@@ -156,6 +164,10 @@ public function testUserReturnsAUserInstanceForTheAuthenticatedFacebookRequest()
         $this->assertNull($user->refreshToken);
         $this->assertSame(5183085, $user->expiresIn);
         $this->assertSame($user->id, $provider->user()->id);
+        $this->assertSame($user->getAttributes(), $user->attributes);
+        $this->assertSame($user->getToken(), $user->token);
+        $this->assertSame($user->getRefreshToken(), $user->refreshToken);
+        $this->assertSame($user->getExpiresIn(), $user->expiresIn);
     }
 
     public function testExceptionIsThrownIfStateIsInvalid()