#41 - JWT fields cannot be retrieved via viewer query

- refactored a bit to keep things a bit cleaner

Author: jasonbahl

src/Auth.php

@@ -378,7 +378,7 @@ public static function filter_determine_current_user( $user ) {
 		/**
 		 * If no token was generated, return the existing value for the $user
 		 */
-		if ( empty( $token ) ) {
+		if ( empty( $token ) || is_wp_error( $token ) ) {
 
 			/**
 			 * Return the user that was passed in to the filter
@@ -398,7 +398,6 @@ public static function filter_determine_current_user( $user ) {
 
 		}
 
-
 		/**
 		 * Everything is ok, return the user ID stored in the token
 		 */
@@ -489,6 +488,7 @@ public static function unrevoke_user_secret( int $user_id ) {
 
 	}
 
+
 	protected static function set_status( $status_code ) {
 		add_filter( 'graphql_response_status_code', function() use ( $status_code ) {
 			return $status_code;

wp-graphql-jwt-authentication.php

@@ -171,6 +171,14 @@ private static function init() {
 			 */
 			ManageTokens::init();
 
+			/**
+			 * Filter how WordPress determines the current user
+			 */
+			add_filter( 'determine_current_user', [
+				'\WPGraphQL\JWT_Authentication\Auth',
+				'filter_determine_current_user'
+			], 99, 1 );
+
 			/**
 			 * Filter the rootMutation fields
 			 */
@@ -197,42 +205,3 @@ function init() {
 }
 
 add_action( 'plugins_loaded', '\WPGraphQL\JWT_Auth\init', 1 );
-
-
-add_filter( 'determine_current_user', function( $user ) {
-
-	/**
-	 * Validate the token, which will check the Headers to see if Authentication headers were sent
-	 *
-	 * @since 0.0.1
-	 */
-	$token = Auth::validate_token();
-
-	/**
-	 * If no token was generated, return the existing value for the $user
-	 */
-	if ( empty( $token ) || is_wp_error( $token ) ) {
-
-		/**
-		 * Return the user that was passed in to the filter
-		 */
-		return $user;
-
-		/**
-		 * If there is a token
-		 */
-	} else {
-
-		/**
-		 * Get the current user from the token
-		 */
-		$user = ! empty( $token ) && ! empty( $token->data->user->id ) ? $token->data->user->id : $user;
-
-
-	}
-
-	/**
-	 * Everything is ok, return the user ID stored in the token
-	 */
-	return absint( $user );
-}, 99, 1 );