Fixed #297 -- Normalizar autenticação via Facebook

bireme · Nov 18, 2023 · 25e602f · 25e602f
1 parent b6e1189
commit 25e602f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 22 deletions.
diff --git a/client/business/widgets.php b/client/business/widgets.php
@@ -57,7 +57,7 @@
 //$resources = OER::get_resources($oer_query);
 
 // My Searches widget
-$obj = new MySearches($_SESSION["userTK"]);
-$retParams = $obj->getParams();
-$searches = $obj->getSearchList($retParams['userID'], $params);
+// $obj = new MySearches($_SESSION["userTK"]);
+// $retParams = $obj->getParams();
+// $searches = $obj->getSearchList($retParams['userID'], $params);
 ?>
diff --git a/connector/facebook/callback.php b/connector/facebook/callback.php
@@ -7,11 +7,11 @@
 
 try {
     $accessToken = $helper->getAccessToken();
-} catch(Facebook\Exceptions\FacebookResponseException $e) {
+} catch(FacebookResponseException $e) {
     // When Graph returns an error
     echo 'Graph returned an error: ' . $e->getMessage();
     exit;
-} catch(Facebook\Exceptions\FacebookSDKException $e) {
+} catch(FacebookSDKException $e) {
     // When validation fails or other local issues
     echo 'Facebook SDK returned an error: ' . $e->getMessage();
     exit;
@@ -25,7 +25,7 @@
         // Exchanges a short-lived access token for a long-lived one
         try {
             $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
-        } catch (Facebook\Exceptions\FacebookSDKException $e) {
+        } catch (FacebookSDKException $e) {
             echo "<p>Error getting long-lived access token: " . $helper->getMessage() . "</p>\n\n";
             exit;
         }
@@ -39,11 +39,11 @@
         $userNode = $response->getGraphUser();
         $userData = $response->getDecodedBody();
         $userData['social_media'] = 'facebook';
-    } catch(Facebook\Exceptions\FacebookResponseException $e) {
+    } catch(FacebookResponseException $e) {
         // When Graph returns an error
         echo 'Graph returned an error: ' . $e->getMessage();
         exit;
-    } catch(Facebook\Exceptions\FacebookSDKException $e) {
+    } catch(FacebookSDKException $e) {
         // When validation fails or other local issues
         echo 'Facebook SDK returned an error: ' . $e->getMessage();
         exit;
@@ -55,8 +55,7 @@
         if (($result["status"] !== false) and ($result !== false)){
             $iahx = ( $_REQUEST['iahx'] ) ? $_REQUEST['iahx'] : base64_encode('portal');
 
-            // Logged in!
-            $_SESSION['fb_access_token'] = (string) $accessToken;
+            // $_SESSION['fb_access_token'] = (string) $accessToken;
             $_SESSION['fb_data'] = $userData; // Storing Facebook User Data in Session
             $_SESSION["sysUID"] = $result["sysUID"];
             $_SESSION["userTK"] = $result["userTK"];
@@ -67,8 +66,6 @@
             $_SESSION["source"] = $result["source"];
             $_SESSION["visited"] = $result["visited"];
             $_SESSION["iahx"] = base64_decode($iahx);
-            //$response["status"] = true;
-            //$response["values"] = $result;
 
             $cookie = UserData::getData($result["userTK"]);
             setcookie("userData", $cookie, 0, '/', COOKIE_DOMAIN_SCOPE);
@@ -91,9 +88,7 @@
     echo 'window.open("'.$homeURL.'","_parent")';
     echo '</script>';
     exit;
-}
-
-if (! isset($accessToken)) {
+} else {
     if ($helper->getError() || $helper->getErrorCode()) {
         if ( isset($_REQUEST['origin']) && !empty($_REQUEST['origin']) ) {
             $origin = 'origin/'.$_REQUEST['origin'].'/';

diff --git a/connector/facebook/composer.json b/connector/facebook/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "facebook/graph-sdk": "~5.0"
+    }
+}
diff --git a/connector/facebook/config.php.template b/connector/facebook/config.php.template
@@ -2,18 +2,22 @@
 
 session_start();
 
-include_once("src/facebook.php"); // include Facebook SDK
+include_once("vendor/autoload.php"); // include Facebook SDK
+
+use Facebook\Facebook;
+use Facebook\Exceptions\FacebookResponseException;
+use Facebook\Exceptions\FacebookSDKException;
 
 $appID = ''; // Facebook App ID
 $appSecret = ''; // Facebook App Secret
 $redirectURL = ''; // return to home
 $homeURL = ''; // return url (url to script)
 $permissions = ['email', 'public_profile', 'user_friends']; // Optional permissions
 
-$fb = new Facebook\Facebook([
+$fb = new Facebook([
     'app_id' => $appID,
     'app_secret' => $appSecret,
-    'default_graph_version' => 'v3.1',
+    'default_graph_version' => 'v3.2',
 ]);
 
 $helper = $fb->getRedirectLoginHelper();

diff --git a/connector/facebook/index.php b/connector/facebook/index.php
@@ -2,8 +2,10 @@
 
 include_once("config.php");
 
-if ( array_key_exists('origin', $_REQUEST) || array_key_exists('iahx', $_REQUEST) )
-    $redirectURL .= "?".http_build_query($_REQUEST);
+if ( array_key_exists('origin', $_REQUEST) || array_key_exists('iahx', $_REQUEST) ) {
+    $params = array_filter($_REQUEST);
+    $redirectURL .= "?".http_build_query($params);
+}
 
 $loginURL = $helper->getLoginUrl($redirectURL, $permissions);
 

diff --git a/connector/facebook/logout.php b/connector/facebook/logout.php
@@ -1,11 +1,13 @@
 <?php
+
 include_once("config.php");
-if(array_key_exists('logout',$_GET))
-{
+
+if ( array_key_exists('logout',$_GET) ) {
 	$facebook->destroySession();
 	session_start();
 	unset($_SESSION['userdata']);
 	session_destroy();
 	header("Location:index.php");
 }
+
 ?>