feat: Add Setup Wizard with OAuth integration and webhook URL management

Author: ajaydsouza

includes/admin/class-admin.php

@@ -40,6 +40,14 @@ class Admin {
 	 */
 	public $subscribers_list;
 
+	/**
+	 * Settings wizard object.
+	 *
+	 * @since 1.0.0
+	 * @var Settings_Wizard|null
+	 */
+	public ?Settings_Wizard $settings_wizard = null;
+
 	/**
 	 * Admin notices API object.
 	 *
@@ -93,6 +101,13 @@ public function __construct( Database $database ) {
 						'page_slugs' => array( 'glue_link_options_page' ),
 						'screen_ids' => array( 'settings_page_glue_link_options_page' ),
 					),
+					'wizard'      => array(
+						'label'      => __( 'Setup Wizard', 'glue-link' ),
+						'url'        => admin_url( 'options-general.php?page=glue_link_setup_wizard' ),
+						'type'       => 'secondary',
+						'page_slugs' => array( 'glue_link_setup_wizard' ),
+						'screen_ids' => array( 'settings_page_glue_link_setup_wizard' ),
+					),
 					'subscribers' => array(
 						'label'      => __( 'Subscribers', 'glue-link' ),
 						'url'        => admin_url( 'users.php?page=glue_link_subscribers' ),
@@ -107,6 +122,9 @@ public function __construct( Database $database ) {
 		// Initialize settings.
 		$this->settings = new Settings();
 
+		// Initialize setup wizard.
+		$this->settings_wizard = new Settings_Wizard();
+
 		// Initialize subscribers list.
 		$this->subscribers_list = new Subscribers_List( $database );
 

includes/admin/class-kit-oauth.php

@@ -84,16 +84,20 @@ public function maybe_handle_requests(): void {
 	/**
 	 * Build HTML for OAuth connection status on settings screen.
 	 *
-	 * @param string $menu_slug Settings page slug.
+	 * @param string $menu_slug  Settings page slug.
+	 * @param array  $query_args Optional query args for OAuth callback and button URLs.
 	 * @return string
 	 */
-	public static function get_status_html( string $menu_slug ): string {
+	public static function get_status_html( string $menu_slug, array $query_args = array() ): string {
 		$api          = new Kit_API();
 		$settings     = new Kit_Settings();
 		$settings_url = add_query_arg(
-			array(
-				'page' => $menu_slug,
-				'tab'  => 'kit',
+			array_merge(
+				array(
+					'page' => $menu_slug,
+					'tab'  => 'kit',
+				),
+				$query_args
 			),
 			admin_url( 'admin.php' )
 		);
@@ -127,10 +131,9 @@ public static function get_status_html( string $menu_slug ): string {
 				);
 			}
 
-			$settings->delete_credentials();
-
 			return sprintf(
-				'<p>%1$s</p><p><a class="button button-primary" href="%2$s">%3$s</a></p>',
+				'<p>%1$s</p><p>%2$s</p><p><a class="button button-primary" href="%3$s">%4$s</a></p>',
+				esc_html__( 'Kit is connected, but we could not verify the account right now.', 'glue-link' ),
 				esc_html( $account->get_error_message() ),
 				esc_url( $oauth_url ),
 				esc_html__( 'Reconnect to Kit', 'glue-link' )
@@ -150,10 +153,13 @@ public static function get_status_html( string $menu_slug ): string {
 
 		$disconnect_url = wp_nonce_url(
 			add_query_arg(
-				array(
-					'page'                       => $menu_slug,
-					'tab'                        => 'kit',
-					'glue_link_oauth_disconnect' => 1,
+				array_merge(
+					array(
+						'page'                       => $menu_slug,
+						'tab'                        => 'kit',
+						'glue_link_oauth_disconnect' => 1,
+					),
+					$query_args
 				),
 				admin_url( 'admin.php' )
 			),
@@ -191,13 +197,20 @@ private function is_settings_page(): bool {
 	 * @return string
 	 */
 	private function get_settings_url(): string {
-		return add_query_arg(
-			array(
-				'page' => $this->menu_slug,
-				'tab'  => 'kit',
-			),
-			admin_url( 'admin.php' )
+		$args = array(
+			'page' => $this->menu_slug,
+			'tab'  => 'kit',
 		);
+
+		// Preserve wizard step, if present, so OAuth callbacks return to the intended step.
+		if ( isset( $_GET['step'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$step = absint( wp_unslash( $_GET['step'] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			if ( $step > 0 ) {
+				$args['step'] = $step;
+			}
+		}
+
+		return add_query_arg( $args, admin_url( 'admin.php' ) );
 	}
 
 	/**