wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Twitter username wasn't getting stored in Foreign_user when linking Twitter account (fixed)

Browse Source 
- Updates to comments
This commit is contained in:
Zach Copley 2010-01-26 01:25:33 +00:00
parent 3fc3a2b326
commit d429710fe1
1 changed files with 58 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
plugins/TwitterBridge/twitterauthorization.php
View File

@ -93,18 +93,24 @@ class TwitterauthorizationAction extends Action
} }
} }
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($_SERVER['REQUEST_METHOD'] == 'POST') {
// User was not logged in to StatusNet before // User was not logged in to StatusNet before
$this->twuid = $this->trimmed('twuid'); $this->twuid = $this->trimmed('twuid');
$this->tw_fields = array("name" => $this->trimmed('name'), "fullname" => $this->trimmed('fullname'));
$this->tw_fields = array('name' => $this->trimmed('tw_fields_name'),
'fullname' => $this->trimmed('tw_fields_fullname'));
$this->access_token = new OAuthToken($this->trimmed('access_token_key'), $this->trimmed('access_token_secret')); $this->access_token = new OAuthToken($this->trimmed('access_token_key'), $this->trimmed('access_token_secret'));
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->showForm(_('There was a problem with your session token. Try again, please.')); $this->showForm(_('There was a problem with your session token. Try again, please.'));
return; return;
} }
if ($this->arg('create')) { if ($this->arg('create')) {
if (!$this->boolean('license')) { if (!$this->boolean('license')) {
$this->showForm(_('You can\'t register if you don\'t agree to the license.'), $this->showForm(_('You can\'t register if you don\'t agree to the license.'),
@ -181,6 +187,8 @@ class TwitterauthorizationAction extends Action
$this->serverError(_m('Couldn\'t link your Twitter account.')); $this->serverError(_m('Couldn\'t link your Twitter account.'));
} }
$twitter_user = null;
try { try {
$client = new TwitterOAuthClient($_SESSION['twitter_request_token'], $client = new TwitterOAuthClient($_SESSION['twitter_request_token'],
@ -196,16 +204,19 @@ class TwitterauthorizationAction extends Action
$twitter_user = $client->verifyCredentials(); $twitter_user = $client->verifyCredentials();
} catch (OAuthClientException $e) { } catch (OAuthClientException $e) {
$msg = sprintf('OAuth client cURL error - code: %1$s, msg: %2$s', $msg = sprintf('OAuth client error - code: %1$s, msg: %2$s',
$e->getCode(), $e->getMessage()); $e->getCode(), $e->getMessage());
$this->serverError(_m('Couldn\'t link your Twitter account.')); $this->serverError(_m('Couldn\'t link your Twitter account.'));
} }
if (common_logged_in()) { if (common_logged_in()) {
// Save the access token and Twitter user info // Save the access token and Twitter user info
$this->saveForeignLink($atok, $twitter_user); $this->saveForeignLink($atok, $twitter_user);
}
else{ } else {
$this->twuid = $twitter_user->id; $this->twuid = $twitter_user->id;
$this->tw_fields = array("name" => $twitter_user->screen_name, "fullname" => $twitter_user->name); $this->tw_fields = array("name" => $twitter_user->screen_name, "fullname" => $twitter_user->name);
$this->access_token = $atok; $this->access_token = $atok;
@ -260,8 +271,34 @@ class TwitterauthorizationAction extends Action
save_twitter_user($twitter_user->id, $twitter_user->screen_name); save_twitter_user($twitter_user->id, $twitter_user->screen_name);
} }
function flinkUser($user_id, $twuid)
{
$flink = new Foreign_link();
$flink->user_id = $user_id;
$flink->foreign_id = $twuid;
$flink->service = TWITTER_SERVICE;
$creds = TwitterOAuthClient::packToken($this->access_token);
$flink->credentials = $creds;
$flink->created = common_sql_now();
// Defaults: noticesync on, everything else off
$flink->set_flags(true, false, false, false);
$flink_id = $flink->insert();
if (empty($flink_id)) {
common_log_db_error($flink, 'INSERT', __FILE__);
$this->serverError(_('Couldn\'t link your Twitter account.'));
}
save_twitter_user($twuid, $this->tw_fields['name']);
return $flink_id;
}
function showPageNotice() function showPageNotice()
{ {
@ -430,7 +467,7 @@ class TwitterauthorizationAction extends Action
common_set_user($user); common_set_user($user);
common_real_login(true); common_real_login(true);
common_debug('Twitter Connect Plugin - ' . common_debug('TwitterBridge Plugin - ' .
"Registered new user $user->id from Twitter user $this->fbuid"); "Registered new user $user->id from Twitter user $this->fbuid");
common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)), common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
@ -450,7 +487,7 @@ class TwitterauthorizationAction extends Action
$user = User::staticGet('nickname', $nickname); $user = User::staticGet('nickname', $nickname);
if (!empty($user)) { if (!empty($user)) {
common_debug('Twitter Connect Plugin - ' . common_debug('TwitterBridge Plugin - ' .
"Legit user to connect to Twitter: $nickname"); "Legit user to connect to Twitter: $nickname");
} }
@ -461,7 +498,7 @@ class TwitterauthorizationAction extends Action
return; return;
} }
common_debug('Twitter Connnect Plugin - ' . common_debug('TwitterBridge Plugin - ' .
"Connected Twitter user $this->fbuid to local user $user->id"); "Connected Twitter user $this->fbuid to local user $user->id");
common_set_user($user); common_set_user($user);
@ -481,7 +518,7 @@ class TwitterauthorizationAction extends Action
return; return;
} }
common_debug('Twitter Connect Plugin - ' . common_debug('TwitterBridge Plugin - ' .
"Connected Twitter user $this->fbuid to local user $user->id"); "Connected Twitter user $this->fbuid to local user $user->id");
// Return to Twitter connection settings tab // Return to Twitter connection settings tab
@ -490,8 +527,8 @@ class TwitterauthorizationAction extends Action
function tryLogin() function tryLogin()
{ {
common_debug('Twitter Connect Plugin - ' . common_debug('TwitterBridge Plugin - ' .
"Trying login for Twitter user $this->fbuid."); "Trying login for Twitter user $this->twuid.");
$flink = Foreign_link::getByForeignID($this->twuid, TWITTER_SERVICE); $flink = Foreign_link::getByForeignID($this->twuid, TWITTER_SERVICE);
@ -500,7 +537,7 @@ class TwitterauthorizationAction extends Action
if (!empty($user)) { if (!empty($user)) {
common_debug('Twitter Connect Plugin - ' . common_debug('TwitterBridge Plugin - ' .
"Logged in Twitter user $flink->foreign_id as user $user->id ($user->nickname)"); "Logged in Twitter user $flink->foreign_id as user $user->id ($user->nickname)");
common_set_user($user); common_set_user($user);
@ -510,7 +547,7 @@ class TwitterauthorizationAction extends Action
} else { } else {
common_debug('Twitter Connect Plugin - ' . common_debug('TwitterBridge Plugin - ' .
"No flink found for twuid: $this->twuid - new user"); "No flink found for twuid: $this->twuid - new user");
$this->showForm(null, $this->bestNewNickname()); $this->showForm(null, $this->bestNewNickname());
@ -532,36 +569,6 @@ class TwitterauthorizationAction extends Action
common_redirect($url, 303); common_redirect($url, 303);
} }
function flinkUser($user_id, $twuid)
{
$flink = new Foreign_link();
$flink->user_id = $user_id;
$flink->foreign_id = $twuid;
$flink->service = TWITTER_SERVICE;
$creds = TwitterOAuthClient::packToken($this->access_token);
$flink->credentials = $creds;
$flink->created = common_sql_now();
// Defaults: noticesync on, everything else off
$flink->set_flags(true, false, false, false);
$flink_id = $flink->insert();
if (empty($flink_id)) {
common_log_db_error($flink, 'INSERT', __FILE__);
$this->serverError(_('Couldn\'t link your Twitter account.'));
}
save_twitter_user($twuid, $this->tw_fields['name']);
return $flink_id;
}
function bestNewNickname() function bestNewNickname()
{ {
if (!empty($this->tw_fields['name'])) { if (!empty($this->tw_fields['name'])) {