| @@ -397,8 +397,14 @@ | ||
| 397 | 397 | if( ! $request->has_param('type') ) { |
| 398 | 398 | return $this->error( 'type' ); |
| 399 | 399 | } |
| 400 | 400 | |
| 401 | + // Country targeting search is available for every notification type, | |
| 402 | + // so route it by field regardless of the type/source. | |
| 403 | + if ( ! empty( $params['field'] ) && $params['field'] === 'country_targeting' ) { | |
| 404 | + return Targeting::restResponse( $request->get_json_params() ); | |
| 405 | + } | |
| 406 | + | |
| 401 | 407 | switch( $params['type'] ) { |
| 402 | 408 | case 'ContactForm' : |
| 403 | 409 | return ContactForm::restResponse( $request->get_json_params() ); |
| 404 | 410 | break; |
| @@ -458,8 +464,9 @@ | ||
| 458 | 464 | */ |
| 459 | 465 | public function miscellaneous($request) { |
| 460 | 466 | $params = $request->get_params(); |
| 461 | 467 | |
| 468 | + // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- Reviewed for the NotificationX codebase: acceptable in this context. | |
| 462 | 469 | $result = apply_filters('nx_rest_miscellaneous', null, $params); |
| 463 | 470 | if($result !== null){ |
| 464 | 471 | return rest_ensure_response([ |
| 465 | 472 | 'success' => true, |
| @@ -489,8 +496,9 @@ | ||
| 489 | 496 | return Helper::delete_server_cookies(); |
| 490 | 497 | } |
| 491 | 498 | |
| 492 | 499 | public function rest_data($nonce = true){ |
| 500 | + // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- Reviewed for the NotificationX codebase: acceptable in this context. | |
| 493 | 501 | return apply_filters('nx_rest_data', array( |
| 494 | 502 | 'root' => rest_url(), |
| 495 | 503 | 'namespace' => $this->_namespace(), |
| 496 | 504 | 'nonce' => $nonce ? wp_create_nonce( 'wp_rest' ) : '', |
| @@ -580,8 +588,21 @@ | ||
| 580 | 588 | '/wp-json/notificationx/v1/notice', |
| 581 | 589 | '/wp-json/notificationx/v1/delete-cookies', |
| 582 | 590 | '/wp-json/notificationx/v1/import', |
| 583 | 591 | '/wp-json/notificationx/v1/export', |
| 592 | + | |
| 593 | + /* | |
| 594 | + * TRANSITIONAL — remove in the release after Pro ships its own | |
| 595 | + * NotificationXPro\Core\REST::jwt_whitelist() override. | |
| 596 | + * | |
| 597 | + * These four routes belong to Pro: the licensing library registers them | |
| 598 | + * into this namespace, and Pro now whitelists all six itself. They stay | |
| 599 | + * here for one release only because Free auto-updates from wp.org while | |
| 600 | + * Pro updates through the licensed channel, so "new Free + old Pro" is a | |
| 601 | + * normal state for a site, and an old Pro carries no override. Dropping | |
| 602 | + * them before Pro has propagated would take the entries to zero for those | |
| 603 | + * sites. Pro's override calls array_unique(), so the overlap is harmless. | |
| 604 | + */ | |
| 584 | 605 | '/wp-json/notificationx/v1/license/activate', |
| 585 | 606 | '/wp-json/notificationx/v1/license/deactivate', |
| 586 | 607 | '/wp-json/notificationx/v1/license/submit-otp', |
| 587 | 608 | '/wp-json/notificationx/v1/license/resend-otp', |
