update rest paths to namespace
This commit is contained in:
parent
5e4c68ab66
commit
ed77ffce26
1 changed files with 9 additions and 7 deletions
|
@ -4,6 +4,8 @@ namespace Activitypub\Rest;
|
||||||
use WP_REST_Response;
|
use WP_REST_Response;
|
||||||
use Activitypub\Signature;
|
use Activitypub\Signature;
|
||||||
use Activitypub\Model\User;
|
use Activitypub\Model\User;
|
||||||
|
use function Activitypub\get_rest_url_by_path;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ActivityPub Server REST-Class
|
* ActivityPub Server REST-Class
|
||||||
|
@ -18,8 +20,8 @@ class Server {
|
||||||
* Initialize the class, registering WordPress hooks
|
* Initialize the class, registering WordPress hooks
|
||||||
*/
|
*/
|
||||||
public static function init() {
|
public static function init() {
|
||||||
\add_filter( 'rest_request_before_callbacks', array( self::class, 'authorize_activitypub_requests' ), 10, 3 );
|
|
||||||
\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
|
\add_action( 'rest_api_init', array( self::class, 'register_routes' ) );
|
||||||
|
\add_filter( 'rest_request_before_callbacks', array( self::class, 'authorize_activitypub_requests' ), 10, 3 );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,7 +29,7 @@ class Server {
|
||||||
*/
|
*/
|
||||||
public static function register_routes() {
|
public static function register_routes() {
|
||||||
\register_rest_route(
|
\register_rest_route(
|
||||||
'activitypub/1.0',
|
ACTIVITYPUB_REST_NAMESPACE,
|
||||||
'/application',
|
'/application',
|
||||||
array(
|
array(
|
||||||
array(
|
array(
|
||||||
|
@ -48,16 +50,16 @@ class Server {
|
||||||
$json = new \stdClass();
|
$json = new \stdClass();
|
||||||
|
|
||||||
$json->{'@context'} = \Activitypub\get_context();
|
$json->{'@context'} = \Activitypub\get_context();
|
||||||
$json->id = \get_rest_url( null, 'activitypub/1.0/application' );
|
$json->id = get_rest_url_by_path( 'application' );
|
||||||
$json->type = 'Application';
|
$json->type = 'Application';
|
||||||
$json->preferredUsername = wp_parse_url( get_site_url(), PHP_URL_HOST ); // phpcs:ignore WordPress.NamingConventions
|
$json->preferredUsername = str_replace( array( '.' ), '-' , wp_parse_url( get_site_url(), PHP_URL_HOST ) ); // phpcs:ignore WordPress.NamingConventions
|
||||||
$json->name = get_bloginfo( 'name' );
|
$json->name = get_bloginfo( 'name' );
|
||||||
$json->summary = 'WordPress-ActivityPub application actor';
|
$json->summary = 'WordPress-ActivityPub application actor';
|
||||||
$json->manuallyApprovesFollowers = true; // phpcs:ignore WordPress.NamingConventions
|
$json->manuallyApprovesFollowers = true; // phpcs:ignore WordPress.NamingConventions
|
||||||
$json->icon = array( get_site_icon_url() ); // phpcs:ignore WordPress.NamingConventions short array syntax
|
$json->icon = array( get_site_icon_url() ); // phpcs:ignore WordPress.NamingConventions short array syntax
|
||||||
$json->publicKey = (object) array( // phpcs:ignore WordPress.NamingConventions
|
$json->publicKey = (object) array( // phpcs:ignore WordPress.NamingConventions
|
||||||
'id' => \get_rest_url( null, 'activitypub/1.0/application#main-key' ),
|
'id' => get_rest_url_by_path( 'application#main-key' ),
|
||||||
'owner' => \get_rest_url( null, 'activitypub/1.0/application' ),
|
'owner' => get_rest_url_by_path( 'application' ),
|
||||||
'publicKeyPem' => Signature::get_public_key( User::APPLICATION_USER_ID ), // phpcs:ignore WordPress.NamingConventions
|
'publicKeyPem' => Signature::get_public_key( User::APPLICATION_USER_ID ), // phpcs:ignore WordPress.NamingConventions
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -92,7 +94,7 @@ class Server {
|
||||||
return $verified_request;
|
return $verified_request;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if ( '/activitypub/1.0/webfinger' !== $route ) {
|
if ( get_rest_url_by_path( 'webfinger' ) !== $route ) {
|
||||||
// SecureMode/Authorized fetch.
|
// SecureMode/Authorized fetch.
|
||||||
if ( ACTIVITYPUB_SECURE_MODE ) {
|
if ( ACTIVITYPUB_SECURE_MODE ) {
|
||||||
$verified_request = Signature::verify_http_signature( $request );
|
$verified_request = Signature::verify_http_signature( $request );
|
||||||
|
|
Loading…
Reference in a new issue