permissions more smoothly.

Author: jkrrv

src/TouchPoint-WP/Auth.php

@@ -10,7 +10,6 @@
 use tp\TouchPointWP\Interfaces\module;
 use tp\TouchPointWP\Utilities\Http;
 use tp\TouchPointWP\Utilities\PersonQuery;
-use tp\TouchPointWP\Utilities\Session;
 use WP_Error;
 use WP_User;
 
@@ -56,7 +55,7 @@ public static function init(): void
 		add_filter('login_redirect', [self::class, 'redirectLoginCompleteMaybe'], 10, 3);
 
 		// If configured, prevent admin bar from appearing for subscribers
-		add_action('after_setup_theme', [self::class, 'removeAdminBarMaybe']);
+		self::removeAdminBarMaybe();
 	}
 
 
@@ -200,7 +199,7 @@ public static function redirectLoginCompleteMaybe(string $redirect_to, ?string $
 		}
 
 		$redirect = TouchPointWP::instance()->settings->auth_change_profile_urls === 'on';
-		$redirect &= !TouchPointWP::userHasEditingPermissions();
+		$redirect &= !TouchPointWP::userHasEditingPermissions($user);
 
 		/**
 		 * Controls whether to redirect to the TouchPoint login automatically.
@@ -210,7 +209,7 @@ public static function redirectLoginCompleteMaybe(string $redirect_to, ?string $
 		$redirect = apply_filters('tp_redirect_after_login', $redirect);
 
 		// if there is no defined redirect page, redirect to the home page
-		if ($redirect && (!isset($_GET['redirect_to']) || $_GET['redirect_to'] == '')) {
+		if ($redirect && $redirect_to == '') {
 			return home_url();
 		}
 
@@ -225,7 +224,7 @@ public static function removeAdminBarMaybe(): void
 	{
 		$removeBar = (TouchPointWP::instance()->settings->auth_prevent_admin_bar === 'on')
 					 && !is_admin()
-					 && !current_user_can('edit_posts');
+					 && !TouchPointWP::userHasEditingPermissions();
 
 		/**
 		 * Allows for hiding the WordPress-provided Admin bar.

src/TouchPoint-WP/TouchPointWP.php

@@ -629,22 +629,20 @@ public static function currentUserIsAdmin(): bool
 	/**
 	 * Determine if the current user can edit *anything* and therefore may need access to wp-admin.
 	 *
-	 * @param int|null $userId
+	 * @param ?WP_User $user
 	 *
 	 * @return bool
 	 */
-	public static function userHasEditingPermissions(?int $userId = null): bool
+	public static function userHasEditingPermissions(?WP_User $user = null): bool
 	{
 		if (!function_exists('get_current_user_id')) {
 			return false;
 		}
 
-		if ($userId === null) {
-			$userId = get_current_user_id();
+		if ($user === null) {
+			$user = get_user(get_current_user_id());
 		}
 
-		$user = get_user($userId);
-
 		if (!$user) {
 			return false;
 		}