X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fapi.php;h=ad75e6620e2aff9bbbe8e0cfce82e770f9553349;hb=1f074cb44c5deda5b480f5ff814ff3640ec843d0;hp=5903caee60c7dfeac28ee5e20ab08437faf494cd;hpb=69e41f7703bff03dc88e7181961a717ae41330c4;p=friendica.git diff --git a/mod/api.php b/mod/api.php old mode 100644 new mode 100755 index 5903caee60..ad75e6620e --- 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,16 +40,36 @@ 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(); + } + + + if (x($_POST,'oauth_yes')){ - $app = oauth_get_client(); + $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_pconfig(local_user(), "oauth", "verifier", $verifier); + 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(); + } + + $tpl = get_markup_template("oauth_authorize_done.tpl"); $o = replace_macros($tpl, array( @@ -67,19 +82,21 @@ function api_content(&$a) { } - 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'),