X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fapi.php;h=63f8a934c81ef5e18a488cb113f21ab0b73eba1f;hb=1058d055d16f0cd7ce000c22b038dbad86334ce3;hp=bc5de03401bfba391848b9447acaafae872270b7;hpb=ff7fc68382bf1359adc31bd65bb6786b7f63e31a;p=friendica.git diff --git a/mod/api.php b/mod/api.php index bc5de03401..63f8a934c8 100644 --- a/mod/api.php +++ b/mod/api.php @@ -2,13 +2,8 @@ require_once('include/api.php'); -function oauth_get_client(){ - // get consumer/client from request token - try { - $request = OAuthRequest::from_request(); - } catch(Exception $e) { - echo "
"; var_dump($e); killme(); - } +function oauth_get_client($request){ + $params = $request->get_parameters(); $token = $params['oauth_token']; @@ -45,44 +40,63 @@ function api_content(&$a) { * api/oauth/authorize interact with the user. return a standard page */ + $a->page['template'] = "minimal"; - if (x($_POST,'oauth_yes')){ + // get consumer/client from request token + try { + $request = OAuthRequest::from_request(); + } catch(Exception $e) { + echo ""; var_dump($e); killme(); + } - $app = oauth_get_client(); + + if (x($_POST,'oauth_yes')){ + + $app = oauth_get_client($request); if (is_null($app)) return "Invalid request. Unknown token."; - $consumer = new OAuthConsumer($app['key'], $app['secret']); + $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']); + + $verifier = md5($app['secret'].local_user()); + set_config("oauth", $verifier, local_user()); + + + if ($consumer->callback_url!=null) { + $params = $request->get_parameters(); + $glue="?"; + if (strstr($consumer->callback_url,$glue)) $glue="?"; + goaway($consumer->callback_url.$glue."oauth_token=".OAuthUtil::urlencode_rfc3986($params['oauth_token'])."&oauth_verifier=".OAuthUtil::urlencode_rfc3986($verifier)); + killme(); + } + - // Rev A change - $request = OAuthRequest::from_request(); - $callback = $request->get_parameter('oauth_callback'); - $datastore = new FKOAuthDataStore(); - $new_token = $datastore->new_request_token($consumer, $callback); $tpl = get_markup_template("oauth_authorize_done.tpl"); $o = replace_macros($tpl, array( '$title' => t('Authorize application connection'), '$info' => t('Return to your app and insert this Securty Code:'), - '$code' => $new_token->key, + '$code' => $verifier, )); return $o; } - if(! local_user()) { //TODO: we need login form to redirect to this page notice( t('Please login to continue.') . EOL ); - return login(false); + return login(false,$request->get_parameters()); } + //FKOAuth1::loginUser(4); - $app = oauth_get_client(); + $app = oauth_get_client($request); if (is_null($app)) return "Invalid request. Unknown token."; + + $tpl = get_markup_template('oauth_authorize.tpl'); $o = replace_macros($tpl, array( '$title' => t('Authorize application connection'), @@ -96,7 +110,7 @@ function api_content(&$a) { return $o; } - + echo api_call($a); killme(); }