Skip to content

Allow get_user_role_from_sso to be filtered in multisite mode #96

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

Allow get_user_role_from_sso to be filtered in multisite mode #96

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
14 changes: 4 additions & 10 deletions inc/namespace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,27 +798,21 @@ function get_user_roles_from_sso( \WP_User $user, array $attributes ) {
$roles = (array) apply_filters( 'wpsimplesaml_map_role', get_option( 'default_role' ), $attributes, $user->ID, $user );
$roles = array_unique( array_filter( $roles ) );

if ( empty( $roles ) ) {
return [];
}

if ( is_sso_enabled_network_wide() ) {
$network_roles = [];

// If this is a multisite, the roles array may contain a 'network' key and a 'sites' key. Otherwise, if
// it is a flat array, use it to add the roles for all sites
if ( is_numeric( key( $roles ) ) ) { // Not an associative array ?
if ( is_array( current( $roles ) ) ) {
// Nested array? then it is a `sites` definition, expect array of roles for each site
$network_roles['sites'] = $roles;
$roles = [ 'sites' => $roles ];
} else {
// Flat array of strings ? then expect it is roles to apply on all sites
$network_roles['network'] = $roles;
$roles = [ 'network' => $roles ];
}
} elseif ( ! isset( $roles['network'] ) && ! isset( $roles['sites'] ) ) { // Associative but no 'network' or 'sites' keys ?
$network_roles = [];
$roles = [];
}
}

return $network_roles ?? (array) $roles;
return $roles;
}