Changeset 49617

Timestamp:

11/16/2020 10:40:11 PM (4 years ago)

Author:

TimothyBlynJacobs

Message:

App Passwords: Unify availability language.

Previously App Passwords used a mix of "enabled" and "available". We've now standardized on using "available".

Additionally, we now use a 501 status code when indicating that App Passwords is not available.

Props SergeyBiryukov, ocean90, TimothyBlynJacobs.
Fixes #51513.

Location:

trunk

Files:

• src/wp-admin/authorize-application.php (modified) (2 diffs)
• src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php (modified) (2 diffs)
• src/wp-includes/user.php (modified) (2 diffs)
• tests/phpunit/tests/auth.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-application-passwords-controller.php (modified) (2 diffs)

trunk/src/wp-admin/authorize-application.php

@@ -91 +91 @@
 if ( ! wp_is_application_passwords_available_for_user( $user ) ) {
     if ( wp_is_application_passwords_available() ) {
-        $message = __( 'Application passwords are not enabled for your account. Please contact the site administrator for assistance.' );
+        $message = __( 'Application passwords are not available for your account. Please contact the site administrator for assistance.' );
     } else {
-        $message = __( 'Application passwords are not enabled.' );
+        $message = __( 'Application passwords are not available.' );
     }
 
@@ -100 +100 @@
         __( 'Cannot Authorize Application' ),
         array(
+            'response'  => 501,
             'link_text' => __( 'Go Back' ),
             'link_url'  => $reject_url ? add_query_arg( 'error', 'disabled', $reject_url ) : admin_url(),

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-application-passwords-controller.php

@@ -504 +504 @@
             return new WP_Error(
                 'application_passwords_disabled',
-                __( 'Application passwords are not enabled.' ),
-                array( 'status' => 500 )
+                __( 'Application passwords are not available.' ),
+                array( 'status' => 501 )
             );
         }
@@ -548 +548 @@
             return new WP_Error(
                 'application_passwords_disabled_for_user',
-                __( 'Application passwords are not enabled for your account. Please contact the site administrator for assistance.' ),
-                array( 'status' => 500 )
+                __( 'Application passwords are not available for your account. Please contact the site administrator for assistance.' ),
+                array( 'status' => 501 )
             );
         }

trunk/src/wp-includes/user.php

@@ -351 +351 @@
             );
         }
+    } elseif ( ! wp_is_application_passwords_available() ) {
+        $error = new WP_Error(
+            'application_passwords_disabled',
+            'Application passwords are not available.'
+        );
     } elseif ( ! wp_is_application_passwords_available_for_user( $user ) ) {
         $error = new WP_Error(
-            'application_passwords_disabled',
-            __( 'Application passwords are disabled for the requested user.' )
+            'application_passwords_disabled_for_user',
+            __( 'Application passwords are not available for your account. Please contact the site administrator for assistance.' )
         );
     }
@@ -4132 +4137 @@
 
 /**
- * Checks if Application Passwords is enabled for a specific user.
+ * Checks if Application Passwords is available for a specific user.
  *
  * By default all users can use Application Passwords. Use {@see 'wp_is_application_passwords_available_for_user'}

trunk/tests/phpunit/tests/auth.php

@@ -528 +528 @@
         $error = wp_authenticate_application_password( null, self::$_user->user_login, 'password' );
         $this->assertWPError( $error );
-        $this->assertSame( 'application_passwords_disabled', $error->get_error_code() );
+        $this->assertSame( 'application_passwords_disabled_for_user', $error->get_error_code() );
     }
 

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

@@ -113 +113 @@
 
         $response = rest_do_request( '/wp/v2/users/me/application-passwords' );
-        $this->assertErrorResponse( 'application_passwords_disabled', $response, 500 );
+        $this->assertErrorResponse( 'application_passwords_disabled', $response, 501 );
     }
 
@@ -124 +124 @@
 
         $response = rest_do_request( '/wp/v2/users/me/application-passwords' );
-        $this->assertErrorResponse( 'application_passwords_disabled_for_user', $response, 500 );
+        $this->assertErrorResponse( 'application_passwords_disabled_for_user', $response, 501 );
     }