Add support for app_id field

Author: schlessera

features/user-application-password.feature

@@ -134,7 +134,7 @@ Feature: Manage user custom fields
     When I run `wp user application-password create 1 myapp1`
     Then STDOUT should not be empty
 
-    When I run `wp user application-password create 1 myapp2`
+    When I run `wp user application-password create 1 myapp2 --app-id=42`
     Then STDOUT should not be empty
 
     When I run `wp user application-password list 1 --name=myapp1 --field=uuid`
@@ -168,7 +168,7 @@ Feature: Manage user custom fields
       """
     And STDOUT should contain:
       """
-      {"uuid":"{UUID2}","app_id":"","name":"myapp2","password":"{JSONHASH2}","created":{CREATED2},"last_used":null,"last_ip":null}
+      {"uuid":"{UUID2}","app_id":"42","name":"myapp2","password":"{JSONHASH2}","created":{CREATED2},"last_used":null,"last_ip":null}
       """
 
     When I run `wp user application-password list 1 --format=json --fields=uuid,name`
@@ -184,37 +184,37 @@ Feature: Manage user custom fields
     When I run `wp user application-password list 1`
     Then STDOUT should be a table containing rows:
       | uuid    | app_id | name   | password | created    | last_used | last_ip |
-      | {UUID2} |        | myapp2 | {HASH2}  | {CREATED2} |           |         |
+      | {UUID2} | 42     | myapp2 | {HASH2}  | {CREATED2} |           |         |
       | {UUID1} |        | myapp1 | {HASH1}  | {CREATED1} |           |         |
 
     When I run `wp user application-password list 1 --fields=uuid,app_id,name`
     Then STDOUT should be a table containing rows:
       | uuid    | app_id | name   |
-      | {UUID2} |        | myapp2 |
+      | {UUID2} | 42     | myapp2 |
       | {UUID1} |        | myapp1 |
 
     When I run `wp user application-password list admin`
     Then STDOUT should be a table containing rows:
       | uuid    | app_id | name   | password | created    | last_used | last_ip |
-      | {UUID2} |        | myapp2 | {HASH2}  | {CREATED2} |           |         |
+      | {UUID2} | 42     | myapp2 | {HASH2}  | {CREATED2} |           |         |
       | {UUID1} |        | myapp1 | {HASH1}  | {CREATED1} |           |         |
 
     When I run `wp user application-password list admin --orderby=created --order=asc`
     Then STDOUT should be a table containing rows:
       | uuid    | app_id | name   | password | created    | last_used | last_ip |
       | {UUID1} |        | myapp1 | {HASH1}  | {CREATED1} |           |         |
-      | {UUID2} |        | myapp2 | {HASH2}  | {CREATED2} |           |         |
+      | {UUID2} | 42     | myapp2 | {HASH2}  | {CREATED2} |           |         |
 
     When I run `wp user application-password list admin --orderby=name --order=asc`
     Then STDOUT should be a table containing rows:
       | uuid    | app_id | name   | password | created    | last_used | last_ip |
       | {UUID1} |        | myapp1 | {HASH1}  | {CREATED1} |           |         |
-      | {UUID2} |        | myapp2 | {HASH2}  | {CREATED2} |           |         |
+      | {UUID2} | 42     | myapp2 | {HASH2}  | {CREATED2} |           |         |
 
     When I run `wp user application-password list admin --orderby=name --order=desc`
     Then STDOUT should be a table containing rows:
       | uuid    | app_id | name   | password | created    | last_used | last_ip |
-      | {UUID2} |        | myapp2 | {HASH2}  | {CREATED2} |           |         |
+      | {UUID2} | 42     | myapp2 | {HASH2}  | {CREATED2} |           |         |
       | {UUID1} |        | myapp1 | {HASH1}  | {CREATED1} |           |         |
 
     When I run `wp user application-password list admin --name=myapp2 --format=json`
@@ -237,6 +237,12 @@ Feature: Manage user custom fields
       myapp2
       """
 
+    When I run `wp user application-password list 1 --field=name --app-id=42`
+    Then STDOUT should be:
+      """
+      myapp2
+      """
+
   @require-wp-5.6
   Scenario: Get particular user application password hash
     Given a WP install

src/User_Application_Password_Command.php

@@ -166,12 +166,22 @@ static function ( $a, $b ) use ( $orderby, $order ) {
 		$fields = self::APPLICATION_PASSWORD_FIELDS;
 
 		foreach ( $fields as $field ) {
-			if ( ! array_key_exists( $field, $assoc_args ) ) {
+			if (
+				! array_key_exists( $field, $assoc_args )
+				&&
+				! ( 'app_id' === $field && array_key_exists( 'app-id', $assoc_args ) )
+			) {
 				continue;
 			}
 
 			$value = Utils\get_flag_value( $assoc_args, $field );
 
+			// Avoid confusion regarding the dash/underscore between creation flag
+			// and querying field name.
+			if ( 'app_id' === $field && array_key_exists( 'app-id', $assoc_args ) ) {
+				$value = Utils\get_flag_value( $assoc_args, 'app-id' );
+			}
+
 			$application_passwords = array_filter(
 				$application_passwords,
 				static function ( $application_password ) use ( $field, $value ) {
@@ -266,6 +276,9 @@ public function get( $args, $assoc_args ) {
 	 * <app-name>
 	 * : Unique name of the application to create an application password for.
 	 *
+	 * [--app-id=<app-id>]
+	 * : Application ID to attribute to the application password.
+	 *
 	 * [--porcelain]
 	 * : Output just the new password.
 	 *
@@ -280,6 +293,10 @@ public function get( $args, $assoc_args ) {
 	 *     $ wp user application-passwords create 123 myapp --porcelain
 	 *     ZG1bxdxdzjTwhsY8vK8l1C65
 	 *
+	 *     # Create user application with a custom application ID for internal tracking
+	 *     $ wp user application-passwords create 123 myapp --app-id=42 --porcelain
+	 *     ZG1bxdxdzjTwhsY8vK8l1C65
+	 *
 	 * @param array $args       Indexed array of positional arguments.
 	 * @param array $assoc_args Associative array of associative arguments.
 	 * @throws ExitException If the application password could not be created.
@@ -289,7 +306,14 @@ public function create( $args, $assoc_args ) {
 
 		list( $user_id, $app_name ) = $args;
 
-		$result = WP_Application_Passwords::create_new_application_password( $user_id, [ 'name' => $app_name ] );
+		$app_id = Utils\get_flag_value( $assoc_args, 'app-id', '' );
+
+		$arguments = [
+			'name'   => $app_name,
+			'app_id' => $app_id,
+		];
+
+		$result = WP_Application_Passwords::create_new_application_password( $user_id, $arguments );
 
 		if ( $result instanceof WP_Error ) {
 			WP_CLI::error( $result );