Changeset 52398 for trunk/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php

Timestamp:

12/21/2021 02:43:18 AM (3 years ago)

Author:

hellofromTonya

Message:

Application Passwords: Show HTTPS required message without filtering when not enabled or not in local environment.

When add_filter( 'wp_is_application_passwords_available', '__return_false' ) exists, HTTPS requirement message is shown even if HTTPS is enabled on the site. This happens because wp_is_application_passwords_available_for_user() first invokes wp_is_application_passwords_available() which is filterable. The situation could happen if the 'wp_is_application_passwords_available_for_user' filter returns false.

To fix this, the check for HTTPS (or if in a 'local' environment) is moved to a new function called wp_is_application_passwords_supported(). Then the return from this function is used as an OR condition for the Application Passwords section and for displaying the HTTPS required message.

Tests are included for both wp_is_application_passwords_supported() and wp_is_application_passwords_available().

Follow-up to [51980], [51988].

Props davidbinda, SergeyBiryukov, ocean90, felipeelia, costdev, hellofromTonya.
Fixes #53658.

File:

• trunk/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php (modified) (1 diff)

trunk/tests/phpunit/tests/rest-api/rest-application-passwords-controller.php

@@ -948 +948 @@
 
     /**
+     * @ticket 53658
+     *
+     * @covers ::wp_is_application_passwords_supported
+     */
+    public function test_wp_is_application_passwords_supported_with_https_only() {
+        $_SERVER['HTTPS'] = 'on';
+        $this->assertTrue( wp_is_application_passwords_supported() );
+    }
+
+    /**
+     * @ticket 53658
+     *
+     * @covers ::wp_is_application_passwords_supported
+     */
+    public function test_wp_is_application_passwords_supported_with_local_environment_only() {
+        putenv( 'WP_ENVIRONMENT_TYPE=local' );
+
+        $actual = wp_is_application_passwords_supported();
+
+        // Revert to default behaviour so that other tests are not affected.
+        putenv( 'WP_ENVIRONMENT_TYPE' );
+
+        $this->assertTrue( $actual );
+    }
+
+    /**
+     * @dataProvider data_wp_is_application_passwords_available
+     *
+     * @ticket 53658
+     *
+     * @covers ::wp_is_application_passwords_available
+     *
+     * @param bool|string $expected The expected value.
+     * @param string|null $callback Optional. The callback for the `wp_is_application_passwords_available` hook.
+     *                              Default: null.
+     */
+    public function test_wp_is_application_passwords_available( $expected, $callback = null ) {
+        remove_filter( 'wp_is_application_passwords_available', '__return_true' );
+
+        if ( $callback ) {
+            add_filter( 'wp_is_application_passwords_available', $callback );
+        }
+
+        if ( 'default' === $expected ) {
+            putenv( 'WP_ENVIRONMENT_TYPE=local' );
+            $expected = wp_is_application_passwords_supported();
+        }
+
+        $actual = wp_is_application_passwords_available();
+
+        if ( 'default' === $expected ) {
+            // Revert to default behaviour so that other tests are not affected.
+            putenv( 'WP_ENVIRONMENT_TYPE' );
+        }
+
+        $this->assertSame( $expected, $actual );
+    }
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     */
+    public function data_wp_is_application_passwords_available() {
+        return array(
+            'availability not forced'   => array(
+                'expected' => 'default',
+            ),
+            'availability forced true'  => array(
+                'expected' => true,
+                'callback' => '__return_true',
+            ),
+            'availability forced false' => array(
+                'expected' => false,
+                'callback' => '__return_false',
+            ),
+        );
+    }
+
+    /**
      * Sets up a REST API request to be authenticated using an App Password.
      *