Fix stdClass error on FacebookRedirectLoginHelper because response ha…

…ndling is kinda 💩
wangjohnnywang · Apr 3, 2015 · 46d5de0 · 46d5de0
1 parent 0017521
commit 46d5de0
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Facebook/FacebookRedirectLoginHelper.php b/src/Facebook/FacebookRedirectLoginHelper.php
@@ -188,8 +188,17 @@ public function getSessionFromRedirect()
  '/oauth/access_token',
  $params
  ))->execute()->getResponse();
- if (isset($response['access_token'])) {
- return new FacebookSession($response['access_token']);
+
+ // Graph v2.3 and greater return objects on the /oauth/access_token endpoint
+ $accessToken = null;
+ if (is_object($response) && isset($response->access_token)) {
+ $accessToken = $response->access_token;
+ } elseif (is_array($response) && isset($response['access_token'])) {
+ $accessToken = $response['access_token'];
+ }
+
+ if (isset($accessToken)) {
+ return new FacebookSession($accessToken);
  }
  }
  return null;