Separate the connection library into its own package.

class.jetpack-options.php

@@ -1,5 +1,40 @@
 <?php
 
+use \Automattic\Jetpack\Options\Manager as Options_Manager;
+
+if ( class_exists( '\Automattic\Jetpack\Options\Manager' ) ) :
+
+/**
+ * The option manager class that will eventually replace Jetpack_Options
+ */
+class Jetpack_Options_Manager extends Options_Manager {
+
+	/**
+	 * Returns an array of option names for a given type.
+	 *
+	 * @param string $type The type of option to return. Defaults to 'compact'.
+	 *
+	 * @return array
+	 */
+	public function get_option_names( $type = 'compact' ) {
+		switch ( $type ) {
+			case 'non-compact':
+			case 'non_compact':
+				return array( 'secrets' );
+
+			case 'private':
+				return array();
+
+			case 'network':
+				return array();
+		}
+
+		return array();
+	}
+}
+
+endif;
+
 class Jetpack_Options {
 
 	/**

class.jetpack.php

@@ -22,6 +22,8 @@
 	Flag for "activating" the plugin on sites where the activation hook never fired (auto-installs)
 */
 
+use \Automattic\Jetpack\Connection\Manager as Connection_Manager;
+
 require_once( JETPACK__PLUGIN_DIR . '_inc/lib/class.media.php' );
 
 class Jetpack {
@@ -332,6 +334,11 @@ class Jetpack {
 	 */
 	public $json_api_authorization_request = array();
 
+	/**
+	 * @var \Automattic\Jetpack\Connection\Manager
+	 */
+	protected $connection_manager;
+
 	/**
 	 * @var string Transient key used to prevent multiple simultaneous plugin upgrades
 	 */
@@ -532,6 +539,18 @@ private function __construct() {
 			Jetpack_Network::init();
 		}
 
+		add_filter( 'jetpack_connection_option_manager', function() {
+			return new Jetpack_Options_Manager();
+		} );
+
+		add_filter( 'jetpack_connection_secret_generator', function( $callable ) {
+			return function() {
+				return wp_generate_password( 32, false );
+			};
+		} );
+
+		$this->connection_manager = new Connection_Manager( );
+
 		/**
 		 * Prepare Gutenberg Editor functionality
 		 */
@@ -4536,6 +4555,7 @@ function build_connect_url( $raw = false, $redirect = false, $from = false, $reg
 				);
 
 				if ( 200 !== wp_remote_retrieve_response_code( $response ) ) {
+
 					// Generating a register URL instead to refresh the existing token
 					return $this->build_connect_url( $raw, $redirect, $from, true );
 				}
@@ -4945,55 +4965,29 @@ public static function xmlrpc_api_url() {
 	 * @return array
 	 */
 	public static function generate_secrets( $action, $user_id = false, $exp = 600 ) {
-		if ( ! $user_id ) {
+		if ( false === $user_id ) {
 			$user_id = get_current_user_id();
 		}
 
-		$secret_name  = 'jetpack_' . $action . '_' . $user_id;
-		$secrets      = Jetpack_Options::get_raw_option( 'jetpack_secrets', array() );
-
-		if (
-			isset( $secrets[ $secret_name ] ) &&
-			$secrets[ $secret_name ]['exp'] > time()
-		) {
-			return $secrets[ $secret_name ];
-		}
-
-		$secret_value = array(
-			'secret_1'  => wp_generate_password( 32, false ),
-			'secret_2'  => wp_generate_password( 32, false ),
-			'exp'       => time() + $exp,
-		);
-
-		$secrets[ $secret_name ] = $secret_value;
-
-		Jetpack_Options::update_raw_option( 'jetpack_secrets', $secrets );
-		return $secrets[ $secret_name ];
+		return self::init()->connection_manager->generate_secrets( $action, $user_id, $exp );
 	}
 
 	public static function get_secrets( $action, $user_id ) {
-		$secret_name = 'jetpack_' . $action . '_' . $user_id;
-		$secrets = Jetpack_Options::get_raw_option( 'jetpack_secrets', array() );
+		$secrets = self::init()->connection_manager->get_secrets( $action, $user_id );
 
-		if ( ! isset( $secrets[ $secret_name ] ) ) {
+		if ( Connection_Manager::SECRETS_MISSING === $secrets ) {
 			return new WP_Error( 'verify_secrets_missing', 'Verification secrets not found' );
 		}
 
-		if ( $secrets[ $secret_name ]['exp'] < time() ) {
-			self::delete_secrets( $action, $user_id );
+		if ( Connection_Manager::SECRETS_EXPIRED === $secrets ) {
 			return new WP_Error( 'verify_secrets_expired', 'Verification took too long' );
 		}
 
-		return $secrets[ $secret_name ];
+		return $secrets;
 	}
 
 	public static function delete_secrets( $action, $user_id ) {
-		$secret_name = 'jetpack_' . $action . '_' . $user_id;
-		$secrets = Jetpack_Options::get_raw_option( 'jetpack_secrets', array() );
-		if ( isset( $secrets[ $secret_name ] ) ) {
-			unset( $secrets[ $secret_name ] );
-			Jetpack_Options::update_raw_option( 'jetpack_secrets', $secrets );
-		}
+		return self::init()->connection_manager->delete_secrets( $action, $user_id );
 	}
 
 	/**

composer.json

@@ -8,8 +8,12 @@
 		"issues": "https://github.com/Automattic/jetpack/issues"
 	},
 	"require": {
+		"composer/installers": "1.6.0",
 		"ext-openssl": "*",
-		"automattic/jetpack-logo": "@dev"
+		"automattic/jetpack-connection": "^1.0",
+		"automattic/jetpack-options": "^1.0",
+		"automattic/jetpack-logo": "@dev",
+		"automattic/jetpack-constants": "@dev"
 	},
 	"require-dev": {
 		"dealerdirect/phpcodesniffer-composer-installer": "0.5.0",
@@ -18,6 +22,22 @@
 		"phpcompatibility/phpcompatibility-wp": "2.0.0",
 		"automattic/jetpack-autoloader": "@dev"
 	},
+	"repositories": [
+		{
+			"type": "path",
+			"url": "./packages/jetpack-connection",
+			"options": {
+				"symlink": true
+			}
+		},
+		{
+			"type": "path",
+			"url": "./packages/jetpack-options",
+			"options": {
+				"symlink": true
+			}
+		}
+	],
 	"scripts": {
 		"php:compatibility": "composer install && vendor/bin/phpcs -p -s --runtime-set testVersion '5.3-' --standard=PHPCompatibilityWP --ignore=docker,tools,tests,node_modules,vendor --extensions=php",
 		"php:lint": "composer install && vendor/bin/phpcs -p -s",