Merge branch 'develop' into fix/765

google · Nov 2, 2019 · d526249 · d526249
2 parents 6039ab8 + 24fc7aa
commit d526249
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Learn more: [https://sitekit.withgoogle.com](https://sitekit.withgoogle.com)
 
 ## Contributing
 
-Any kind of contributions to Site Kit by Google are welcome. Head over to the [Contributor Handhook](https://github.com/google/site-kit-wp/wiki) to get started, or directly to the [Engineering set up quickstart](https://github.com/google/site-kit-wp/wiki/Engineering#set-up-site-kit-project) to set up Sit Kit locally. :wink:
+Any kind of contributions to Site Kit by Google are welcome. Head over to the [Contributor Handhook](https://github.com/google/site-kit-wp/wiki) to get started, or directly to the [Engineering set up quickstart](https://github.com/google/site-kit-wp/wiki/Engineering#set-up-site-kit-project) to set up Site Kit locally. :wink:
 
 ## Requirements
 

diff --git a/includes/Core/Util/Migration_1_0_0.php b/includes/Core/Util/Migration_1_0_0.php
@@ -13,6 +13,7 @@
 use Google\Site_Kit\Context;
 use Google\Site_Kit\Core\Authentication\Authentication;
 use Google\Site_Kit\Core\Authentication\Clients\OAuth_Client;
+use Google\Site_Kit\Core\Authentication\Verification_Tag;
 use Google\Site_Kit\Core\Authentication\Credentials;
 use Google\Site_Kit\Core\Storage\Encrypted_Options;
 use Google\Site_Kit\Core\Storage\Options;
@@ -116,9 +117,26 @@ private function disconnect_users() {
 		$key_prefix = $this->context->is_network_mode() ? '' : $wpdb->get_blog_prefix();
 		$user_ids   = ( new \WP_User_Query(
 			array(
-				'fields'   => 'id',
-				'meta_key' => $key_prefix . OAuth_Client::OPTION_ACCESS_TOKEN,
-				'compare'  => 'EXISTS',
+				'fields'     => 'id',
+				'meta_query' => array(
+					'relation' => 'OR',
+					array(
+						'key'     => $key_prefix . Verification_Tag::OPTION,
+						'compare' => 'EXISTS',
+					),
+					array(
+						'key'     => $key_prefix . OAuth_Client::OPTION_ACCESS_TOKEN,
+						'compare' => 'EXISTS',
+					),
+					array(
+						'key'     => $key_prefix . OAuth_Client::OPTION_PROXY_ACCESS_CODE,
+						'compare' => 'EXISTS',
+					),
+					array(
+						'key'     => $key_prefix . OAuth_Client::OPTION_ERROR_CODE,
+						'compare' => 'EXISTS',
+					),
+				),
 			)
 		) )->get_results();
 

diff --git a/includes/Core/Util/Reset.php b/includes/Core/Util/Reset.php
@@ -143,9 +143,26 @@ private function delete_all_user_metas() {
 		$key_prefix = $this->context->is_network_mode() ? '' : $wpdb->get_blog_prefix();
 		$user_query = new \WP_User_Query(
 			array(
-				'fields'   => 'id',
-				'meta_key' => $key_prefix . OAuth_Client::OPTION_ACCESS_TOKEN,
-				'compare'  => 'EXISTS',
+				'fields'     => 'id',
+				'meta_query' => array(
+					'relation' => 'OR',
+					array(
+						'key'     => $key_prefix . Verification_Tag::OPTION,
+						'compare' => 'EXISTS',
+					),
+					array(
+						'key'     => $key_prefix . OAuth_Client::OPTION_ACCESS_TOKEN,
+						'compare' => 'EXISTS',
+					),
+					array(
+						'key'     => $key_prefix . OAuth_Client::OPTION_PROXY_ACCESS_CODE,
+						'compare' => 'EXISTS',
+					),
+					array(
+						'key'     => $key_prefix . OAuth_Client::OPTION_ERROR_CODE,
+						'compare' => 'EXISTS',
+					),
+				),
 			)
 		);