Changeset 49276
- Timestamp:
- 10/22/2020 03:04:23 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/js/_enqueues/admin/auth-app.js
r49109 r49276 17 17 18 18 $approveBtn.click( function( e ) { 19 var name = $appNameField.val(); 19 var name = $appNameField.val(), 20 appId = $( 'input[name="app_id"]', $form ).val(); 20 21 21 22 e.preventDefault(); … … 32 33 name: name 33 34 }; 35 36 37 38 34 39 35 40 /** -
trunk/src/wp-admin/authorize-application.php
r49272 r49276 19 19 $reject_url = $_POST['reject_url']; 20 20 $app_name = $_POST['app_name']; 21 21 22 $redirect = ''; 22 23 … … 28 29 } 29 30 } elseif ( isset( $_POST['approve'] ) ) { 30 $created = WP_Application_Passwords::create_new_application_password( get_current_user_id(), array( 'name' => $app_name ) ); 31 $created = WP_Application_Passwords::create_new_application_password( 32 get_current_user_id(), 33 array( 34 'name' => $app_name, 35 'app_id' => $app_id, 36 ) 37 ); 31 38 32 39 if ( is_wp_error( $created ) ) { … … 57 64 58 65 $app_name = ! empty( $_REQUEST['app_name'] ) ? $_REQUEST['app_name'] : ''; 66 59 67 $success_url = ! empty( $_REQUEST['success_url'] ) ? $_REQUEST['success_url'] : null; 60 68 … … 69 77 $user = wp_get_current_user(); 70 78 71 $request = compact( 'app_name', ' success_url', 'reject_url' );79 $request = compact( 'app_name', 'success_url', 'reject_url' ); 72 80 $is_valid = wp_is_authorize_application_password_request_valid( $request, $user ); 73 81 … … 184 192 <?php wp_nonce_field( 'authorize_application_password' ); ?> 185 193 <input type="hidden" name="action" value="authorize_application_password" /> 194 186 195 <input type="hidden" name="success_url" value="<?php echo esc_url( $success_url ); ?>" /> 187 196 <input type="hidden" name="reject_url" value="<?php echo esc_url( $reject_url ); ?>" /> -
trunk/src/wp-admin/includes/user.php
r49197 r49276 605 605 * 606 606 * @type string $app_name The suggested name of the application. 607 607 608 * @type string $success_url The url the user will be redirected to after approving the application. 608 609 * @type string $reject_url The url the user will be redirected to after rejecting the application. … … 636 637 } 637 638 639 640 641 642 643 644 645 638 646 /** 639 647 * Fires before application password errors are returned. -
trunk/src/wp-includes/class-wp-application-passwords.php
r49109 r49276 52 52 $new_item = array( 53 53 'uuid' => wp_generate_uuid4(), 54 54 55 'name' => $args['name'], 55 56 'password' => $hashed_password, -
trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php
r49109 r49276 413 413 ); 414 414 415 416 417 418 415 419 /** 416 420 * Filters an application password before it is inserted via the REST API. … … 442 446 $prepared = array( 443 447 'uuid' => $item['uuid'], 448 444 449 'name' => $item['name'], 445 450 'created' => gmdate( 'Y-m-d\TH:i:s', $item['created'] ), … … 616 621 'readonly' => true, 617 622 ), 623 624 625 626 627 628 618 629 'name' => array( 619 630 'description' => __( 'The name of the application password.' ), -
trunk/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php
r49109 r49276 309 309 wp_set_current_user( self::$admin ); 310 310 311 311 312 $request = new WP_REST_Request( 'POST', '/wp/v2/users/me/application-passwords' ); 312 $request->set_body_params( array( 'name' => 'App' ) ); 313 $request->set_body_params( 314 array( 315 'name' => 'App', 316 'app_id' => $app_id, 317 ) 318 ); 313 319 $response = rest_do_request( $request ); 314 320 … … 319 325 $this->check_response( $response->get_data(), $passwords[0], true ); 320 326 $this->assertEquals( 'App', $response->get_data()['name'] ); 327 321 328 $this->assertNull( $response->get_data()['last_used'] ); 322 329 $this->assertNull( $response->get_data()['last_ip'] ); … … 512 519 $response = rest_do_request( $request ); 513 520 $this->assertErrorResponse( 'rest_application_password_not_found', $response, 404 ); 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 514 551 } 515 552 … … 776 813 protected function check_response( $response, $item, $password = false ) { 777 814 $this->assertArrayHasKey( 'uuid', $response ); 815 778 816 $this->assertArrayHasKey( 'name', $response ); 779 817 $this->assertArrayHasKey( 'created', $response ); … … 782 820 783 821 $this->assertEquals( $item['uuid'], $response['uuid'] ); 822 784 823 $this->assertEquals( $item['name'], $response['name'] ); 785 824 $this->assertEquals( gmdate( 'Y-m-d\TH:i:s', $item['created'] ), $response['created'] ); … … 813 852 $properties = $data['schema']['properties']; 814 853 815 $this->assertCount( 6, $properties );816 854 $this->assertArrayHasKey( 'uuid', $properties ); 855 817 856 $this->assertArrayHasKey( 'name', $properties ); 818 857 $this->assertArrayHasKey( 'password', $properties ); … … 820 859 $this->assertArrayHasKey( 'last_used', $properties ); 821 860 $this->assertArrayHasKey( 'last_ip', $properties ); 861 822 862 } 823 863 } -
trunk/tests/qunit/fixtures/wp-api-generated.js
r49257 r49276 4918 4918 ], 4919 4919 "args": { 4920 4921 4922 4923 4924 4920 4925 "name": { 4921 4926 "description": "The name of the application password.", … … 4968 4973 ], 4969 4974 "args": { 4975 4976 4977 4978 4979 4970 4980 "name": { 4971 4981 "description": "The name of the application password.",
Note: See TracChangeset
for help on using the changeset viewer.