#26 - Expose Refresh Token in Authenticated REST API requests

 - code review updates

Author: jasonbahl

src/ManageTokens.php

@@ -293,17 +293,11 @@ public static function use_custom_user_expiration( $expiration ) {
 	 */
 	public static function add_tokens_to_graphql_response_headers( $headers ) {
 
-		$should_return_tokens = false;
-
 		/**
 		 * If the request _is_ SSL, or GRAPHQL_DEBUG is defined, return the tokens
 		 * otherwise do not return them.
 		 */
-		if ( is_ssl() || defined( 'GRAPHQL_DEBUG' ) && true !== GRAPHQL_DEBUG ) {
-			$should_return_tokens = true;
-		}
-
-		if ( ! $should_return_tokens ) {
+		if ( ! is_ssl() && ( ! defined( 'GRAPHQL_DEBUG' ) || true !== GRAPHQL_DEBUG ) ) {
 			return $headers;
 		}
 
@@ -358,17 +352,11 @@ public static function add_tokens_to_graphql_response_headers( $headers ) {
 	 */
 	public static function add_auth_headers_to_rest_response( \WP_HTTP_Response $response, $handler, $request ) {
 
-		$should_return_tokens = false;
-
 		/**
 		 * If the request _is_ SSL, or GRAPHQL_DEBUG is defined, return the tokens
 		 * otherwise do not return them.
 		 */
-		if ( is_ssl() || defined( 'GRAPHQL_DEBUG' ) && true !== GRAPHQL_DEBUG ) {
-			$should_return_tokens = true;
-		}
-
-		if ( ! $should_return_tokens ) {
+		if ( ! is_ssl() && ( ! defined( 'GRAPHQL_DEBUG' ) || true !== GRAPHQL_DEBUG ) ) {
 			return $response;
 		}