Skip to content

Commit

Permalink
Bugfix: WP-API#27 WP-API#33 WP-API#45 Avoid wp_authenticate's errors
Browse files Browse the repository at this point in the history
Sometimes, with an incorrect username and password (or using email address rather than username, which made `wp_authenticate_username_password` error) when `$user = wp_authenticate( $username, $password );` errored, it would call `$wp_rewrite->get_page_permastruct();` before `$wp_rewrite` was initialized, returning a 500 server error. In my case, this would happen when I enabled the SkyVerge WooCommerce Print Invoices/Packing Lists plugin.
  • Loading branch information
BrianHenryIE committed Aug 9, 2017
1 parent e911142 commit 5339062
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion basic-auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,19 @@ function json_basic_auth_handler( $user ) {
*/
remove_filter( 'determine_current_user', 'json_basic_auth_handler', 20 );

$user = wp_authenticate( $username, $password );
$user = get_user_by('login', $username);

if ( !$user ) {
$user = get_user_by('email', $username);
}

if ( !$user ) {
return null;
}

if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
return null;
}

add_filter( 'determine_current_user', 'json_basic_auth_handler', 20 );

Expand Down

0 comments on commit 5339062

Please sign in to comment.