The legacy OAuth server is removed
This commit is contained in:
parent
110f8018eb
commit
6668066099
16 changed files with 347 additions and 1314 deletions
92
mod/api.php
92
mod/api.php
|
|
@ -20,32 +20,10 @@
|
|||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
use Friendica\Module\Security\Login;
|
||||
use Friendica\Security\OAuth1\OAuthRequest;
|
||||
use Friendica\Security\OAuth1\OAuthUtil;
|
||||
|
||||
require_once __DIR__ . '/../include/api.php';
|
||||
|
||||
function oauth_get_client(OAuthRequest $request)
|
||||
{
|
||||
$params = $request->get_parameters();
|
||||
$token = $params['oauth_token'];
|
||||
|
||||
$r = q("SELECT `clients`.*
|
||||
FROM `clients`, `tokens`
|
||||
WHERE `clients`.`client_id`=`tokens`.`client_id`
|
||||
AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", DBA::escape($token));
|
||||
|
||||
if (!DBA::isResult($r)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return $r[0];
|
||||
}
|
||||
|
||||
function api_post(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
|
|
@ -61,76 +39,6 @@ function api_post(App $a)
|
|||
|
||||
function api_content(App $a)
|
||||
{
|
||||
if (DI::args()->getCommand() == 'api/oauth/authorize') {
|
||||
/*
|
||||
* api/oauth/authorize interact with the user. return a standard page
|
||||
*/
|
||||
|
||||
DI::page()['template'] = "minimal";
|
||||
|
||||
// get consumer/client from request token
|
||||
try {
|
||||
$request = OAuthRequest::from_request();
|
||||
} catch (Exception $e) {
|
||||
echo "<pre>";
|
||||
var_dump($e);
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!empty($_POST['oauth_yes'])) {
|
||||
$app = oauth_get_client($request);
|
||||
if (is_null($app)) {
|
||||
return "Invalid request. Unknown token.";
|
||||
}
|
||||
$consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
|
||||
|
||||
$verifier = md5($app['secret'] . local_user());
|
||||
DI::config()->set("oauth", $verifier, local_user());
|
||||
|
||||
if ($consumer->callback_url != null) {
|
||||
$params = $request->get_parameters();
|
||||
$glue = "?";
|
||||
if (strstr($consumer->callback_url, $glue)) {
|
||||
$glue = "?";
|
||||
}
|
||||
DI::baseUrl()->redirect($consumer->callback_url . $glue . 'oauth_token=' . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . '&oauth_verifier=' . OAuthUtil::urlencode_rfc3986($verifier));
|
||||
exit();
|
||||
}
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate("oauth_authorize_done.tpl");
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$title' => DI::l10n()->t('Authorize application connection'),
|
||||
'$info' => DI::l10n()->t('Return to your app and insert this Securty Code:'),
|
||||
'$code' => $verifier,
|
||||
]);
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
if (!local_user()) {
|
||||
/// @TODO We need login form to redirect to this page
|
||||
notice(DI::l10n()->t('Please login to continue.'));
|
||||
return Login::form(DI::args()->getQueryString(), false, $request->get_parameters());
|
||||
}
|
||||
//FKOAuth1::loginUser(4);
|
||||
|
||||
$app = oauth_get_client($request);
|
||||
if (is_null($app)) {
|
||||
return "Invalid request. Unknown token.";
|
||||
}
|
||||
|
||||
$tpl = Renderer::getMarkupTemplate('oauth_authorize.tpl');
|
||||
$o = Renderer::replaceMacros($tpl, [
|
||||
'$title' => DI::l10n()->t('Authorize application connection'),
|
||||
'$app' => $app,
|
||||
'$authorize' => DI::l10n()->t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
|
||||
'$yes' => DI::l10n()->t('Yes'),
|
||||
'$no' => DI::l10n()->t('No'),
|
||||
]);
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
echo api_call($a);
|
||||
exit();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue