namespace shpub;
/**
- * @link http://micropub.net/draft/
- * @link http://indieweb.org/authorization-endpoint
+ * Connect to a micropub server to get an access token.
+ *
+ * @author Christian Weiske <cweiske@cweiske.de>
+ * @license http://www.gnu.org/licenses/agpl.html GNU AGPL v3
+ * @link http://cweiske.de/shpub.htm
+ * @link http://micropub.net/draft/
+ * @link http://indieweb.org/authorization-endpoint
*/
class Command_Connect
{
public static function opts(\Console_CommandLine $optParser)
{
$cmd = $optParser->addCommand('connect');
+ $cmd->description = 'Obtain access token from a micropub server';
$cmd->addOption(
'force',
array(
'default' => false,
)
);
+ $cmd->addOption(
+ 'scope',
+ array(
+ 'short_name' => '-s',
+ 'long_name' => '--scope',
+ 'description' => 'Space-separated list of scopes to request'
+ . ' (default: create)',
+ 'action' => 'StoreString',
+ 'default' => 'create',
+ )
+ );
$cmd->addArgument(
'server',
[
);
}
- public function run($server, $user, $newKey, $force)
+ public function run($server, $user, $newKey, $force, $scope)
{
$server = Validator::url($server, 'server');
if ($user === null) {
$state = time();
Log::msg(
"To authenticate, open the following URL:\n"
- . $this->getBrowserAuthUrl($host, $user, $redirect_uri, $state)
+ . $this->getBrowserAuthUrl($host, $user, $redirect_uri, $state, $scope)
);
$authParams = $this->startHttpServer($socketStr);
$req->setBody(
http_build_query(
[
+ 'grant_type' => 'authorization_code',
'me' => $userUrl,
'code' => $code,
'redirect_uri' => $redirect_uri,
Log::err($res->getBody());
exit(2);
}
- if ($res->getHeader('content-type') != 'application/x-www-form-urlencoded') {
+ if (Util::getMimeType($res) == 'application/x-www-form-urlencoded') {
+ parse_str($res->getBody(), $tokenParams);
+ } elseif (Util::getMimeType($res) == 'application/json') {
+ $tokenParams = json_decode($res->getBody(), true);
+ } else {
Log::err('Wrong content type in auth verification response');
exit(2);
}
- parse_str($res->getBody(), $tokenParams);
if (!isset($tokenParams['access_token'])) {
Log::err('"access_token" missing');
exit(2);
return $accessToken;
}
- protected function getBrowserAuthUrl($host, $user, $redirect_uri, $state)
+ protected function getBrowserAuthUrl($host, $user, $redirect_uri, $state, $scope)
{
+ $sep = strpos($host->endpoints->authorization, '?') === false
+ ? '?' : '&';
return $host->endpoints->authorization
- . '?me=' . urlencode($user)
+ . $sep . 'me=' . urlencode($user)
. '&client_id=' . urlencode(static::$client_id)
. '&redirect_uri=' . urlencode($redirect_uri)
- . '&state=' . $state
- . '&scope=post'
+ . '&state=' . urlencode($state)
+ . '&scope=' . urlencode($scope)
. '&response_type=code';
}