From 5e7d44c09bfa3c11c5ef982f9c7872e80e97f52d Mon Sep 17 00:00:00 2001 From: Aleksey Kozakov Date: Tue, 10 Nov 2015 12:01:29 +0200 Subject: [PATCH 1/2] [Bugfix] Facebook AccessToken is being validated correctly in FacebookClient --- src/Facebook/FacebookClient.php | 2 +- tests/FacebookClientTest.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Facebook/FacebookClient.php b/src/Facebook/FacebookClient.php index 70a463e72..d9bbec5b5 100644 --- a/src/Facebook/FacebookClient.php +++ b/src/Facebook/FacebookClient.php @@ -197,7 +197,7 @@ public function prepareRequestMessage(FacebookRequest $request) */ public function sendRequest(FacebookRequest $request) { - if (get_class($request) === 'FacebookRequest') { + if (get_class($request) === 'Facebook\FacebookRequest') { $request->validateAccessToken(); } diff --git a/tests/FacebookClientTest.php b/tests/FacebookClientTest.php index 6e9bb6cf5..1f09e2120 100644 --- a/tests/FacebookClientTest.php +++ b/tests/FacebookClientTest.php @@ -218,6 +218,14 @@ public function testARequestWithFilesWillBeMultipart() $this->assertContains('multipart/form-data; boundary=', $headersSent['Content-Type']); } + public function testAFacebookRequestValidateAccessTokenIsNotProvided(){ + + $this->setExpectedException('Facebook\Exceptions\FacebookSDKException'); + + $fbRequest = new FacebookRequest($this->fbApp, null, 'GET', '/foo'); + $this->fbClient->sendRequest($fbRequest); + } + /** * @group integration */ From 1535d1be7f750750e8387bfabfb95286147372dd Mon Sep 17 00:00:00 2001 From: Aleksey Kozakov Date: Tue, 10 Nov 2015 15:59:45 +0200 Subject: [PATCH 2/2] Rename test method - testAFacebookRequestValidatesTheAccessTokenWhenOneIsNotProvided --- tests/FacebookClientTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/FacebookClientTest.php b/tests/FacebookClientTest.php index 1f09e2120..68b685d97 100644 --- a/tests/FacebookClientTest.php +++ b/tests/FacebookClientTest.php @@ -218,8 +218,8 @@ public function testARequestWithFilesWillBeMultipart() $this->assertContains('multipart/form-data; boundary=', $headersSent['Content-Type']); } - public function testAFacebookRequestValidateAccessTokenIsNotProvided(){ - + public function testAFacebookRequestValidatesTheAccessTokenWhenOneIsNotProvided() + { $this->setExpectedException('Facebook\Exceptions\FacebookSDKException'); $fbRequest = new FacebookRequest($this->fbApp, null, 'GET', '/foo');