From 89c5c5f0a879a4a18c1d3aa80a2be9c823246bde Mon Sep 17 00:00:00 2001 From: Joe Fusco Date: Fri, 23 Oct 2026 11:42:29 -0400 Subject: [PATCH 1/5] fix(webhooks): use the plugin slug as the text domain WordPress expects the text domain to match the plugin slug, wpgraphql-webhooks. The admin page slug and the REST namespace keep their graphql-webhooks names. --- plugins/wpgraphql-webhooks/.phpcs.xml.dist | 2 +- .../src/Admin/WebhooksAdmin.php | 38 +++++++++---------- .../src/Admin/WebhooksListTable.php | 30 +++++++-------- .../views/partials/webhook-header-row.php | 6 +-- .../src/Admin/views/webhook-form.php | 24 ++++++------ .../src/Admin/views/webhooks-list.php | 10 ++--- .../src/Fields/RootQuery.php | 6 +-- .../src/Mutation/CreateWebhook.php | 22 +++++------ .../src/Mutation/DeleteWebhook.php | 16 ++++---- .../src/Mutation/UpdateWebhook.php | 30 +++++++-------- .../src/PostTypes/WebhookPostType.php | 24 ++++++------ .../src/Repository/WebhookRepository.php | 2 +- .../src/Rest/WebhookTestEndpoint.php | 6 +-- .../wpgraphql-webhooks/src/Type/Webhook.php | 16 ++++---- .../wpgraphql-webhooks/wpgraphql-webhooks.php | 6 +-- 15 files changed, 119 insertions(+), 119 deletions(-) diff --git a/plugins/wpgraphql-webhooks/.phpcs.xml.dist b/plugins/wpgraphql-webhooks/.phpcs.xml.dist index e8bf7268..5b113bf5 100644 --- a/plugins/wpgraphql-webhooks/.phpcs.xml.dist +++ b/plugins/wpgraphql-webhooks/.phpcs.xml.dist @@ -140,7 +140,7 @@ - + diff --git a/plugins/wpgraphql-webhooks/src/Admin/WebhooksAdmin.php b/plugins/wpgraphql-webhooks/src/Admin/WebhooksAdmin.php index b9a137c5..5b643722 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/WebhooksAdmin.php +++ b/plugins/wpgraphql-webhooks/src/Admin/WebhooksAdmin.php @@ -63,8 +63,8 @@ public function init(): void { public function add_admin_menu(): void { // Add submenu under GraphQL menu using the correct parent slug add_menu_page( - __( 'Webhooks', 'graphql-webhooks' ), - __( 'Webhooks', 'graphql-webhooks' ), + __( 'Webhooks', 'wpgraphql-webhooks' ), + __( 'Webhooks', 'wpgraphql-webhooks' ), 'manage_options', self::ADMIN_PAGE_SLUG, [ $this, 'render_admin_page' ], @@ -73,8 +73,8 @@ public function add_admin_menu(): void { ); add_submenu_page( 'graphiql-ide', - __( 'GraphQL Webhooks', 'graphql-webhooks' ), - __( 'Webhooks', 'graphql-webhooks' ), + __( 'GraphQL Webhooks', 'wpgraphql-webhooks' ), + __( 'Webhooks', 'wpgraphql-webhooks' ), 'manage_options', self::ADMIN_PAGE_SLUG, [ $this, 'render_admin_page' ] @@ -129,7 +129,7 @@ public function enqueue_assets( string $hook ): void { 'ajaxUrl' => admin_url( 'admin-ajax.php' ), 'restUrl' => rest_url( 'graphql-webhooks/v1/' ), 'nonce' => wp_create_nonce( 'wp_rest' ), - 'confirmDelete' => __( 'Are you sure you want to delete this webhook?', 'graphql-webhooks' ), + 'confirmDelete' => __( 'Are you sure you want to delete this webhook?', 'wpgraphql-webhooks' ), 'headerTemplate' => $this->get_header_row_template(), ] ); @@ -154,7 +154,7 @@ private function get_header_row_template(): string { */ private function verify_admin_permission(): bool { if ( ! current_user_can( 'manage_options' ) ) { - wp_die( __( 'You do not have sufficient permissions to access this page.', 'graphql-webhooks' ) ); + wp_die( __( 'You do not have sufficient permissions to access this page.', 'wpgraphql-webhooks' ) ); return false; } return true; @@ -169,7 +169,7 @@ private function verify_admin_permission(): bool { */ private function verify_nonce( string $nonce_name, string $action ): bool { if ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( wp_unslash( $_REQUEST[ $nonce_name ] ), $action ) ) { - wp_die( __( 'Security check failed.', 'graphql-webhooks' ) ); + wp_die( __( 'Security check failed.', 'wpgraphql-webhooks' ) ); return false; } return true; @@ -182,7 +182,7 @@ private function verify_nonce( string $nonce_name, string $action ): bool { */ public function handle_webhook_save() { if ( ! $this->verify_admin_permission() || ! $this->verify_nonce( 'webhook_nonce', 'webhook_save' ) ) { - wp_die( __( 'Unauthorized', 'graphql-webhooks' ) ); + wp_die( __( 'Unauthorized', 'wpgraphql-webhooks' ) ); } $webhook_id = isset( $_POST['webhook_id'] ) ? intval( $_POST['webhook_id'] ) : 0; @@ -251,7 +251,7 @@ private function handle_webhook_delete(): void { // Verify nonce if ( ! wp_verify_nonce( $nonce, 'delete-webhook-' . $webhook_id ) ) { - wp_die( __( 'Security check failed.', 'graphql-webhooks' ) ); + wp_die( __( 'Security check failed.', 'wpgraphql-webhooks' ) ); } // Delete webhook @@ -300,8 +300,8 @@ private function render_list_page() { */ private function render_form_page( $action ) { $webhook = null; - $form_title = 'add' === $action ? __( 'Add New Webhook', 'graphql-webhooks' ) : __( 'Edit Webhook', 'graphql-webhooks' ); - $submit_text = 'add' === $action ? __( 'Add Webhook', 'graphql-webhooks' ) : __( 'Update Webhook', 'graphql-webhooks' ); + $form_title = 'add' === $action ? __( 'Add New Webhook', 'wpgraphql-webhooks' ) : __( 'Edit Webhook', 'wpgraphql-webhooks' ); + $submit_text = 'add' === $action ? __( 'Add Webhook', 'wpgraphql-webhooks' ) : __( 'Update Webhook', 'wpgraphql-webhooks' ); $name = ''; $event = ''; @@ -314,7 +314,7 @@ private function render_form_page( $action ) { $webhook = $this->repository->get( $webhook_id ); if ( ! $webhook ) { - wp_die( __( 'Webhook not found.', 'graphql-webhooks' ) ); + wp_die( __( 'Webhook not found.', 'wpgraphql-webhooks' ) ); } $name = $webhook->name; @@ -365,14 +365,14 @@ private function sanitize_headers( array $headers ): array { public function ajax_test_webhook(): void { if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'wp_rest' ) ) { wp_send_json_error( [ - 'message' => __( 'Invalid security token.', 'graphql-webhooks' ), + 'message' => __( 'Invalid security token.', 'wpgraphql-webhooks' ), 'error_code' => 'invalid_nonce' ] ); } if ( ! $this->verify_admin_permission() ) { wp_send_json_error( [ - 'message' => __( 'You do not have permission to test webhooks.', 'graphql-webhooks' ), + 'message' => __( 'You do not have permission to test webhooks.', 'wpgraphql-webhooks' ), 'error_code' => 'insufficient_permissions' ] ); } @@ -380,7 +380,7 @@ public function ajax_test_webhook(): void { $webhook_id = isset( $_POST['webhook_id'] ) ? intval( $_POST['webhook_id'] ) : 0; if ( ! $webhook_id ) { wp_send_json_error( [ - 'message' => __( 'Invalid webhook ID.', 'graphql-webhooks' ), + 'message' => __( 'Invalid webhook ID.', 'wpgraphql-webhooks' ), 'error_code' => 'invalid_webhook_id' ] ); } @@ -388,7 +388,7 @@ public function ajax_test_webhook(): void { $webhook = $this->repository->get( $webhook_id ); if ( ! $webhook ) { wp_send_json_error( [ - 'message' => __( 'Webhook not found.', 'graphql-webhooks' ), + 'message' => __( 'Webhook not found.', 'wpgraphql-webhooks' ), 'error_code' => 'webhook_not_found' ] ); } @@ -434,7 +434,7 @@ public function ajax_test_webhook(): void { if ( is_wp_error( $response ) ) { wp_send_json_error( [ 'message' => sprintf( - __( 'Failed to send test webhook: %s', 'graphql-webhooks' ), + __( 'Failed to send test webhook: %s', 'wpgraphql-webhooks' ), $response->get_error_message() ), 'error_code' => $response->get_error_code(), @@ -450,8 +450,8 @@ public function ajax_test_webhook(): void { $response_data = [ 'success' => $is_success, 'message' => $is_success - ? sprintf( __( 'Test webhook sent successfully to %s', 'graphql-webhooks' ), $webhook->url ) - : sprintf( __( 'Webhook returned HTTP %d', 'graphql-webhooks' ), $response_code ), + ? sprintf( __( 'Test webhook sent successfully to %s', 'wpgraphql-webhooks' ), $webhook->url ) + : sprintf( __( 'Webhook returned HTTP %d', 'wpgraphql-webhooks' ), $response_code ), 'webhook_id' => $webhook->id, 'webhook_name' => $webhook->name, 'target_url' => $webhook->url, diff --git a/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php b/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php index 62843bdf..9512324b 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php +++ b/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php @@ -35,8 +35,8 @@ public function __construct( WebhookRepository $repository ) { $this->repository = $repository; parent::__construct( [ - 'singular' => __( 'Webhook', 'graphql-webhooks' ), - 'plural' => __( 'Webhooks', 'graphql-webhooks' ), + 'singular' => __( 'Webhook', 'wpgraphql-webhooks' ), + 'plural' => __( 'Webhooks', 'wpgraphql-webhooks' ), 'ajax' => false, ] ); } @@ -49,11 +49,11 @@ public function __construct( WebhookRepository $repository ) { public function get_columns() { return [ 'cb' => '', - 'name' => __( 'Name', 'graphql-webhooks' ), - 'event' => __( 'Event', 'graphql-webhooks' ), - 'method' => __( 'Method', 'graphql-webhooks' ), - 'url' => __( 'URL', 'graphql-webhooks' ), - 'headers' => __( 'Headers', 'graphql-webhooks' ), + 'name' => __( 'Name', 'wpgraphql-webhooks' ), + 'event' => __( 'Event', 'wpgraphql-webhooks' ), + 'method' => __( 'Method', 'wpgraphql-webhooks' ), + 'url' => __( 'URL', 'wpgraphql-webhooks' ), + 'headers' => __( 'Headers', 'wpgraphql-webhooks' ), ]; } @@ -77,7 +77,7 @@ public function get_sortable_columns() { */ public function get_bulk_actions() { return [ - 'delete' => __( 'Delete', 'graphql-webhooks' ), + 'delete' => __( 'Delete', 'wpgraphql-webhooks' ), ]; } @@ -93,12 +93,12 @@ public function process_bulk_action() { // Verify nonce if ( ! isset( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( wp_unslash( $_REQUEST['_wpnonce'] ), 'bulk-' . $this->_args['plural'] ) ) { - wp_die( esc_html__( 'Security check failed.', 'graphql-webhooks' ) ); + wp_die( esc_html__( 'Security check failed.', 'wpgraphql-webhooks' ) ); } // Check permissions if ( ! current_user_can( 'manage_options' ) ) { - wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'graphql-webhooks' ) ); + wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wpgraphql-webhooks' ) ); } // Get selected webhooks @@ -194,7 +194,7 @@ public function column_default( $item, $column_name ) { return '' . esc_html( $item->method ) . ''; case 'headers': $count = is_array( $item->headers ) ? count( $item->headers ) : 0; - return $count > 0 ? sprintf( __( '%d headers', 'graphql-webhooks' ), $count ) : '—'; + return $count > 0 ? sprintf( __( '%d headers', 'wpgraphql-webhooks' ), $count ) : '—'; default: return ''; } @@ -236,9 +236,9 @@ public function column_name( $item ) { ); $actions = [ - 'edit' => sprintf( '%s', esc_url( $edit_url ), __( 'Edit', 'graphql-webhooks' ) ), - 'test' => sprintf( '%s', $item->id, __( 'Test', 'graphql-webhooks' ) ), - 'delete' => sprintf( '%s', esc_url( $delete_url ), __( 'Delete', 'graphql-webhooks' ) ), + 'edit' => sprintf( '%s', esc_url( $edit_url ), __( 'Edit', 'wpgraphql-webhooks' ) ), + 'test' => sprintf( '%s', $item->id, __( 'Test', 'wpgraphql-webhooks' ) ), + 'delete' => sprintf( '%s', esc_url( $delete_url ), __( 'Delete', 'wpgraphql-webhooks' ) ), ]; return sprintf( @@ -253,7 +253,7 @@ public function column_name( $item ) { * Display when no items */ public function no_items() { - esc_html_e( 'No webhooks found.', 'graphql-webhooks' ); + esc_html_e( 'No webhooks found.', 'wpgraphql-webhooks' ); } /** diff --git a/plugins/wpgraphql-webhooks/src/Admin/views/partials/webhook-header-row.php b/plugins/wpgraphql-webhooks/src/Admin/views/partials/webhook-header-row.php index 6bfe4fb8..1e60ccc6 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/views/partials/webhook-header-row.php +++ b/plugins/wpgraphql-webhooks/src/Admin/views/partials/webhook-header-row.php @@ -20,14 +20,14 @@ diff --git a/plugins/wpgraphql-webhooks/src/Admin/views/webhook-form.php b/plugins/wpgraphql-webhooks/src/Admin/views/webhook-form.php index 78fa2959..eeb69696 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/views/webhook-form.php +++ b/plugins/wpgraphql-webhooks/src/Admin/views/webhook-form.php @@ -39,44 +39,44 @@ - + -

+

- + -

+

- + -

+

- + - +

diff --git a/plugins/wpgraphql-webhooks/src/Admin/views/webhooks-list.php b/plugins/wpgraphql-webhooks/src/Admin/views/webhooks-list.php index d640dc75..fabc4ad2 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/views/webhooks-list.php +++ b/plugins/wpgraphql-webhooks/src/Admin/views/webhooks-list.php @@ -13,9 +13,9 @@ ?>
-

+

- +
@@ -29,7 +29,7 @@ @@ -41,7 +41,7 @@ if ( isset( $_GET['added'] ) ) { ?>
-

+

-

+

[ 'list_of' => 'Webhook' ], - 'description' => __( 'List all registered webhooks.', 'graphql-webhooks' ), + 'description' => __( 'List all registered webhooks.', 'wpgraphql-webhooks' ), 'resolve' => function() { $query = new \WP_Query([ 'post_type' => 'graphql_webhook', @@ -40,11 +40,11 @@ public static function register(): void { // Register the "webhook" field (fetch single webhook by ID) register_graphql_field( 'RootQuery', 'webhook', [ 'type' => 'Webhook', - 'description' => __( 'Fetch a webhook by ID.', 'graphql-webhooks' ), + 'description' => __( 'Fetch a webhook by ID.', 'wpgraphql-webhooks' ), 'args' => [ 'id' => [ 'type' => Type::nonNull( Type::id() ), - 'description' => __( 'The global ID of the webhook to retrieve.', 'graphql-webhooks' ), + 'description' => __( 'The global ID of the webhook to retrieve.', 'wpgraphql-webhooks' ), ], ], 'resolve' => function( $root, $args ) { diff --git a/plugins/wpgraphql-webhooks/src/Mutation/CreateWebhook.php b/plugins/wpgraphql-webhooks/src/Mutation/CreateWebhook.php index 29c0da2c..a6c8464a 100644 --- a/plugins/wpgraphql-webhooks/src/Mutation/CreateWebhook.php +++ b/plugins/wpgraphql-webhooks/src/Mutation/CreateWebhook.php @@ -26,42 +26,42 @@ public static function register(): void { 'inputFields' => [ 'title' => [ 'type' => 'String', - 'description' => __( 'The title of the webhook', 'graphql-webhooks' ), + 'description' => __( 'The title of the webhook', 'wpgraphql-webhooks' ), ], 'content' => [ 'type' => 'String', - 'description' => __( 'The content/description of the webhook', 'graphql-webhooks' ), + 'description' => __( 'The content/description of the webhook', 'wpgraphql-webhooks' ), ], 'eventTrigger' => [ 'type' => 'String', - 'description' => __( 'The event hook name that triggers this webhook', 'graphql-webhooks' ), + 'description' => __( 'The event hook name that triggers this webhook', 'wpgraphql-webhooks' ), ], 'enabled' => [ 'type' => 'Boolean', - 'description' => __( 'Whether the webhook is enabled', 'graphql-webhooks' ), + 'description' => __( 'Whether the webhook is enabled', 'wpgraphql-webhooks' ), ], 'security' => [ 'type' => 'String', - 'description' => __( 'Security information for the webhook', 'graphql-webhooks' ), + 'description' => __( 'Security information for the webhook', 'wpgraphql-webhooks' ), ], 'handlerClass' => [ 'type' => 'String', - 'description' => __( 'The handler class used for dispatching', 'graphql-webhooks' ), + 'description' => __( 'The handler class used for dispatching', 'wpgraphql-webhooks' ), ], 'handlerConfig' => [ 'type' => 'String', - 'description' => __( 'Configuration for the handler, JSON encoded', 'graphql-webhooks' ), + 'description' => __( 'Configuration for the handler, JSON encoded', 'wpgraphql-webhooks' ), ], 'status' => [ 'type' => 'String', - 'description' => __( 'Post status, e.g. PUBLISH or DRAFT', 'graphql-webhooks' ), + 'description' => __( 'Post status, e.g. PUBLISH or DRAFT', 'wpgraphql-webhooks' ), 'defaultValue' => 'publish', ], ], 'outputFields' => [ 'webhook' => [ 'type' => 'Webhook', - 'description' => __( 'The created webhook', 'graphql-webhooks' ), + 'description' => __( 'The created webhook', 'wpgraphql-webhooks' ), 'resolve' => function ($payload) { return get_post( $payload['webhookId'] ); }, @@ -70,7 +70,7 @@ public static function register(): void { 'mutateAndGetPayload' => function ($input, $context, $info) { // Check user capabilities if ( ! current_user_can( 'manage_options' ) ) { - throw new UserError( __( 'You do not have permission to create webhooks.', 'graphql-webhooks' ) ); + throw new UserError( __( 'You do not have permission to create webhooks.', 'wpgraphql-webhooks' ) ); } // Prepare post data @@ -83,7 +83,7 @@ public static function register(): void { $post_id = wp_insert_post( $post_data ); if ( is_wp_error( $post_id ) ) { - throw new UserError( __( 'Failed to create webhook.', 'graphql-webhooks' ) ); + throw new UserError( __( 'Failed to create webhook.', 'wpgraphql-webhooks' ) ); } if ( isset( $input['eventTrigger'] ) ) { update_post_meta( $post_id, '_event_trigger', sanitize_text_field( $input['eventTrigger'] ) ); diff --git a/plugins/wpgraphql-webhooks/src/Mutation/DeleteWebhook.php b/plugins/wpgraphql-webhooks/src/Mutation/DeleteWebhook.php index f41a26ac..8e700885 100644 --- a/plugins/wpgraphql-webhooks/src/Mutation/DeleteWebhook.php +++ b/plugins/wpgraphql-webhooks/src/Mutation/DeleteWebhook.php @@ -26,20 +26,20 @@ public static function register(): void { 'inputFields' => [ 'id' => [ 'type' => 'ID', - 'description' => __( 'The ID of the webhook to delete', 'graphql-webhooks' ), + 'description' => __( 'The ID of the webhook to delete', 'wpgraphql-webhooks' ), ], ], 'outputFields' => [ 'deletedWebhookId' => [ 'type' => 'ID', - 'description' => __( 'The ID of the deleted webhook', 'graphql-webhooks' ), + 'description' => __( 'The ID of the deleted webhook', 'wpgraphql-webhooks' ), 'resolve' => function ($payload) { return $payload['deletedWebhookId'] ?? null; }, ], 'success' => [ 'type' => 'Boolean', - 'description' => __( 'Whether the webhook was successfully deleted', 'graphql-webhooks' ), + 'description' => __( 'Whether the webhook was successfully deleted', 'wpgraphql-webhooks' ), 'resolve' => function ($payload) { return $payload['success'] ?? false; }, @@ -48,27 +48,27 @@ public static function register(): void { 'mutateAndGetPayload' => function ($input, $context, $info) { // Capability check if ( ! current_user_can( 'manage_options' ) ) { - throw new UserError( __( 'You do not have permission to delete webhooks.', 'graphql-webhooks' ) ); + throw new UserError( __( 'You do not have permission to delete webhooks.', 'wpgraphql-webhooks' ) ); } if ( empty( $input['id'] ) ) { - throw new UserError( __( 'The ID of the webhook to delete is required.', 'graphql-webhooks' ) ); + throw new UserError( __( 'The ID of the webhook to delete is required.', 'wpgraphql-webhooks' ) ); } $post_id = is_numeric( $input['id'] ) ? (int) $input['id'] : 0; if ( $post_id <= 0 ) { - throw new UserError( __( 'Invalid webhook ID.', 'graphql-webhooks' ) ); + throw new UserError( __( 'Invalid webhook ID.', 'wpgraphql-webhooks' ) ); } $post = get_post( $post_id ); if ( ! $post || $post->post_type !== 'graphql_webhook' ) { - throw new UserError( __( 'Webhook not found.', 'graphql-webhooks' ) ); + throw new UserError( __( 'Webhook not found.', 'wpgraphql-webhooks' ) ); } // Delete the post (force delete to bypass trash) $deleted = wp_delete_post( $post_id, true ); if ( ! $deleted ) { - throw new UserError( __( 'Failed to delete webhook.', 'graphql-webhooks' ) ); + throw new UserError( __( 'Failed to delete webhook.', 'wpgraphql-webhooks' ) ); } return [ diff --git a/plugins/wpgraphql-webhooks/src/Mutation/UpdateWebhook.php b/plugins/wpgraphql-webhooks/src/Mutation/UpdateWebhook.php index a04dd7ab..9c9b0ef5 100644 --- a/plugins/wpgraphql-webhooks/src/Mutation/UpdateWebhook.php +++ b/plugins/wpgraphql-webhooks/src/Mutation/UpdateWebhook.php @@ -26,45 +26,45 @@ public static function register(): void { 'inputFields' => [ 'id' => [ 'type' => 'ID', - 'description' => __('The ID of the webhook to update', 'graphql-webhooks'), + 'description' => __('The ID of the webhook to update', 'wpgraphql-webhooks'), ], 'title' => [ 'type' => 'String', - 'description' => __('The new title of the webhook', 'graphql-webhooks'), + 'description' => __('The new title of the webhook', 'wpgraphql-webhooks'), ], 'content' => [ 'type' => 'String', - 'description' => __('The new content/description of the webhook', 'graphql-webhooks'), + 'description' => __('The new content/description of the webhook', 'wpgraphql-webhooks'), ], 'eventTrigger' => [ 'type' => 'String', - 'description' => __('The new event hook name that triggers this webhook', 'graphql-webhooks'), + 'description' => __('The new event hook name that triggers this webhook', 'wpgraphql-webhooks'), ], 'enabled' => [ 'type' => 'Boolean', - 'description' => __('Whether the webhook is enabled', 'graphql-webhooks'), + 'description' => __('Whether the webhook is enabled', 'wpgraphql-webhooks'), ], 'security' => [ 'type' => 'String', - 'description' => __('Security information for the webhook', 'graphql-webhooks'), + 'description' => __('Security information for the webhook', 'wpgraphql-webhooks'), ], 'handlerClass' => [ 'type' => 'String', - 'description' => __('The handler class used for dispatching', 'graphql-webhooks'), + 'description' => __('The handler class used for dispatching', 'wpgraphql-webhooks'), ], 'handlerConfig' => [ 'type' => 'String', - 'description' => __('Configuration for the handler, JSON encoded', 'graphql-webhooks'), + 'description' => __('Configuration for the handler, JSON encoded', 'wpgraphql-webhooks'), ], 'status' => [ 'type' => 'String', - 'description' => __('Post status, e.g. PUBLISH or DRAFT', 'graphql-webhooks'), + 'description' => __('Post status, e.g. PUBLISH or DRAFT', 'wpgraphql-webhooks'), ], ], 'outputFields' => [ 'webhook' => [ 'type' => 'Webhook', - 'description' => __('The updated webhook', 'graphql-webhooks'), + 'description' => __('The updated webhook', 'wpgraphql-webhooks'), 'resolve' => function ($payload) { return get_post($payload['webhookId']); }, @@ -72,22 +72,22 @@ public static function register(): void { ], 'mutateAndGetPayload' => function ($input, $context, $info) { if (!current_user_can('manage_options')) { - throw new UserError(__('You do not have permission to update webhooks.', 'graphql-webhooks')); + throw new UserError(__('You do not have permission to update webhooks.', 'wpgraphql-webhooks')); } if (empty($input['id'])) { - throw new UserError(__('The ID of the webhook to update is required.', 'graphql-webhooks')); + throw new UserError(__('The ID of the webhook to update is required.', 'wpgraphql-webhooks')); } $post_id = is_numeric($input['id']) ? (int) $input['id'] : 0; if ($post_id <= 0) { - throw new UserError(__('Invalid webhook ID.', 'graphql-webhooks')); + throw new UserError(__('Invalid webhook ID.', 'wpgraphql-webhooks')); } $post = get_post($post_id); if (!$post || $post->post_type !== 'graphql_webhook') { - throw new UserError(__('Webhook not found.', 'graphql-webhooks')); + throw new UserError(__('Webhook not found.', 'wpgraphql-webhooks')); } $post_data = ['ID' => $post_id]; @@ -102,7 +102,7 @@ public static function register(): void { } $updated_post_id = wp_update_post($post_data, true); if (is_wp_error($updated_post_id)) { - throw new UserError(__('Failed to update webhook.', 'graphql-webhooks')); + throw new UserError(__('Failed to update webhook.', 'wpgraphql-webhooks')); } if (isset($input['eventTrigger'])) { diff --git a/plugins/wpgraphql-webhooks/src/PostTypes/WebhookPostType.php b/plugins/wpgraphql-webhooks/src/PostTypes/WebhookPostType.php index 248f4f11..bd9fdb74 100644 --- a/plugins/wpgraphql-webhooks/src/PostTypes/WebhookPostType.php +++ b/plugins/wpgraphql-webhooks/src/PostTypes/WebhookPostType.php @@ -24,18 +24,18 @@ public static function init(): void { */ public static function register_webhook_cpt(): void { $labels = [ - 'name' => __( 'Webhooks', 'graphql-webhooks' ), - 'singular_name' => __( 'Webhook', 'graphql-webhooks' ), - 'add_new' => __( 'Add New', 'graphql-webhooks' ), - 'add_new_item' => __( 'Add New Webhook', 'graphql-webhooks' ), - 'edit_item' => __( 'Edit Webhook', 'graphql-webhooks' ), - 'new_item' => __( 'New Webhook', 'graphql-webhooks' ), - 'view_item' => __( 'View Webhook', 'graphql-webhooks' ), - 'search_items' => __( 'Search Webhooks', 'graphql-webhooks' ), - 'not_found' => __( 'No Webhooks found', 'graphql-webhooks' ), - 'not_found_in_trash' => __( 'No Webhooks found in Trash', 'graphql-webhooks' ), - 'parent_item_colon' => __( 'Parent Webhook:', 'graphql-webhooks' ), - 'menu_name' => __( 'Webhooks', 'graphql-webhooks' ), + 'name' => __( 'Webhooks', 'wpgraphql-webhooks' ), + 'singular_name' => __( 'Webhook', 'wpgraphql-webhooks' ), + 'add_new' => __( 'Add New', 'wpgraphql-webhooks' ), + 'add_new_item' => __( 'Add New Webhook', 'wpgraphql-webhooks' ), + 'edit_item' => __( 'Edit Webhook', 'wpgraphql-webhooks' ), + 'new_item' => __( 'New Webhook', 'wpgraphql-webhooks' ), + 'view_item' => __( 'View Webhook', 'wpgraphql-webhooks' ), + 'search_items' => __( 'Search Webhooks', 'wpgraphql-webhooks' ), + 'not_found' => __( 'No Webhooks found', 'wpgraphql-webhooks' ), + 'not_found_in_trash' => __( 'No Webhooks found in Trash', 'wpgraphql-webhooks' ), + 'parent_item_colon' => __( 'Parent Webhook:', 'wpgraphql-webhooks' ), + 'menu_name' => __( 'Webhooks', 'wpgraphql-webhooks' ), ]; $args = [ 'labels' => $labels, diff --git a/plugins/wpgraphql-webhooks/src/Repository/WebhookRepository.php b/plugins/wpgraphql-webhooks/src/Repository/WebhookRepository.php index bb7c6e24..ffcc3f51 100644 --- a/plugins/wpgraphql-webhooks/src/Repository/WebhookRepository.php +++ b/plugins/wpgraphql-webhooks/src/Repository/WebhookRepository.php @@ -145,7 +145,7 @@ public function create( Webhook $webhook ) { public function update( int $id, Webhook $webhook ) { $post = get_post( $id ); if ( ! $post || $post->post_type !== 'graphql_webhook' ) { - return new WP_Error( 'invalid_webhook', __( 'Webhook not found.', 'graphql-webhooks' ) ); + return new WP_Error( 'invalid_webhook', __( 'Webhook not found.', 'wpgraphql-webhooks' ) ); } // Validate using the Webhook entity diff --git a/plugins/wpgraphql-webhooks/src/Rest/WebhookTestEndpoint.php b/plugins/wpgraphql-webhooks/src/Rest/WebhookTestEndpoint.php index 6f9dc085..e9163d64 100644 --- a/plugins/wpgraphql-webhooks/src/Rest/WebhookTestEndpoint.php +++ b/plugins/wpgraphql-webhooks/src/Rest/WebhookTestEndpoint.php @@ -79,7 +79,7 @@ public function test_webhook( WP_REST_Request $request ): WP_REST_Response|WP_Er if ( ! $webhook ) { return new WP_Error( 'webhook_not_found', - __( 'Webhook not found.', 'graphql-webhooks' ), + __( 'Webhook not found.', 'wpgraphql-webhooks' ), [ 'status' => 404 ] ); } @@ -136,7 +136,7 @@ public function test_webhook( WP_REST_Request $request ): WP_REST_Response|WP_Er return new WP_REST_Response( [ 'success' => true, - 'message' => __( 'Test webhook dispatched successfully.', 'graphql-webhooks' ), + 'message' => __( 'Test webhook dispatched successfully.', 'wpgraphql-webhooks' ), 'details' => [ 'webhook_id' => $webhook_id, 'webhook_name' => $webhook->name, @@ -161,7 +161,7 @@ public function test_webhook( WP_REST_Request $request ): WP_REST_Response|WP_Er 'webhook_test_failed', sprintf( /* translators: %s: error message */ - __( 'Failed to dispatch test webhook: %s', 'graphql-webhooks' ), + __( 'Failed to dispatch test webhook: %s', 'wpgraphql-webhooks' ), $e->getMessage() ), [ 'status' => 500 ] diff --git a/plugins/wpgraphql-webhooks/src/Type/Webhook.php b/plugins/wpgraphql-webhooks/src/Type/Webhook.php index 4076547e..c53a715d 100644 --- a/plugins/wpgraphql-webhooks/src/Type/Webhook.php +++ b/plugins/wpgraphql-webhooks/src/Type/Webhook.php @@ -21,53 +21,53 @@ class Webhook { */ public static function register(): void { register_graphql_object_type( 'Webhook', [ - 'description' => __( 'A Webhook configuration object.', 'graphql-webhooks' ), + 'description' => __( 'A Webhook configuration object.', 'wpgraphql-webhooks' ), 'fields' => [ 'id' => [ 'type' => 'ID', - 'description' => __( 'The global ID of the webhook.', 'graphql-webhooks' ), + 'description' => __( 'The global ID of the webhook.', 'wpgraphql-webhooks' ), 'resolve' => function ($webhook) { return (string) $webhook->ID; }, ], 'eventTrigger' => [ 'type' => 'String', - 'description' => __( 'The event hook name that triggers this webhook.', 'graphql-webhooks' ), + 'description' => __( 'The event hook name that triggers this webhook.', 'wpgraphql-webhooks' ), 'resolve' => function ($webhook) { return get_post_meta( $webhook->ID, '_event_trigger', true ); }, ], 'title' => [ 'type' => 'String', - 'description' => __( 'The title of the webhook.', 'graphql-webhooks' ), + 'description' => __( 'The title of the webhook.', 'wpgraphql-webhooks' ), 'resolve' => function ($webhook) { return get_the_title( $webhook ); }, ], 'enabled' => [ 'type' => 'Boolean', - 'description' => __( 'Whether the webhook is enabled.', 'graphql-webhooks' ), + 'description' => __( 'Whether the webhook is enabled.', 'wpgraphql-webhooks' ), 'resolve' => function ($webhook) { return (bool) get_post_meta( $webhook->ID, '_enabled', true ); }, ], 'security' => [ 'type' => 'String', - 'description' => __( 'Security information for the webhook.', 'graphql-webhooks' ), + 'description' => __( 'Security information for the webhook.', 'wpgraphql-webhooks' ), 'resolve' => function ($webhook) { return get_post_meta( $webhook->ID, '_security', true ); }, ], 'handlerClass' => [ 'type' => 'String', - 'description' => __( 'The handler class used for dispatching.', 'graphql-webhooks' ), + 'description' => __( 'The handler class used for dispatching.', 'wpgraphql-webhooks' ), 'resolve' => function ($webhook) { return get_post_meta( $webhook->ID, '_handler_class', true ); }, ], 'handlerConfig' => [ 'type' => 'String', - 'description' => __( 'Configuration for the handler.', 'graphql-webhooks' ), + 'description' => __( 'Configuration for the handler.', 'wpgraphql-webhooks' ), 'resolve' => function ($webhook) { return get_post_meta( $webhook->ID, '_handler_config', true ); }, diff --git a/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php b/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php index 58573251..c0cfa753 100644 --- a/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php +++ b/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php @@ -8,7 +8,7 @@ * Author URI: https://github.com/wpengine * Update URI: https://github.com/wpengine/hwptoolkit * Version: 0.0.7 - * Text Domain: graphql-webhooks + * Text Domain: wpgraphql-webhooks * Domain Path: /languages * Requires at least: 6.0 * Tested up to: 6.9 @@ -33,7 +33,7 @@ // Define text domain constant to use instead of string literals if ( ! defined( 'WPGRAPHQL_WEBHOOKS_TEXT_DOMAIN' ) ) { - define( 'WPGRAPHQL_WEBHOOKS_TEXT_DOMAIN', 'graphql-webhooks' ); + define( 'WPGRAPHQL_WEBHOOKS_TEXT_DOMAIN', 'wpgraphql-webhooks' ); } // Load the autoloader. @@ -145,7 +145,7 @@ static function () use ($dep) { */ function graphql_webhooks_load_textdomain(): void { load_plugin_textdomain( - 'graphql-webhooks', + 'wpgraphql-webhooks', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' ); From d065d8b9fdce9177788d2c1a9518262245748c09 Mon Sep 17 00:00:00 2001 From: Joe Fusco Date: Fri, 23 Oct 2026 11:42:29 -0400 Subject: [PATCH 2/5] fix(webhooks): use a plain version in the Requires PHP header Plugin Check rejects "7.4+" and flags the mismatch with readme.txt, which says 7.4. --- plugins/wpgraphql-webhooks/wpgraphql-webhooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php b/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php index c0cfa753..c0054c66 100644 --- a/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php +++ b/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php @@ -12,7 +12,7 @@ * Domain Path: /languages * Requires at least: 6.0 * Tested up to: 6.9 - * Requires PHP: 7.4+ + * Requires PHP: 7.4 * Requires Plugins: wp-graphql * WPGraphQL requires at least: 1.8.0 * License: BSD-0-Clause From 54c25e794957393fa34e743c8ea30ff09c91c2ea Mon Sep 17 00:00:00 2001 From: Joe Fusco Date: Fri, 23 Oct 2026 11:42:39 -0400 Subject: [PATCH 3/5] fix(webhooks): block direct access to the files Plugin Check flagged --- plugins/wpgraphql-webhooks/activation.php | 4 ++++ plugins/wpgraphql-webhooks/deactivation.php | 4 ++++ plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php | 4 ++++ plugins/wpgraphql-webhooks/src/Plugin.php | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/plugins/wpgraphql-webhooks/activation.php b/plugins/wpgraphql-webhooks/activation.php index 3ef61bbd..6864f299 100644 --- a/plugins/wpgraphql-webhooks/activation.php +++ b/plugins/wpgraphql-webhooks/activation.php @@ -7,6 +7,10 @@ declare( strict_types = 1 ); +if ( ! defined( 'ABSPATH' ) ) { + exit; +} + /** * Runs when the plugin is activated. * diff --git a/plugins/wpgraphql-webhooks/deactivation.php b/plugins/wpgraphql-webhooks/deactivation.php index 95295bed..2eff3081 100644 --- a/plugins/wpgraphql-webhooks/deactivation.php +++ b/plugins/wpgraphql-webhooks/deactivation.php @@ -8,6 +8,10 @@ * @package WPGraphql\Webhooks */ +if ( ! defined( 'ABSPATH' ) ) { + exit; +} + /** * Runs when WPGraphQL Webhooks is de-activated. * diff --git a/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php b/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php index 9512324b..de508076 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php +++ b/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php @@ -9,6 +9,10 @@ use WPGraphQL\Webhooks\Repository\WebhookRepository; +if ( ! defined( 'ABSPATH' ) ) { + exit; +} + // Include the WP_List_Table class if not already loaded if ( ! class_exists( 'WP_List_Table' ) ) { require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; diff --git a/plugins/wpgraphql-webhooks/src/Plugin.php b/plugins/wpgraphql-webhooks/src/Plugin.php index 1f850771..687abe61 100644 --- a/plugins/wpgraphql-webhooks/src/Plugin.php +++ b/plugins/wpgraphql-webhooks/src/Plugin.php @@ -18,6 +18,10 @@ use WPGraphQL\Webhooks\Services\Interfaces\ServiceLocator; use WPGraphQL\Webhooks\Services\PluginServiceLocator; +if ( ! defined( 'ABSPATH' ) ) { + exit; +} + /** * Plugin singleton class. */ From 53d2d4151de2964483466e63c5fed4dba819e597 Mon Sep 17 00:00:00 2001 From: Joe Fusco Date: Fri, 23 Oct 2026 11:43:25 -0400 Subject: [PATCH 4/5] fix(webhooks): escape admin output and error messages, and add translator comments - Escape wp_die() messages, the deleted-count notice, and GraphQL UserError messages, the same way WPGraphQL core does. - Add translators comments for the placeholder strings, and pluralize the header count. --- .../src/Admin/WebhooksAdmin.php | 17 +++++++++-------- .../src/Admin/WebhooksListTable.php | 2 +- .../src/Admin/views/webhooks-list.php | 10 ++++++---- .../src/Mutation/CreateWebhook.php | 4 ++-- .../src/Mutation/DeleteWebhook.php | 10 +++++----- .../src/Mutation/UpdateWebhook.php | 10 +++++----- 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/plugins/wpgraphql-webhooks/src/Admin/WebhooksAdmin.php b/plugins/wpgraphql-webhooks/src/Admin/WebhooksAdmin.php index 5b643722..2b239572 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/WebhooksAdmin.php +++ b/plugins/wpgraphql-webhooks/src/Admin/WebhooksAdmin.php @@ -154,7 +154,7 @@ private function get_header_row_template(): string { */ private function verify_admin_permission(): bool { if ( ! current_user_can( 'manage_options' ) ) { - wp_die( __( 'You do not have sufficient permissions to access this page.', 'wpgraphql-webhooks' ) ); + wp_die( esc_html__( 'You do not have sufficient permissions to access this page.', 'wpgraphql-webhooks' ) ); return false; } return true; @@ -169,7 +169,7 @@ private function verify_admin_permission(): bool { */ private function verify_nonce( string $nonce_name, string $action ): bool { if ( ! isset( $_REQUEST[ $nonce_name ] ) || ! wp_verify_nonce( wp_unslash( $_REQUEST[ $nonce_name ] ), $action ) ) { - wp_die( __( 'Security check failed.', 'wpgraphql-webhooks' ) ); + wp_die( esc_html__( 'Security check failed.', 'wpgraphql-webhooks' ) ); return false; } return true; @@ -182,7 +182,7 @@ private function verify_nonce( string $nonce_name, string $action ): bool { */ public function handle_webhook_save() { if ( ! $this->verify_admin_permission() || ! $this->verify_nonce( 'webhook_nonce', 'webhook_save' ) ) { - wp_die( __( 'Unauthorized', 'wpgraphql-webhooks' ) ); + wp_die( esc_html__( 'Unauthorized', 'wpgraphql-webhooks' ) ); } $webhook_id = isset( $_POST['webhook_id'] ) ? intval( $_POST['webhook_id'] ) : 0; @@ -197,7 +197,7 @@ public function handle_webhook_save() { $validation = $this->repository->validate( $webhook ); if ( is_wp_error( $validation ) ) { - wp_die( $validation->get_error_message() ); + wp_die( esc_html( $validation->get_error_message() ) ); } if ( $webhook_id > 0 ) { @@ -251,7 +251,7 @@ private function handle_webhook_delete(): void { // Verify nonce if ( ! wp_verify_nonce( $nonce, 'delete-webhook-' . $webhook_id ) ) { - wp_die( __( 'Security check failed.', 'wpgraphql-webhooks' ) ); + wp_die( esc_html__( 'Security check failed.', 'wpgraphql-webhooks' ) ); } // Delete webhook @@ -314,7 +314,7 @@ private function render_form_page( $action ) { $webhook = $this->repository->get( $webhook_id ); if ( ! $webhook ) { - wp_die( __( 'Webhook not found.', 'wpgraphql-webhooks' ) ); + wp_die( esc_html__( 'Webhook not found.', 'wpgraphql-webhooks' ) ); } $name = $webhook->name; @@ -434,6 +434,7 @@ public function ajax_test_webhook(): void { if ( is_wp_error( $response ) ) { wp_send_json_error( [ 'message' => sprintf( + /* translators: %s: error message from the failed request */ __( 'Failed to send test webhook: %s', 'wpgraphql-webhooks' ), $response->get_error_message() ), @@ -450,8 +451,8 @@ public function ajax_test_webhook(): void { $response_data = [ 'success' => $is_success, 'message' => $is_success - ? sprintf( __( 'Test webhook sent successfully to %s', 'wpgraphql-webhooks' ), $webhook->url ) - : sprintf( __( 'Webhook returned HTTP %d', 'wpgraphql-webhooks' ), $response_code ), + ? sprintf( /* translators: %s: webhook URL */ __( 'Test webhook sent successfully to %s', 'wpgraphql-webhooks' ), $webhook->url ) + : sprintf( /* translators: %d: HTTP status code */ __( 'Webhook returned HTTP %d', 'wpgraphql-webhooks' ), $response_code ), 'webhook_id' => $webhook->id, 'webhook_name' => $webhook->name, 'target_url' => $webhook->url, diff --git a/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php b/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php index de508076..8e5f6866 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php +++ b/plugins/wpgraphql-webhooks/src/Admin/WebhooksListTable.php @@ -198,7 +198,7 @@ public function column_default( $item, $column_name ) { return '' . esc_html( $item->method ) . ''; case 'headers': $count = is_array( $item->headers ) ? count( $item->headers ) : 0; - return $count > 0 ? sprintf( __( '%d headers', 'wpgraphql-webhooks' ), $count ) : '—'; + return $count > 0 ? sprintf( /* translators: %d: number of headers */ _n( '%d header', '%d headers', $count, 'wpgraphql-webhooks' ), $count ) : '—'; default: return ''; } diff --git a/plugins/wpgraphql-webhooks/src/Admin/views/webhooks-list.php b/plugins/wpgraphql-webhooks/src/Admin/views/webhooks-list.php index fabc4ad2..7dad1e67 100644 --- a/plugins/wpgraphql-webhooks/src/Admin/views/webhooks-list.php +++ b/plugins/wpgraphql-webhooks/src/Admin/views/webhooks-list.php @@ -27,10 +27,12 @@

diff --git a/plugins/wpgraphql-webhooks/src/Mutation/CreateWebhook.php b/plugins/wpgraphql-webhooks/src/Mutation/CreateWebhook.php index a6c8464a..371346a3 100644 --- a/plugins/wpgraphql-webhooks/src/Mutation/CreateWebhook.php +++ b/plugins/wpgraphql-webhooks/src/Mutation/CreateWebhook.php @@ -70,7 +70,7 @@ public static function register(): void { 'mutateAndGetPayload' => function ($input, $context, $info) { // Check user capabilities if ( ! current_user_can( 'manage_options' ) ) { - throw new UserError( __( 'You do not have permission to create webhooks.', 'wpgraphql-webhooks' ) ); + throw new UserError( esc_html__( 'You do not have permission to create webhooks.', 'wpgraphql-webhooks' ) ); } // Prepare post data @@ -83,7 +83,7 @@ public static function register(): void { $post_id = wp_insert_post( $post_data ); if ( is_wp_error( $post_id ) ) { - throw new UserError( __( 'Failed to create webhook.', 'wpgraphql-webhooks' ) ); + throw new UserError( esc_html__( 'Failed to create webhook.', 'wpgraphql-webhooks' ) ); } if ( isset( $input['eventTrigger'] ) ) { update_post_meta( $post_id, '_event_trigger', sanitize_text_field( $input['eventTrigger'] ) ); diff --git a/plugins/wpgraphql-webhooks/src/Mutation/DeleteWebhook.php b/plugins/wpgraphql-webhooks/src/Mutation/DeleteWebhook.php index 8e700885..70809049 100644 --- a/plugins/wpgraphql-webhooks/src/Mutation/DeleteWebhook.php +++ b/plugins/wpgraphql-webhooks/src/Mutation/DeleteWebhook.php @@ -48,27 +48,27 @@ public static function register(): void { 'mutateAndGetPayload' => function ($input, $context, $info) { // Capability check if ( ! current_user_can( 'manage_options' ) ) { - throw new UserError( __( 'You do not have permission to delete webhooks.', 'wpgraphql-webhooks' ) ); + throw new UserError( esc_html__( 'You do not have permission to delete webhooks.', 'wpgraphql-webhooks' ) ); } if ( empty( $input['id'] ) ) { - throw new UserError( __( 'The ID of the webhook to delete is required.', 'wpgraphql-webhooks' ) ); + throw new UserError( esc_html__( 'The ID of the webhook to delete is required.', 'wpgraphql-webhooks' ) ); } $post_id = is_numeric( $input['id'] ) ? (int) $input['id'] : 0; if ( $post_id <= 0 ) { - throw new UserError( __( 'Invalid webhook ID.', 'wpgraphql-webhooks' ) ); + throw new UserError( esc_html__( 'Invalid webhook ID.', 'wpgraphql-webhooks' ) ); } $post = get_post( $post_id ); if ( ! $post || $post->post_type !== 'graphql_webhook' ) { - throw new UserError( __( 'Webhook not found.', 'wpgraphql-webhooks' ) ); + throw new UserError( esc_html__( 'Webhook not found.', 'wpgraphql-webhooks' ) ); } // Delete the post (force delete to bypass trash) $deleted = wp_delete_post( $post_id, true ); if ( ! $deleted ) { - throw new UserError( __( 'Failed to delete webhook.', 'wpgraphql-webhooks' ) ); + throw new UserError( esc_html__( 'Failed to delete webhook.', 'wpgraphql-webhooks' ) ); } return [ diff --git a/plugins/wpgraphql-webhooks/src/Mutation/UpdateWebhook.php b/plugins/wpgraphql-webhooks/src/Mutation/UpdateWebhook.php index 9c9b0ef5..cb10cea3 100644 --- a/plugins/wpgraphql-webhooks/src/Mutation/UpdateWebhook.php +++ b/plugins/wpgraphql-webhooks/src/Mutation/UpdateWebhook.php @@ -72,22 +72,22 @@ public static function register(): void { ], 'mutateAndGetPayload' => function ($input, $context, $info) { if (!current_user_can('manage_options')) { - throw new UserError(__('You do not have permission to update webhooks.', 'wpgraphql-webhooks')); + throw new UserError(esc_html__('You do not have permission to update webhooks.', 'wpgraphql-webhooks')); } if (empty($input['id'])) { - throw new UserError(__('The ID of the webhook to update is required.', 'wpgraphql-webhooks')); + throw new UserError(esc_html__('The ID of the webhook to update is required.', 'wpgraphql-webhooks')); } $post_id = is_numeric($input['id']) ? (int) $input['id'] : 0; if ($post_id <= 0) { - throw new UserError(__('Invalid webhook ID.', 'wpgraphql-webhooks')); + throw new UserError(esc_html__('Invalid webhook ID.', 'wpgraphql-webhooks')); } $post = get_post($post_id); if (!$post || $post->post_type !== 'graphql_webhook') { - throw new UserError(__('Webhook not found.', 'wpgraphql-webhooks')); + throw new UserError(esc_html__('Webhook not found.', 'wpgraphql-webhooks')); } $post_data = ['ID' => $post_id]; @@ -102,7 +102,7 @@ public static function register(): void { } $updated_post_id = wp_update_post($post_data, true); if (is_wp_error($updated_post_id)) { - throw new UserError(__('Failed to update webhook.', 'wpgraphql-webhooks')); + throw new UserError(esc_html__('Failed to update webhook.', 'wpgraphql-webhooks')); } if (isset($input['eventTrigger'])) { From 7741a7c0e21ac2ecd675304318f5927111acfa32 Mon Sep 17 00:00:00 2001 From: Joe Fusco Date: Fri, 23 Oct 2026 21:39:46 -0400 Subject: [PATCH 5/5] fix(webhooks): license the plugin under GPL-2.0-or-later The plugin header said BSD-0-Clause (linking to BSD-3-Clause), readme.txt said GPL-3, and composer.json said GPL-2.0. All three now say GPL-2.0-or-later, like the other plugins, and the plugin ships the GPL-2 LICENSE file they use. --- plugins/wpgraphql-webhooks/LICENSE | 339 ++++++++++++++++++ plugins/wpgraphql-webhooks/composer.json | 2 +- plugins/wpgraphql-webhooks/readme.txt | 4 +- .../wpgraphql-webhooks/wpgraphql-webhooks.php | 4 +- 4 files changed, 344 insertions(+), 5 deletions(-) create mode 100644 plugins/wpgraphql-webhooks/LICENSE diff --git a/plugins/wpgraphql-webhooks/LICENSE b/plugins/wpgraphql-webhooks/LICENSE new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/plugins/wpgraphql-webhooks/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/plugins/wpgraphql-webhooks/composer.json b/plugins/wpgraphql-webhooks/composer.json index c50613d8..894062ae 100644 --- a/plugins/wpgraphql-webhooks/composer.json +++ b/plugins/wpgraphql-webhooks/composer.json @@ -2,7 +2,7 @@ "name": "wpengine/wpgraphql-webhooks", "description": "Headless webhooks for WPGraphQL", "type": "library", - "license": "GPL-2.0", + "license": "GPL-2.0-or-later", "version": "0.0.7", "authors": [ { diff --git a/plugins/wpgraphql-webhooks/readme.txt b/plugins/wpgraphql-webhooks/readme.txt index 50d59ebc..126c6024 100644 --- a/plugins/wpgraphql-webhooks/readme.txt +++ b/plugins/wpgraphql-webhooks/readme.txt @@ -6,8 +6,8 @@ Tested up to: 6.9 Requires PHP: 7.4 Requires WPGraphQL: 1.8.0 Stable tag: 0.0.7 -License: GPL-3 -License URI: https://www.gnu.org/licenses/gpl-3.0.html +License: GPLv2 or later +License URI: https://www.gnu.org/licenses/gpl-2.0.html == Description == == Upgrade Notice == diff --git a/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php b/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php index c0054c66..fa3b83df 100644 --- a/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php +++ b/plugins/wpgraphql-webhooks/wpgraphql-webhooks.php @@ -15,8 +15,8 @@ * Requires PHP: 7.4 * Requires Plugins: wp-graphql * WPGraphQL requires at least: 1.8.0 - * License: BSD-0-Clause - * License URI: https://opensource.org/licenses/BSD-3-Clause + * License: GPLv2 or later + * License URI: https://www.gnu.org/licenses/gpl-2.0.html * * @package WPGraphQL\Webhooks */