From c2ca912e5ed8a3a2b97b055c8aa72511575ad3be Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Wed, 2 Jul 2025 12:00:37 +0000
Subject: [PATCH] Application Passwords: Correct the schema of the `app_id`
 property of the application passwords REST API endpoint.

This property can contain either a UUID or an empty string.

Props sukhendu2002, johnbillion.

Fixes #53692
Built from https://develop.svn.wordpress.org/trunk@60404


git-svn-id: http://core.svn.wordpress.org/trunk@59740 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 ...class-wp-rest-application-passwords-controller.php | 11 ++++++++++-
 wp-includes/version.php                               |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
index b0ac65a647..767917d6f6 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
@@ -802,7 +802,16 @@ class WP_REST_Application_Passwords_Controller extends WP_REST_Controller {
 				'app_id'    => array(
 					'description' => __( 'A UUID provided by the application to uniquely identify it. It is recommended to use an UUID v5 with the URL or DNS namespace.' ),
 					'type'        => 'string',
-					'format'      => 'uuid',
+					'oneOf'       => array(
+						array(
+							'type'   => 'string',
+							'format' => 'uuid',
+						),
+						array(
+							'type' => 'string',
+							'enum' => array( '' ),
+						),
+					),
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
 				'name'      => array(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0e2d47b968..2e6b386391 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-60403';
+$wp_version = '6.9-alpha-60404';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.