* @category Settings
* @package StatusNet
* @author Zach Copley <zach@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
exit(1);
}
-require_once INSTALLDIR . '/lib/connectsettingsaction.php';
-require_once INSTALLDIR . '/lib/applicationlist.php';
+require_once INSTALLDIR . '/lib/apioauthstore.php';
/**
* Show connected OAuth applications
*
* @see SettingsAction
*/
-
-class OauthconnectionssettingsAction extends ConnectSettingsAction
+class OauthconnectionssettingsAction extends SettingsAction
{
+ var $page = null;
+ var $oauth_token = null;
+
+ function prepare($args)
+ {
+ parent::prepare($args);
+ $this->oauth_token = $this->arg('oauth_token');
+ $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
+ return true;
+ }
+
/**
* Title of the page
*
* @return string Title of the page
*/
-
function title()
{
- return _('Connected Applications');
+ // TRANS: Title for OAuth connection settings.
+ return _('Connected applications');
}
/**
*
* @return instructions for use
*/
-
function getInstructions()
{
- return _('You have allowed the following applications to access you account.');
+ // TRANS: Instructions for OAuth connection settings.
+ return _('The following connections exist for your account.');
}
/**
$offset = ($this->page - 1) * APPS_PER_PAGE;
$limit = APPS_PER_PAGE + 1;
- $application = $profile->getApplications($offset, $limit);
+ $connection = $user->getConnectedApps($offset, $limit);
+
+ $cnt = 0;
+
+ if (!empty($connection)) {
+ $cal = new ConnectedAppsList($connection, $user, $this);
+ $cnt = $cal->show();
+ }
- if ($application) {
- $al = new ApplicationList($application, $this->user, $this);
- $cnt = $al->show();
- if (0 == $cnt) {
- $this->showEmptyListMessage();
- }
+ if ($cnt == 0) {
+ $this->showEmptyListMessage();
}
- $this->pagination($this->page > 1, $cnt > APPS_PER_PAGE,
- $this->page, 'connectionssettings',
- array('nickname' => $this->user->nickname));
+ $this->pagination(
+ $this->page > 1,
+ $cnt > APPS_PER_PAGE,
+ $this->page,
+ 'connectionssettings',
+ array('nickname' => $user->nickname)
+ );
}
/**
*
* @return void
*/
-
function handlePost()
{
// CSRF protection
return;
}
+ if ($this->arg('revoke')) {
+ $this->revokeAccess($this->oauth_token);
+ } else {
+ // TRANS: Client error when submitting a form with unexpected information.
+ $this->clientError(_('Unexpected form submission.'), 401);
+ return false;
+ }
+ }
+
+ /**
+ * Revoke an access token
+ *
+ * XXX: Confirm revoke before doing it
+ *
+ * @param int $appId the ID of the application
+ *
+ */
+ function revokeAccess($token)
+ {
+ $cur = common_current_user();
+
+ $appUser = Oauth_application_user::getByUserAndToken($cur, $token);
+
+ if (empty($appUser)) {
+ // TRANS: Client error when trying to revoke access for an application while not being a user of it.
+ $this->clientError(_('You are not a user of that application.'), 401);
+ return false;
+ }
+
+ $app = Oauth_application::staticGet('id', $appUser->application_id);
+
+ $datastore = new ApiStatusNetOAuthDataStore();
+ $datastore->revoke_token($appUser->token, 1);
+
+ $result = $appUser->delete();
+
+ if (!$result) {
+ common_log_db_error($orig, 'DELETE', __FILE__);
+ // TRANS: Client error when revoking access has failed for some reason.
+ // TRANS: %s is the application ID revoking access failed for.
+ $this->clientError(sprintf(_('Unable to revoke access for application: %s.'), $app->id));
+ return false;
+ }
+
+ $msg = 'API OAuth - user %s (id: %d) revoked access token %s for app id %d';
+ common_log(
+ LOG_INFO,
+ sprintf(
+ $msg,
+ $cur->nickname,
+ $cur->id,
+ $appUser->token,
+ $appUser->application_id
+ )
+ );
+
+ $msg = sprintf(
+ // TRANS: Success message after revoking access for an application.
+ // TRANS: %1$s is the application name, %2$s is the first part of the user token.
+ _('You have successfully revoked access for %1$s and the access token starting with %2$s.'),
+ $app->name,
+ substr($appUser->token, 0, 7)
+ );
+
+ $this->showForm($msg, true);
}
function showEmptyListMessage()
{
- $message = sprintf(_('You have not authorized any applications to use your account.'));
+ // TRANS: Empty list message when no applications have been authorised yet.
+ $message = _('You have not authorized any applications to use your account.');
$this->elementStart('div', 'guide');
$this->raw(common_markup_to_html($message));
function showSections()
{
- $cur = common_current_user();
-
- $this->element('h2', null, 'Developers');
- $this->elementStart('p');
- $this->raw(_('Developers can edit the registration settings for their applications '));
- $this->element('a',
- array('href' => common_local_url('apps', array('nickname' => $cur->nickname))),
- 'here.');
- $this->elementEnd('p');
- }
+ $cur = common_current_user();
+
+ $this->elementStart('div', array('id' => 'developer-help', 'class' => 'section'));
+
+ $this->element('h2', null, 'Developers');
+ $this->elementStart('p');
+ $devMsg = sprintf(
+ // TRANS: Note for developers in the OAuth connection settings form.
+ // TRANS: This message contains a Markdown link. Do not separate "](".
+ // TRANS: %s is the URL to the OAuth settings.
+ _('Are you a developer? [Register an OAuth client application](%s) to use with this instance of StatusNet.'),
+ common_local_url('oauthappssettings')
+ );
+
+ $output = common_markup_to_html($devMsg);
+
+ $this->raw($output);
+ $this->elementEnd('p');
+
+ $this->elementEnd('section');
+ }
}
projects / quix0rs-gnu-social.git / blobdiff