🏗️ Expand options for filtering roles

Author: davisshaver

inc/class-wp-rainbow-login-functionality.php

@@ -80,18 +80,21 @@ public function filter_nonce_life_filtered(): int {
 	/**
 	 * Provide filter for address roles. Defaults to subscriber.
 	 *
-	 * @param string $address Address for user.
+	 * @param string        $address Address for user.
+	 * @param string        $filtered_infura_id Filtered Infura ID.
+	 * @param WP_User|false $user User object, if available.
 	 *
-	 * @return mixed|void Filtered role for a given address.
+	 * @return string Filtered role for a given address.
 	 */
-	public function get_role_for_address_filtered( string $address ) {
+	public function get_role_for_address_filtered( string $address, string $filtered_infura_id, $user ): string {
 		/**
 		 * Filter the default role for WP Rainbow users.
 		 *
-		 * @param string $default Default role for new users.
-		 * @param string $address Address of user being added.
+		 * @param string        $default Default role for new users.
+		 * @param string        $address Address of user being added.
+		 * @param WP_User|false $user User object, if available.
 		 */
-		return apply_filters( 'wp_rainbow_role_for_address', 'subscriber', $address );
+		return apply_filters( 'wp_rainbow_role_for_address', 'subscriber', $address, $filtered_infura_id, $user );
 	}
 
 	// API ROUTES.
@@ -229,10 +232,12 @@ public function login_callback( WP_REST_Request $request ): WP_REST_Response {
 				]
 			);
 
-			if ( ! empty( $wp_rainbow_options['wp_rainbow_field_required_token'] ) && ! empty( $wp_rainbow_options['wp_rainbow_field_infura_id'] ) ) {
+			$filtered_infura_id = WP_Rainbow::instance()->get_infura_id_filtered();
+
+			if ( ! empty( $wp_rainbow_options['wp_rainbow_field_required_token'] ) && ! empty( $filtered_infura_id ) ) {
 				// @TODO Figure out if ABI should be an option (or formatted differently).
 				$example_abi = '[{"constant":true,"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"}]';
-				$contract    = new Contract( 'https://mainnet.infura.io/v3/' . $wp_rainbow_options['wp_rainbow_field_infura_id'], $example_abi );
+				$contract    = new Contract( 'https://mainnet.infura.io/v3/' . $filtered_infura_id, $example_abi );
 				$contract->at( $wp_rainbow_options['wp_rainbow_field_required_token'] )->call(
 					'balanceOf',
 					$address,
@@ -247,6 +252,8 @@ function ( $err, $balance ) use ( $wp_rainbow_options ) {
 			// Lookup or generate user and then sign them in.
 			$user                   = get_user_by( 'login', $address );
 			$sanitized_display_name = sanitize_text_field( $display_name );
+			$role                   = $this->get_role_for_address_filtered( $address, $filtered_infura_id, $user );
+
 			if ( ! $user ) {
 				// If there's not a user already, double check registration settings.
 				$users_can_register = get_option( 'users_can_register', false );
@@ -262,7 +269,7 @@ function ( $err, $balance ) use ( $wp_rainbow_options ) {
 				wp_update_user(
 					[
 						'ID'           => $user->ID,
-						'role'         => $this->get_role_for_address_filtered( $address ),
+						'role'         => $role,
 						'display_name' => $sanitized_display_name,
 					]
 				);
@@ -278,20 +285,22 @@ function ( $err, $balance ) use ( $wp_rainbow_options ) {
 				 */
 				do_action( 'wp_rainbow_user_created', $user->ID, $address, $sanitized_display_name );
 
-			} elseif ( $user->display_name !== $sanitized_display_name ) {
+			} else {
 				wp_update_user(
 					[
 						'ID'           => $user->ID,
 						'display_name' => $sanitized_display_name,
 					]
 				);
 
+				$user->set_role( $role );
+
 				/**
-				 * Fires when a WP Rainbow user's display name is updated.
+				 * Fires when a WP Rainbow user's is updated on login.
 				 *
-				 * @param int $user_id ID of new user account.
-				 * @param string $address Address of new user.
-				 * @param string $sanitized_display_name Display name of new user (either ENS or address).
+				 * @param int $user_id ID of existing user account.
+				 * @param string $address Address of existing user.
+				 * @param string $sanitized_display_name Display name of existing user (either ENS or address).
 				 */
 				do_action( 'wp_rainbow_user_updated', $user->ID, $address, $sanitized_display_name );
 			}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wp-rainbow",
-	"version": "0.2.10",
+	"version": "0.2.11",
 	"description": "RainbowKit Login (Web3 Integration for Sign-In With Ethereum)",
 	"author": "Davis Shaver",
 	"license": "GPL-2.0-or-later",

readme.txt

@@ -4,7 +4,7 @@ Tags: WordPress, web3, SIWE, Ethereum, RainbowKit, Sign-In With Ethereum
 Tested up to: 6.0
 Requires at least: 5.9
 Requires PHP: 7.0
-Stable tag: 0.2.8
+Stable tag: 0.2.11
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -45,6 +45,9 @@ Find reference implementations of all filters in [example plugin here](https://g
 
 == Changelog ==
 
+= 0.2.11 =
+* Enhance options for filtering roles
+
 = 0.2.10 =
 * Add RainbowKit Cool Mode support
 

src/connect.jsx

@@ -113,9 +113,29 @@ export function WPRainbowConnect( {
 					window.location = redirectURL || REDIRECT_URL || ADMIN_URL;
 				}
 			} else {
-				const error = await verifyRes.json();
-				onError( error );
-				setState( ( x ) => ( { ...x, error, loading: false } ) );
+				// Handle errors as strings or as encoded JSON strings.
+				let parsedError = null;
+				const rawError = await verifyRes.json();
+				try {
+					parsedError = JSON.parse( rawError );
+				} catch {
+					parsedError = rawError;
+				}
+				if ( typeof parsedError === 'string' ) {
+					onError( parsedError );
+					setState( ( x ) => ( {
+						...x,
+						error: parsedError,
+						loading: false,
+					} ) );
+				} else if ( typeof parsedError === 'object' ) {
+					if (
+						parsedError?.type === 'redirect' &&
+						parsedError.redirectURL
+					) {
+						window.location = parsedError.redirectURL;
+					}
+				}
 			}
 		} catch ( error ) {
 			setState( ( x ) => ( { ...x, error, loading: false } ) );

wp-rainbow.php

@@ -10,7 +10,7 @@
  * Plugin Name:       RainbowKit Login (Web3 Integration for Sign-In With Ethereum)
  * Plugin URI:        https://wp-rainbow.davisshaver.com/
  * Description:       RainbowKit Login allows WordPress users to log in with Ethereum using the Sign-In With Ethereum standard, powered by RainbowKit.
- * Version:           0.2.10
+ * Version:           0.2.11
  * Author:            Davis Shaver
  * Author URI:        https://davisshaver.com/
  * License:           GPL v2 or later
@@ -27,7 +27,7 @@
  *
  * @var string
  */
-define( 'WP_RAINBOW_ASSETS_VERSION', '0.2.8' );
+define( 'WP_RAINBOW_ASSETS_VERSION', '0.2.11' );
 
 // Include the autoloader.
 add_action(