Commit 634fb64c authored by Zach Copley's avatar Zach Copley

Facebook bridge mostly working again with new OAuth 2.0 flow

parent 118e84be
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2010, StatusNet, Inc.
* Copyright (C) 2010-2011, StatusNet, Inc.
*
* A plugin for integrating Facebook with StatusNet. Includes single-sign-on
* and publishing notices to Facebook using Facebook's Graph API.
......@@ -21,7 +21,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Pugin
* @category Plugin
* @package StatusNet
* @author Zach Copley <zach@status.net>
* @copyright 2011 StatusNet, Inc.
......@@ -41,7 +41,7 @@ define("FACEBOOK_SERVICE", 2);
* @category Plugin
* @package StatusNet
* @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc.
* @copyright 2010-2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
......@@ -108,6 +108,7 @@ class FacebookBridgePlugin extends Plugin
switch ($cls)
{
case 'Facebook': // Facebook PHP SDK
include_once $dir . '/extlib/base_facebook.php';
include_once $dir . '/extlib/facebook.php';
return false;
case 'FacebookloginAction':
......@@ -351,26 +352,26 @@ class FacebookBridgePlugin extends Plugin
$action->script('https://connect.facebook.net/en_US/all.js');
$script = <<<ENDOFSCRIPT
FB.init({appId: %1\$s, session: %2\$s, status: true, cookie: true, xfbml: true});
FB.init({appId: %1\$s, status: true, cookie: true, xfbml: true, oauth: true});
$('#facebook_button').bind('click', function(event) {
event.preventDefault();
FB.login(function(response) {
if (response.session && response.perms) {
window.location.href = '%3\$s';
if (response.authResponse) {
window.location.href = '%2\$s';
} else {
// NOP (user cancelled login)
}
}, {perms:'read_stream,publish_stream,offline_access,user_status,user_location,user_website,email'});
}, {scope:'read_stream,publish_stream,offline_access,user_status,user_location,user_website,email'});
});
ENDOFSCRIPT;
$action->inlineScript(
sprintf($script,
sprintf(
$script,
json_encode($this->facebook->getAppId()),
json_encode($this->facebook->getSession()),
common_local_url('facebookfinishlogin')
)
);
......@@ -385,18 +386,16 @@ ENDOFSCRIPT;
function onEndLogout($action)
{
if ($this->hasApplication()) {
$session = $this->facebook->getSession();
//$session = $this->facebook->getSession();
$fbuser = null;
$fbuid = null;
if ($session) {
try {
$fbuid = $this->facebook->getUser();
$fbuser = $this->facebook->api('/me');
} catch (FacebookApiException $e) {
common_log(LOG_ERROR, $e, __FILE__);
}
}
if (!empty($fbuser)) {
......
......@@ -72,17 +72,16 @@ class FacebookloginAction extends Action
$facebook = Facebookclient::getFacebook();
$params = array(
'scope' => 'read_stream,publish_stream,offline_access,user_status,user_location,user_website,email',
'redirect_uri' => common_local_url('facebookfinishlogin')
);
// Degrade to plain link if JavaScript is not available
$this->elementStart(
'a',
array(
'href' => $facebook->getLoginUrl(
array(
'next' => common_local_url('facebookfinishlogin'),
'cancel' => common_local_url('facebooklogin'),
'req_perms' => 'read_stream,publish_stream,offline_access,user_status,user_location,user_website,email'
)
),
'href' => $facebook->getLoginUrl($params),
'id' => 'facebook_button'
)
);
......
......@@ -916,7 +916,7 @@ class Facebookclient
static function addFacebookUser($fbuser)
{
// remove any existing, possibly outdated, record
$luser = Foreign_user::getForeignUser($fbuser['id'], FACEBOOK_SERVICE);
$luser = Foreign_user::getForeignUser($fbuser->id, FACEBOOK_SERVICE);
if (!empty($luser)) {
......@@ -937,9 +937,9 @@ class Facebookclient
$fuser = new Foreign_user();
$fuser->nickname = $fbuser['name'];
$fuser->uri = $fbuser['link'];
$fuser->id = $fbuser['id'];
$fuser->nickname = $fbuser->username;
$fuser->uri = $fbuser->url;
$fuser->id = $fbuser->id;
$fuser->service = FACEBOOK_SERVICE;
$fuser->created = common_sql_now();
......@@ -950,8 +950,8 @@ class Facebookclient
LOG_WARNING,
sprintf(
'Failed to add new Facebook user: %s, fbuid %d',
$fbuser['name'],
$fbuser['id']
$fbuser->username,
$fbuser->id
),
__FILE__
);
......@@ -962,8 +962,8 @@ class Facebookclient
LOG_INFO,
sprintf(
'Added new Facebook user: %s, fbuid %d',
$fbuser['name'],
$fbuser['id']
$fbuser->name,
$fbuser->id
),
__FILE__
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment