Skip to content

Fix network role mapping #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roborourke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix network role mapping #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions inc/namespace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ function map_user_roles( $user, array $attributes ) {
// Manage super admin flag
if ( is_sso_enabled_network_wide() ) {
if ( isset( $roles['network'] ) && in_array( 'superadmin', $roles['network'], true ) ) {
$roles = array_diff( $roles['network'], [ 'superadmin' ] );
$roles['network'] = array_diff( $roles['network'], [ 'superadmin' ] );

if ( ! is_super_admin( $user->ID ) ) {
grant_super_admin( $user->ID );
Expand All @@ -570,13 +570,15 @@ function map_user_roles( $user, array $attributes ) {

// Add the user to the defined sites, and assign proper role(s)
foreach ( $roles['sites'] as $site_id => $site_roles ) {
switch_to_blog( $site_id );
$user->for_site( $site_id );
$user->set_role( reset( $site_roles ) );
switch_to_blog( (int) $site_id );
$user->for_site( (int) $site_id );
add_user_to_blog( (int) $site_id, $user->ID, reset( $site_roles ) );

foreach ( array_slice( $site_roles, 1 ) as $role ) {
$user->add_role( $role );
}

restore_current_blog();
}
} elseif ( ! isset( $roles['sites'] ) && isset( $roles['network'] ) ) {
$all_site_ids = new \WP_Site_Query( [
Expand All @@ -586,13 +588,15 @@ function map_user_roles( $user, array $attributes ) {
] );

foreach ( $all_site_ids->sites as $site_id ) {
switch_to_blog( $site_id );
$user->for_site( $site_id );
$user->set_role( reset( $roles['network'] ) );
switch_to_blog( (int) $site_id );
$user->for_site( (int) $site_id );
add_user_to_blog( (int) $site_id, $user->ID, reset( $roles['network'] ) );

foreach ( array_slice( $roles['network'], 1 ) as $role ) {
$user->add_role( $role );
}

restore_current_blog();
}
}
} else {
Expand Down