Skip to content

Added support for updating user attrs on subsequent logins #58

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
askvortsov1 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added support for updating user attrs on subsequent logins #58

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fe4ec8
Added support for updating user attrs on subsequent logins
askvortsov1 Dec 10, 2019
bca601c
Stylistic changes
askvortsov1 Dec 10, 2019
dfdf163
More stylistic conformity changes
askvortsov1 Dec 10, 2019
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
61 changes: 42 additions & 19 deletions inc/namespace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ function bootstrap() {
add_action( 'wpsimplesaml_action_metadata', __NAMESPACE__ . '\\action_metadata' );

add_action( 'wpsimplesaml_user_created', __NAMESPACE__ . '\\map_user_roles', 10, 2 );
add_action( 'wpsimplesaml_user_updated', __NAMESPACE__ . '\\map_user_roles', 10, 2 );

// is_plugin_active_for_network can only be used once the plugin.php file is
// included. More information can be found here:
Expand Down Expand Up @@ -372,32 +373,54 @@ function get_or_create_wp_user( \OneLogin\Saml2\Auth $saml ) {
$user = get_user_by( 'email', $email );
}

$first_name = isset( $map['first_name'], $attributes[ $map['first_name'] ] ) && is_array( $attributes[ $map['first_name'] ] ) ? reset( $attributes[ $map['first_name'] ] ) : '';
$last_name = isset( $map['last_name'], $attributes[ $map['last_name'] ] ) && is_array( $attributes[ $map['last_name'] ] ) ? reset( $attributes[ $map['last_name'] ] ) : '';

$user_data = [
'ID' => null,
'user_login' => isset( $map['user_login'], $attributes[ $map['user_login'] ] ) ? $attributes[ $map['user_login'] ][0] : $saml->getNameId(),
'user_pass' => wp_generate_password(),
'user_nicename' => implode( ' ', array_filter( [ $first_name, $last_name ] ) ),
'first_name' => $first_name,
'last_name' => $last_name,
'user_email' => $email,
];

/**
* Filters user data before insertion to the database
*
* @param array $attributes Attributes array coming from SAML Response object
*
* @return array User data to be used with wp_insert_user
*/
$user_data = apply_filters( 'wpsimplesaml_user_data', $user_data, $attributes );

// No user yet ? lets create a new one.
if ( empty( $user ) ) {

$first_name = isset( $map['first_name'], $attributes[ $map['first_name'] ] ) && is_array( $attributes[ $map['first_name'] ] ) ? reset( $attributes[ $map['first_name'] ] ) : '';
$last_name = isset( $map['last_name'], $attributes[ $map['last_name'] ] ) && is_array( $attributes[ $map['last_name'] ] ) ? reset( $attributes[ $map['last_name'] ] ) : '';
$user_id = wp_insert_user( $user_data );

$user_data = [
'ID' => null,
'user_login' => isset( $map['user_login'], $attributes[ $map['user_login'] ] ) ? $attributes[ $map['user_login'] ][0] : $saml->getNameId(),
'user_pass' => wp_generate_password(),
'user_nicename' => implode( ' ', array_filter( [ $first_name, $last_name ] ) ),
'first_name' => $first_name,
'last_name' => $last_name,
'user_email' => $email,
];
if ( is_wp_error( $user_id ) ) {
return $user_id;
}

$user = get_user_by( 'ID', $user_id );

/**
* Filters user data before insertion to the database
*
* @param array $attributes Attributes array coming from SAML Response object
* Used to handle post-user-creation logic, ie: role mapping
*
* @return array User data to be used with wp_insert_user
* @param \WP_User $user User object
* @param array $attributes SAML Attributes passed from IdP
*/
$user_data = apply_filters( 'wpsimplesaml_user_data', $user_data, $attributes );
do_action( 'wpsimplesaml_user_created', $user, $attributes );
} else {
foreach ( $user_data as $key => $value ) {
if ( ! $value ) {
$user_data[ $key ] = $user->$key;
}
}

$user_id = wp_insert_user( $user_data );
$user_id = wp_update_user( $user_data );

if ( is_wp_error( $user_id ) ) {
return $user_id;
Expand All @@ -406,12 +429,12 @@ function get_or_create_wp_user( \OneLogin\Saml2\Auth $saml ) {
$user = get_user_by( 'ID', $user_id );

/**
* Used to handle post-user-creation logic, ie: role mapping
* Used to handle post-user-update logic, ie: role mapping
*
* @param \WP_User $user User object
* @param array $attributes SAML Attributes passed from IdP
*/
do_action( 'wpsimplesaml_user_created', $user, $attributes );
do_action( 'wpsimplesaml_user_updated', $user, $attributes );
}

if ( ! is_a( $user, 'WP_User' ) ) {
Expand Down