Issue #12 - Facebook logout

Signed-off-by: Peter Brenner <peter@phpwerks.com>
everyvote · Feb 18, 2013 · 0bdfefe · 0bdfefe
1 parent df48108
commit 0bdfefe
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
@@ -93,13 +93,25 @@ private function _initUser() {
         $this->_initFacebook();
         $facebookId = $this->_facebook->getUser();
 
-
         // If can't get facebook uid, they must accept the app and/or login
 
                 //CPB
         if (!$facebookId) {
             $this->_redirectToLoginUrl();
+        } else {
+            // make sure the user is still logged in
+            try {
+                $me = $this->_facebook->api('/me');
+                if ($me) {
+                    //User is logged in
+                }
+            } catch (FacebookApiException $e) {
+                //User is not logged in
+                $this->_redirectToLoginUrl();
+            }
+
         }
+
         $this->loadModel('User');
 
         $user = $this->User->findByFacebookId($facebookId);

diff --git a/app/Controller/ElectionsController.php b/app/Controller/ElectionsController.php
@@ -36,6 +36,8 @@ public function view($id = null) {
             throw new NotFoundException(__('Invalid election'));
         }
         //$this->set('election', $this->Election->read(null, $id));
+
+        $offices = $this->Election->Office->find('all', array('conditions' => array('election_id' => $id)));
 
         $election = $this->Election->read(null, $id);
         $electionID = $id;
@@ -46,7 +48,7 @@ public function view($id = null) {
         $allConstituencies = $this->Election->Candidate->find('all', array('conditions' => array('Candidate.user_id' => $this->_currentUser['User']['id']),
                                                                            'recursive' => 2));
 
-        $this->set(compact('callback','election', 'electionID', 'constituentID', 'officeID', 'allConstituencies'));
+        $this->set(compact('callback','election', 'electionID', 'constituentID', 'officeID', 'allConstituencies', 'offices'));
 
         //$this->redirect(array('controller' => 'constituencies', 'action' => 'index', 'home'));
     }

diff --git a/app/Vendor/facebook/base_facebook.php b/app/Vendor/facebook/base_facebook.php
@@ -120,7 +120,7 @@ abstract class BaseFacebook
   /**
    * Version.
    */
-  const VERSION = '3.2.0';
+  const VERSION = '3.2.2';
 
   /**
    * Signed Request Algorithm.
@@ -367,20 +367,20 @@ public function setExtendedAccessToken() {
       // In any event, we don't have an access token, so say so.
       return false;
     }
-  
+
     if (empty($access_token_response)) {
       return false;
     }
-      
+
     $response_params = array();
     parse_str($access_token_response, $response_params);
-    
+
     if (!isset($response_params['access_token'])) {
       return false;
     }
-    
+
     $this->destroySession();
-    
+
     $this->setPersistentData(
       'access_token', $response_params['access_token']
     );
@@ -439,6 +439,11 @@ protected function getUserAccessToken() {
       // the JS SDK puts a code in with the redirect_uri of ''
       if (array_key_exists('code', $signed_request)) {
         $code = $signed_request['code'];
+        if ($code && $code == $this->getPersistentData('code')) {
+          // short-circuit if the code we have is the same as the one presented
+          return $this->getPersistentData('access_token');
+        }
+
         $access_token = $this->getAccessTokenFromCode($code, '');
         if ($access_token) {
           $this->setPersistentData('code', $code);
@@ -483,10 +488,10 @@ protected function getUserAccessToken() {
    */
   public function getSignedRequest() {
     if (!$this->signedRequest) {
-      if (isset($_REQUEST['signed_request'])) {
+      if (!empty($_REQUEST['signed_request'])) {
         $this->signedRequest = $this->parseSignedRequest(
           $_REQUEST['signed_request']);
-      } else if (isset($_COOKIE[$this->getSignedRequestCookieName()])) {
+      } else if (!empty($_COOKIE[$this->getSignedRequestCookieName()])) {
         $this->signedRequest = $this->parseSignedRequest(
           $_COOKIE[$this->getSignedRequestCookieName()]);
       }
@@ -524,6 +529,11 @@ protected function getUserFromAvailableData() {
     if ($signed_request) {
       if (array_key_exists('user_id', $signed_request)) {
         $user = $signed_request['user_id'];
+
+        if($user != $this->getPersistentData('user_id')){
+          $this->clearAllPersistentData();
+        }
+
         $this->setPersistentData('user_id', $signed_request['user_id']);
         return $user;
       }
@@ -1143,10 +1153,16 @@ protected function getHttpProtocol() {
       }
       return 'http';
     }
+    /*apache + variants specific way of checking for https*/
     if (isset($_SERVER['HTTPS']) &&
         ($_SERVER['HTTPS'] === 'on' || $_SERVER['HTTPS'] == 1)) {
       return 'https';
     }
+    /*nginx way of checking for https*/
+    if (isset($_SERVER['SERVER_PORT']) &&
+        ($_SERVER['SERVER_PORT'] === '443')) {
+      return 'https';
+    }
     return 'http';
   }