Merge pull request #2452 from jasonbahl/bug/#2448-fix-comment-to-comment-author-connection-resolver

jasonbahl · web-flow · commit 8a51e4025ef7 · 2022-07-25T12:19:34.000-06:00
fix: #2448 - Fixes Comment.author connection resolver to properly load both User and CommentAuthor types
diff --git a/src/Model/Comment.php b/src/Model/Comment.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use GraphQLRelay\Relay;
+use WP_Comment;
 
 /**
  * Class Comment - Models data for Comments
@@ -35,18 +36,18 @@ class Comment extends Model {
 	/**
 	 * Stores the incoming WP_Comment object to be modeled
 	 *
-	 * @var \WP_Comment $data
+	 * @var WP_Comment $data
 	 */
 	protected $data;
 
 	/**
 	 * Comment constructor.
 	 *
-	 * @param \WP_Comment $comment The incoming WP_Comment to be modeled
+	 * @param WP_Comment $comment The incoming WP_Comment to be modeled
 	 *
 	 * @throws Exception
 	 */
-	public function __construct( \WP_Comment $comment ) {
+	public function __construct( WP_Comment $comment ) {
 
 		$allowed_restricted_fields = [
 			'id',
diff --git a/src/Type/ObjectType/Comment.php b/src/Type/ObjectType/Comment.php
@@ -33,16 +33,14 @@ public static function register_type() {
 
 							$node = null;
 
-							// if the request is authenticated
-							// and the comment is from a user, try and load
-							// the user node
-							if ( ! empty( $comment->userId ) && is_user_logged_in() ) {
+							// try and load the user node
+							if ( ! empty( $comment->userId ) ) {
 								$node = $context->get_loader( 'user' )->load( absint( $comment->userId ) );
 							}
 
 							// If no node is loaded, fallback to the
 							// public comment author data
-							if ( ! $node ) {
+							if ( ! $node || ( true === $node->isPrivate ) ) {
 								$node = ! empty( $comment->commentId ) ? $context->get_loader( 'comment_author' )->load( $comment->commentId ) : null;
 							}
 
diff --git a/tests/wpunit/CommentObjectQueriesTest.php b/tests/wpunit/CommentObjectQueriesTest.php
@@ -663,7 +663,11 @@ public function dataProviderSwitchUser() {
 	public function testQueryingAvatarOnUserAuthorsIsValidForPublicAndAuthenticatedRequests() {
 
 		// create a comment with a guest author as the author
-		$comment_id = $this->createCommentObject();
+		$comment_by_comment_author_id = $this->createCommentObject([
+			'user_id' => 0
+		]);
+
+		$comment_by_user_id = $this->createCommentObject();
 
 		$query = '
 		query GetCommentAuthorWithAvatar($id:ID!){
@@ -682,7 +686,7 @@ public function testQueryingAvatarOnUserAuthorsIsValidForPublicAndAuthenticatedR
 		}
 		';
 
-		$global_id = \GraphQLRelay\Relay::toGlobalId( 'comment', $comment_id );
+		$global_id = \GraphQLRelay\Relay::toGlobalId( 'comment', $comment_by_comment_author_id );
 
 		$actual = graphql( [
 			'query'     => $query,
@@ -698,21 +702,26 @@ public function testQueryingAvatarOnUserAuthorsIsValidForPublicAndAuthenticatedR
 		$this->assertSame( 'CommentAuthor', $typename );
 		$this->assertNotEmpty( $actual['data']['comment']['author']['node']['avatar']['url'] );
 
-		wp_set_current_user( $this->admin );
+		$global_id = \GraphQLRelay\Relay::toGlobalId( 'comment', $comment_by_user_id );
 
 		$actual = graphql( [
 			'query'     => $query,
 			'variables' => [
 				'id' => $global_id,
 			],
 		] );
+
 		$this->assertArrayNotHasKey( 'errors', $actual );
 		codecept_debug( $actual );
 
 		$typename = $actual['data']['comment']['author']['node']['__typename'];
 
 		$this->assertSame( 'User', $typename );
 		$this->assertNotEmpty( $actual['data']['comment']['author']['node']['avatar']['url'] );
+
+		wp_delete_comment( $comment_by_user_id );
+		wp_delete_comment( $comment_by_comment_author_id );
+
 	}
 
 
