Updated Facebook client libs to the latest version

This commit is contained in:
Zach Copley 2009-05-15 19:20:19 +00:00
parent 251fd2c232
commit 6a2d22ddd8
3 changed files with 1021 additions and 154 deletions

View File

@ -1,5 +1,5 @@
<?php <?php
// Copyright 2004-2008 Facebook. All Rights Reserved. // Copyright 2004-2009 Facebook. All Rights Reserved.
// //
// +---------------------------------------------------------------------------+ // +---------------------------------------------------------------------------+
// | Facebook Platform PHP5 client | // | Facebook Platform PHP5 client |
@ -30,13 +30,12 @@
// +---------------------------------------------------------------------------+ // +---------------------------------------------------------------------------+
// | For help with this library, contact developers-help@facebook.com | // | For help with this library, contact developers-help@facebook.com |
// +---------------------------------------------------------------------------+ // +---------------------------------------------------------------------------+
//
include_once 'facebookapi_php5_restlib.php'; include_once 'facebookapi_php5_restlib.php';
define('FACEBOOK_API_VALIDATION_ERROR', 1); define('FACEBOOK_API_VALIDATION_ERROR', 1);
class Facebook { class Facebook {
public $api_client; public $api_client;
public $api_key; public $api_key;
public $secret; public $secret;
public $generate_session_secret; public $generate_session_secret;
@ -213,28 +212,55 @@ class Facebook {
} }
} }
// Invalidate the session currently being used, and clear any state associated with it // Invalidate the session currently being used, and clear any state associated
// with it. Note that the user will still remain logged into Facebook.
public function expire_session() { public function expire_session() {
if ($this->api_client->auth_expireSession()) { if ($this->api_client->auth_expireSession()) {
if (!$this->in_fb_canvas() && isset($_COOKIE[$this->api_key . '_user'])) { $this->clear_cookie_state();
$cookies = array('user', 'session_key', 'expires', 'ss');
foreach ($cookies as $name) {
setcookie($this->api_key . '_' . $name, false, time() - 3600);
unset($_COOKIE[$this->api_key . '_' . $name]);
}
setcookie($this->api_key, false, time() - 3600);
unset($_COOKIE[$this->api_key]);
}
// now, clear the rest of the stored state
$this->user = 0;
$this->api_client->session_key = 0;
return true; return true;
} else { } else {
return false; return false;
} }
} }
/** Logs the user out of all temporary application sessions as well as their
* Facebook session. Note this will only work if the user has a valid current
* session with the application.
*
* @param string $next URL to redirect to upon logging out
*
*/
public function logout($next) {
$logout_url = $this->get_logout_url($next);
// Clear any stored state
$this->clear_cookie_state();
$this->redirect($logout_url);
}
/**
* Clears any persistent state stored about the user, including
* cookies and information related to the current session in the
* client.
*
*/
public function clear_cookie_state() {
if (!$this->in_fb_canvas() && isset($_COOKIE[$this->api_key . '_user'])) {
$cookies = array('user', 'session_key', 'expires', 'ss');
foreach ($cookies as $name) {
setcookie($this->api_key . '_' . $name, false, time() - 3600);
unset($_COOKIE[$this->api_key . '_' . $name]);
}
setcookie($this->api_key, false, time() - 3600);
unset($_COOKIE[$this->api_key]);
}
// now, clear the rest of the stored state
$this->user = 0;
$this->api_client->session_key = 0;
}
public function redirect($url) { public function redirect($url) {
if ($this->in_fb_canvas()) { if ($this->in_fb_canvas()) {
echo '<fb:redirect url="' . $url . '"/>'; echo '<fb:redirect url="' . $url . '"/>';
@ -249,7 +275,8 @@ class Facebook {
} }
public function in_frame() { public function in_frame() {
return isset($this->fb_params['in_canvas']) || isset($this->fb_params['in_iframe']); return isset($this->fb_params['in_canvas'])
|| isset($this->fb_params['in_iframe']);
} }
public function in_fb_canvas() { public function in_fb_canvas() {
return isset($this->fb_params['in_canvas']); return isset($this->fb_params['in_canvas']);
@ -296,14 +323,42 @@ class Facebook {
} }
public function get_add_url($next=null) { public function get_add_url($next=null) {
return self::get_facebook_url().'/add.php?api_key='.$this->api_key . $page = self::get_facebook_url().'/add.php';
($next ? '&next=' . urlencode($next) : ''); $params = array('api_key' => $this->api_key);
if ($next) {
$params['next'] = $next;
}
return $page . '?' . http_build_query($params);
} }
public function get_login_url($next, $canvas) { public function get_login_url($next, $canvas) {
return self::get_facebook_url().'/login.php?v=1.0&api_key=' . $this->api_key . $page = self::get_facebook_url().'/login.php';
($next ? '&next=' . urlencode($next) : '') . $params = array('api_key' => $this->api_key,
($canvas ? '&canvas' : ''); 'v' => '1.0');
if ($next) {
$params['next'] = $next;
}
if ($canvas) {
$params['canvas'] = '1';
}
return $page . '?' . http_build_query($params);
}
public function get_logout_url($next) {
$page = self::get_facebook_url().'/logout.php';
$params = array('app_key' => $this->api_key,
'session_key' => $this->api_client->session_key);
if ($next) {
$params['connect_next'] = 1;
$params['next'] = $next;
}
return $page . '?' . http_build_query($params);
} }
public function set_user($user, $session_key, $expires=null, $session_secret=null) { public function set_user($user, $session_key, $expires=null, $session_secret=null) {
@ -410,7 +465,20 @@ class Facebook {
return $fb_params; return $fb_params;
} }
/* /**
* Validates the account that a user was trying to set up an
* independent account through Facebook Connect.
*
* @param user The user attempting to set up an independent account.
* @param hash The hash passed to the reclamation URL used.
* @return bool True if the user is the one that selected the
* reclamation link.
*/
public function verify_account_reclamation($user, $hash) {
return $hash == md5($user . $this->secret);
}
/**
* Validates that a given set of parameters match their signature. * Validates that a given set of parameters match their signature.
* Parameters all match a given input prefix, such as "fb_sig". * Parameters all match a given input prefix, such as "fb_sig".
* *
@ -422,6 +490,37 @@ class Facebook {
return self::generate_sig($fb_params, $this->secret) == $expected_sig; return self::generate_sig($fb_params, $this->secret) == $expected_sig;
} }
/**
* Validate the given signed public session data structure with
* public key of the app that
* the session proof belongs to.
*
* @param $signed_data the session info that is passed by another app
* @param string $public_key Optional public key of the app. If this
* is not passed, function will make an API call to get it.
* return true if the session proof passed verification.
*/
public function verify_signed_public_session_data($signed_data,
$public_key = null) {
// If public key is not already provided, we need to get it through API
if (!$public_key) {
$public_key = $this->api_client->auth_getAppPublicKey(
$signed_data['api_key']);
}
// Create data to verify
$data_to_serialize = $signed_data;
unset($data_to_serialize['sig']);
$serialized_data = implode('_', $data_to_serialize);
// Decode signature
$signature = base64_decode($signed_data['sig']);
$result = openssl_verify($serialized_data, $signature, $public_key,
OPENSSL_ALGO_SHA1);
return $result == 1;
}
/* /*
* Generate a signature using the application secret key. * Generate a signature using the application secret key.
* *

View File

@ -1,5 +1,5 @@
<?php <?php
// Copyright 2004-2008 Facebook. All Rights Reserved. // Copyright 2004-2009 Facebook. All Rights Reserved.
// //
// +---------------------------------------------------------------------------+ // +---------------------------------------------------------------------------+
// | Facebook Platform PHP5 client | // | Facebook Platform PHP5 client |

1026
extlib/facebook/facebookapi_php5_restlib.php Normal file → Executable file

File diff suppressed because it is too large Load Diff