spotfixes: add secret key on plugin activation; fix syntax of cart_hash unique key definition

Author: ggwicz

src/AbandonedCarts/CartsTable.php

@@ -25,7 +25,7 @@ class CartsTable extends Service {
 	 *
 	 * @since 2019-10-09
 	 */
-	const DB_VERSION = '1.2';
+	const DB_VERSION = '1.3';
 
 	/**
 	 * Option name for abandoned carts db version.
@@ -73,7 +73,7 @@ public function create_table() {
 			cart_created_ts int(11) unsigned NOT NULL DEFAULT 0,
 			cart_hash binary(16) NOT NULL DEFAULT 0,
 			PRIMARY KEY (cart_id),
-			UNIQUE KEY (cart_hash)
+			UNIQUE KEY cart_hash (cart_hash)
 		) {$wpdb->get_charset_collate()}";
 
 		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
@@ -91,27 +91,13 @@ public function create_table() {
 	protected function update_table() {
 		global $wpdb;
 
-		$table_name = $wpdb->prefix . self::TABLE_NAME;
+		$table_name = self::get_table_name();
 
-		// Check if hash key exists, if not, create key and update existing values.
 		// phpcs:disable WordPress.DB.PreparedSQL -- Okay use of unprepared variable for table name in SQL.
 		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) ) {
-			if ( ! $wpdb->get_var( "SHOW KEYS FROM {$table_name} WHERE Key_name = 'cart_hash'" ) ) {
-
-				// Update existing entries.
-				$wpdb->query(
-					"UPDATE {$table_name}
-					SET cart_hash = UNHEX(MD5(CONCAT(user_id, user_email)))"
-				);
-
-				// Add unique key constraint.
-				$wpdb->query(
-					"ALTER TABLE {$table_name}
-					ADD UNIQUE KEY(`cart_hash`)"
-				);
-
-				update_option( self::DB_VERSION_OPTION_NAME, self::DB_VERSION );
-			}
+
+			// Any data updates would be performed here.
+			update_option( self::DB_VERSION_OPTION_NAME, self::DB_VERSION );
 		}
 		// phpcs:enable
 	}

src/Plugin.php

@@ -232,17 +232,28 @@ private function maybe_activate_woocommerce() {
 	public function do_activation_process() {
 		$this->maybe_activate_woocommerce();
 
+		$this->create_initial_secret_key();
 		$this->create_abandoned_carts_table();
 		$this->create_abandoned_carts_expiration_check();
 
 		flush_rewrite_rules();
 	}
 
+	/**
+	 * Create a secret key on plugin activation so JWT tokens can used in the Abandoned Carts REST API.
+	 *
+	 * @author George Gecewicz <[email protected]>
+	 * @since 2019-10-29
+	 */
+	private function create_initial_secret_key() {
+		update_option( 'cc_woo_abandoned_carts_secret_key', wp_generate_password( 64, true, true ) );
+	}
+
 	/**
 	 * Creates the database table for Abandoned Carts.
 	 *
-	 * @author Rebekah Van Epps <george.gecewicz@webdevstudios.com>
-	 * @since 2019-20-24
+	 * @author Rebekah Van Epps <rebekah.vanepps@webdevstudios.com>
+	 * @since 2019-10-24
 	 */
 	private function create_abandoned_carts_table() {
 		( new CartsTable() )->create_table();