Bugfix: WP-API#27 WP-API#33 WP-API#45 Avoid wp_authenticate's errors

Merge pull request #2 from BrianHenryIE/wp_authenticate-bugfix
metaworx · Apr 14, 2020 · 30b435f · 30b435f
2 parents 9e9d526 + 5339062
commit 30b435f
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/basic-auth.php b/basic-auth.php
@@ -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 );