Merge pull request #86 from facebook/gFosco.canvas

Stop canvas helper from throwing when logged out.

Author: Fosco Marotto

src/Facebook/FacebookCanvasLoginHelper.php

@@ -41,7 +41,15 @@ class FacebookCanvasLoginHelper
   public function getSession()
   {
     if ($signedRequest = $this->getSignedRequest()) {
-      return FacebookSession::newSessionFromSignedRequest($signedRequest);
+      try {
+        return FacebookSession::newSessionFromSignedRequest($signedRequest);
+      } catch (FacebookSDKException $ex) {
+        // Signed request is valid but user is not logged in.
+        if ($ex->getCode() == 603) {
+          return null;
+        }
+        throw $ex;
+      }
     }
     return null;
   }

src/Facebook/FacebookRequest.php

@@ -35,7 +35,7 @@ class FacebookRequest
   /**
    * @const string Version number of the Facebook PHP SDK.
    */
-  const VERSION = '4.0.4';
+  const VERSION = '4.0.6';
 
   /**
    * @const string Default Graph API version for requests

tests/FacebookCanvasLoginHelperTest.php

@@ -37,4 +37,13 @@ public function testGetSessionFromCanvasPOST() {
     $this->assertTrue($session instanceof FacebookSession);
     $this->assertTrue($session->getToken() == 'token');
   }
+
+  public function testLoggedOutCanvasSession() {
+    $helper = new FacebookCanvasLoginHelper();
+    $signedRequest = FacebookSessionTest::makeSignedRequest(array(
+      'ship' => 'love'
+    ));
+    $_GET['signed_request'] = $signedRequest;
+    $this->assertNull($helper->getSession());
+  }
 }