Merge pull request #1788 from WordPress/update/od-auth-conditions

Eliminate varying URL Metrics by logged-in state and discontinue disabling optimization by default for admins

plugins/optimization-detective/docs/hooks.md

@@ -67,8 +67,7 @@ Filters whether the current response can be optimized. By default, detection and
 2. It’s not a post embed template (`is_embed()`).
 3. It’s not the Customizer preview (`is_customize_preview()`)
 4. It’s not the response to a `POST` request.
-5. The user is not an administrator (`current_user_can( 'customize' )`), unless you're in plugin development mode (`wp_is_development_mode( 'plugin' )`).
-6. There is at least one queried post on the page. This is used to facilitate the purging of page caches after a new URL Metric is stored.
+5. There is at least one queried post on the page. This is used to facilitate the purging of page caches after a new URL Metric is stored.
 
 To force every response to be optimized regardless of the conditions above, you can do:
 

plugins/optimization-detective/docs/introduction.md

@@ -21,6 +21,6 @@ When no more URL Metrics are needed for a URL due to the sample size being obtai
 
 URL Metrics have a “freshness TTL” after which they will be stale and the JavaScript will be served again to start gathering metrics again to ensure that the right elements continue to get their loading prioritized. When a URL Metrics custom post type hasn't been touched in a while, it is automatically garbage-collected.
 
-👉 **Note:** This plugin optimizes pages for actual visitors, and it depends on visitors to optimize pages (since URL Metrics need to be collected). As such, you won't see optimizations applied immediately after activating the plugin (and dependent plugin(s)). And since administrator users are not normal visitors typically, optimizations are not applied for admins by default (but this can be overridden with the `od_can_optimize_response` filter below). URL Metrics are not collected for administrators because it is likely that additional elements will be present on the page which are not also shown to non-administrators, meaning the URL Metrics could not reliably be reused between them.
+👉 **Note:** This plugin optimizes pages for actual visitors, and it depends on visitors to optimize pages (since URL Metrics need to be collected). As such, you won't see optimizations applied immediately after activating the plugin (and dependent plugin(s)).
 
 When the `WP_DEBUG` constant is enabled, additional logging for Optimization Detective is added to the browser console.

plugins/optimization-detective/optimization.php

@@ -118,12 +118,6 @@ function od_can_optimize_response(): bool {
 		is_customize_preview() ||
 		// Since the images detected in the response body of a POST request cannot, by definition, be cached.
 		( isset( $_SERVER['REQUEST_METHOD'] ) && 'GET' !== $_SERVER['REQUEST_METHOD'] ) ||
-		// The aim is to optimize pages for the majority of site visitors, not for those who administer the site, unless
-		// in 'plugin' development mode. For admin users, additional elements will be present, like the script from
-		// wp_customize_support_script(), which will interfere with the XPath indices. Note that
-		// od_get_normalized_query_vars() is varied by is_user_logged_in(), so membership sites and e-commerce sites
-		// will still be able to be optimized for their normal visitors.
-		( current_user_can( 'customize' ) && ! wp_is_development_mode( 'plugin' ) ) ||
 		// Page caching plugins can only reliably be told to invalidate a cached page when a post is available to trigger
 		// the relevant actions on.
 		null === od_get_cache_purge_post_id()

plugins/optimization-detective/storage/data.php

@@ -77,11 +77,6 @@ function od_get_normalized_query_vars(): array {
 		);
 	}
 
-	// Vary URL Metrics by whether the user is logged in since additional elements may be present.
-	if ( is_user_logged_in() ) {
-		$normalized_query_vars['user_logged_in'] = true;
-	}
-
 	return $normalized_query_vars;
 }
 

plugins/optimization-detective/tests/storage/test-data.php

@@ -115,7 +115,7 @@ public function data_provider_test_od_get_normalized_query_vars(): array {
 				'set_up' => function (): array {
 					wp_set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
 					$this->go_to( home_url( '/' ) );
-					return array( 'user_logged_in' => true );
+					return array();
 				},
 			),
 		);

plugins/optimization-detective/tests/test-optimization.php

@@ -249,7 +249,7 @@ public function data_provider_test_od_can_optimize_response(): array {
 					wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 					$this->go_to( home_url( '/' ) );
 				},
-				'expected' => false,
+				'expected' => true,
 			),
 		);
 	}