Skip to content

Commit

Permalink
Revisions to allow better testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshcanhelp
joshcanhelp committed Sep 17, 2018
1 parent 25f84b7 commit a746b2d
Show file tree
Hide file tree
Showing 12 changed files with 529 additions and 222 deletions.
10 changes: 9 additions & 1 deletion WP_Auth0.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,15 @@ public function init() {
$this->social_amplificator = new WP_Auth0_Amplificator( $this->db_manager, $this->a0_options );
$this->social_amplificator->init();

$edit_profile = new WP_Auth0_EditProfile( $this->db_manager, $users_repo, $this->a0_options );
$api_change_password = new WP_Auth0_Api_Change_Password( $this->a0_options );
$api_delete_mfa = new WP_Auth0_Api_Delete_User_Mfa( $this->a0_options );
$edit_profile = new WP_Auth0_EditProfile(
$this->db_manager,
$users_repo,
$this->a0_options,
$api_change_password,
$api_delete_mfa
);
$edit_profile->init();

WP_Auth0_Email_Verification::init();
Expand Down
14 changes: 9 additions & 5 deletions assets/js/edit-user-profile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jQuery(function($) {
/**
* Hide the password field if not an Auth0 strategy.
*/
if ( passwordFieldRow.length && 'auth0' !== wpa0UserProfile.userStrategy ) {
if ( passwordFieldRow.length && wpa0UserProfile.userStrategy && 'auth0' !== wpa0UserProfile.userStrategy ) {
passwordFieldRow.hide();
}

/**
* Disable email changes if not an Auth0 connection.
*/
if ( emailField.length && 'auth0' !== wpa0UserProfile.userStrategy ) {
if ( emailField.length && wpa0UserProfile.userStrategy && 'auth0' !== wpa0UserProfile.userStrategy ) {
emailField.prop( 'disabled', true );
$('<p>' + wpa0UserProfile.i18n.cannotChangeEmail + '</p>')
.addClass('description')
Expand Down Expand Up @@ -57,18 +57,22 @@ jQuery(function($) {
function userProfileAjaxAction( uiControl, action, nonce ) {
var postData = {
'action' : action,
'nonce' : nonce,
'_ajax_nonce' : nonce,
'user_id' : wpa0UserProfile.userId
};
var errorMsg = wpa0UserProfile.i18n.actionFailed;
uiControl.prop( 'disabled', true );
$.post(
wpa0UserProfile.ajaxUrl,
postData,
function(response) {
if ( parseInt( response, 10 ) > 0 ) {
if ( response.success ) {
uiControl.val(wpa0UserProfile.i18n.actionComplete);
} else {
alert(wpa0UserProfile.i18n.actionFailed);
if (response.data && response.data.error) {
errorMsg = response.data.error;
}
alert(errorMsg);
uiControl.prop( 'disabled', false );
}
}
Expand Down
5 changes: 2 additions & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
"phpcbf-tests": "./vendor/bin/phpcbf --standard=phpcs-test-ruleset.xml -s ./tests/",
"phpcbf-path": "SHELL_INTERACTIVE=1 ./vendor/bin/phpcbf --standard=phpcs-ruleset.xml",
"sniffs": "./vendor/bin/phpcs --standard=phpcs-ruleset.xml -e",
"test": "./vendor/bin/phpunit --coverage-text",
"test-ci": "./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml",
"test-path": "SHELL_INTERACTIVE=1 ./vendor/bin/phpunit"
"test": "SHELL_INTERACTIVE=1 ./vendor/bin/phpunit --coverage-text --verbose",
"test-ci": "./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml"
}
}
120 changes: 68 additions & 52 deletions lib/WP_Auth0_EditProfile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,41 @@ class WP_Auth0_EditProfile {
*/
protected $a0_options;

/**
* WP_Auth0_Api_Change_Password instance.
*
* @var WP_Auth0_Api_Change_Password
*/
protected $api_change_password;

/**
* WP_Auth0_Api_Delete_User_Mfa instance.
*
* @var WP_Auth0_Api_Delete_User_Mfa
*/
protected $api_delete_mfa;

/**
* WP_Auth0_EditProfile constructor.
*
* @param WP_Auth0_DBManager $db_manager - WP_Auth0_DBManager instance.
* @param WP_Auth0_UsersRepo $users_repo - WP_Auth0_UsersRepo instance.
* @param WP_Auth0_Options $a0_options - WP_Auth0_Options instance.
* @param WP_Auth0_DBManager $db_manager - WP_Auth0_DBManager instance.
* @param WP_Auth0_UsersRepo $users_repo - WP_Auth0_UsersRepo instance.
* @param WP_Auth0_Options $a0_options - WP_Auth0_Options instance.
* @param WP_Auth0_Api_Change_Password $api_change_password - WP_Auth0_Api_Change_Password instance.
* @param WP_Auth0_Api_Delete_User_Mfa $api_delete_mfa - WP_Auth0_Api_Delete_User_Mfa instance.
*/
public function __construct(
WP_Auth0_DBManager $db_manager,
WP_Auth0_UsersRepo $users_repo,
WP_Auth0_Options $a0_options
WP_Auth0_Options $a0_options,
WP_Auth0_Api_Change_Password $api_change_password,
WP_Auth0_Api_Delete_User_Mfa $api_delete_mfa
) {
$this->a0_options = $a0_options;
$this->users_repo = $users_repo;
$this->db_manager = $db_manager;
$this->db_manager = $db_manager;
$this->users_repo = $users_repo;
$this->a0_options = $a0_options;
$this->api_change_password = $api_change_password;
$this->api_delete_mfa = $api_delete_mfa;
}

/**
Expand Down Expand Up @@ -71,6 +91,8 @@ public function init() {
/**
* Enqueue styles and scripts for the user profile edit screen.
* Hooked to: admin_enqueue_scripts
*
* @codeCoverageIgnore
*/
public function admin_enqueue_scripts() {
global $user_id;
Expand All @@ -83,7 +105,7 @@ public function admin_enqueue_scripts() {
);

$profile = get_auth0userinfo( $user_id );
$strategy = isset( $profile->sub ) ? $this->get_auth0_strategy( $profile->sub ) : '';
$strategy = isset( $profile->sub ) ? WP_Auth0_Users::get_strategy( $profile->sub ) : '';

wp_localize_script(
'wpa0_user_profile',
Expand Down Expand Up @@ -111,13 +133,14 @@ public function admin_enqueue_scripts() {
*
* @param WP_Error $errors - WP_Error object to use if validation fails.
* @param boolean|WP_User $user - Boolean update or WP_User instance, depending on action.
*
* @return boolean
*/
public function validate_new_password( $errors, $user ) {
global $wpdb;

// Exit if we're not changing the password.
if ( empty( $_POST['pass1'] ) ) {
return;
return false;
}
$new_password = $_POST['pass1'];

Expand All @@ -126,28 +149,28 @@ public function validate_new_password( $errors, $user ) {
} elseif ( is_object( $user ) && $user instanceof WP_User ) {
$wp_user_id = absint( $user->ID );
} else {
return;
return false;
}

// Exit if this is not an Auth0 user.
// TODO: Replace the call below with WP_Auth0_UsersRepo::get_meta() when rebased.
$auth0_id = get_user_meta( $wp_user_id, $wpdb->prefix . 'auth0_id', true );
$auth0_id = WP_Auth0_UsersRepo::get_meta( $wp_user_id, 'auth0_id' );
if ( empty( $auth0_id ) ) {
return;
return false;
}
$strategy = $this->get_auth0_strategy( $auth0_id );
$strategy = WP_Auth0_Users::get_strategy( $auth0_id );

// Exit if this is not a database strategy user.
if ( 'auth0' !== $strategy ) {
return;
return false;
}

$change_password = new WP_Auth0_Api_Change_Password( $this->a0_options, $auth0_id );
$result = $change_password->call( array( 'password' => $new_password ) );
$result = $this->api_change_password
->init_path( $auth0_id )
->call( array( 'password' => $new_password ) );

// Password change was successful, nothing else to do.
if ( true === $result ) {
return;
return true;
}

// Password change was unsuccessful so don't change WP user account.
Expand All @@ -158,10 +181,13 @@ public function validate_new_password( $errors, $user ) {
// Add an error message to appear at the top of the page.
$error_msg = is_string( $result ) ? $result : __( 'Password could not be updated.', 'wp-auth0' );
$errors->add( 'auth0_password', $error_msg, array( 'form-field' => 'pass1' ) );
return false;
}

/**
* TODO: Deprecate, moved to WP_Auth0_EditProfile::validate_new_password()
*
* @codeCoverageIgnore
*/
public function update_change_password() {
$current_user = get_currentauth0user();
Expand Down Expand Up @@ -217,49 +243,50 @@ public function update_change_password() {
* Hooked to: wp_ajax_auth0_delete_data
*/
public function delete_user_data() {

if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'delete_auth0_identity' ) ) {
exit( '0' );
}
check_ajax_referer( 'delete_auth0_identity' );

if ( empty( $_POST['user_id'] ) ) {
exit( '0' );
wp_send_json_error( array( 'error' => __( 'Empty user_id', 'wp-auth0' ) ) );
}

$user_id = $_POST['user_id'];

if ( ! current_user_can( 'edit_users', $user_id ) ) {
exit( '0' );
if ( ! current_user_can( 'edit_users' ) ) {
wp_send_json_error( array( 'error' => __( 'Forbidden', 'wp-auth0' ) ) );
}

$this->users_repo->delete_auth0_object( $user_id );
exit( '1' );
wp_send_json_success();
}

/**
* AJAX function to delete the MFA provider at Auth0.
* Hooked to: wp_ajax_auth0_delete_data
*/
public function delete_mfa() {

if ( empty( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'delete_auth0_mfa' ) ) {
exit( '0' );
}
check_ajax_referer( 'delete_auth0_mfa' );

if ( empty( $_POST['user_id'] ) ) {
exit( '0' );
wp_send_json_error( array( 'error' => __( 'Empty user_id', 'wp-auth0' ) ) );
}

$user_id = $_POST['user_id'];

if ( ! current_user_can( 'edit_users', $user_id ) ) {
exit( '0' );
wp_send_json_error( array( 'error' => __( 'Forbidden', 'wp-auth0' ) ) );
}

$profile = get_auth0userinfo( $user_id );
$delete_user_mfa = new WP_Auth0_Api_Delete_User_Mfa( $this->a0_options, $profile->sub );
echo intval( $delete_user_mfa->call() );
exit;
$profile = get_auth0userinfo( $user_id );

if ( ! $profile || empty( $profile->sub ) ) {
wp_send_json_error( array( 'error' => __( 'Auth0 profile data not found', 'wp-auth0' ) ) );
}

if ( $this->api_delete_mfa->init_path( $profile->sub )->call() ) {
wp_send_json_success();
} else {
wp_send_json_error( array( 'error' => __( 'API call failed', 'wp-auth0' ) ) );
}
}

/**
Expand Down Expand Up @@ -326,6 +353,8 @@ public function show_delete_mfa() {

/**
* TODO: Deprecate, moved to edit-user-profile.js
*
* @codeCoverageIgnore
*/
public function show_change_password() {
$current_user = get_currentauth0user();
Expand Down Expand Up @@ -373,6 +402,8 @@ public function show_change_password() {

/**
* TODO: Deprecate, moved to edit-user-profile.js
*
* @codeCoverageIgnore
*/
public function disable_email_field() {
$current_user = get_currentauth0user();
Expand Down Expand Up @@ -500,19 +531,4 @@ public function override_email_update() {
}
}
}

/**
* Get the strategy from an Auth0 user ID.
*
* @param string $auth0_id - Auth0 user ID.
*
* @return string
*/
private function get_auth0_strategy( $auth0_id ) {
if ( false === strpos( $auth0_id, '|' ) ) {
return '';
}
$auth0_id_parts = explode( '|', $auth0_id );
return $auth0_id_parts[0];
}
}
15 changes: 15 additions & 0 deletions lib/WP_Auth0_Users.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,19 @@ public static function create_user( $userinfo, $role = null ) {
// Return the user ID
return $user_id;
}

/**
* Get the strategy from an Auth0 user ID.
*
* @param string $auth0_id - Auth0 user ID.
*
* @return string
*/
public static function get_strategy( $auth0_id ) {
if ( false === strpos( $auth0_id, '|' ) ) {
return '';
}
$auth0_id_parts = explode( '|', $auth0_id );
return $auth0_id_parts[0];
}
}
1 change: 1 addition & 0 deletions lib/api/WP_Auth0_Api_Abstract.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ protected function set_bearer( $scope ) {
}
}

// Could not decode the stored API token or none was found so try to get one via API.
if ( ! $this->api_token_decoded ) {
$client_credentials = new WP_Auth0_Api_Client_Credentials( $this->options );
$this->api_token = $client_credentials->call();
Expand Down
13 changes: 7 additions & 6 deletions lib/api/WP_Auth0_Api_Change_Password.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* Class WP_Auth0_Api_Change_Password to perform a client credentials grant.
*/
final class WP_Auth0_Api_Change_Password extends WP_Auth0_Api_Abstract {
class WP_Auth0_Api_Change_Password extends WP_Auth0_Api_Abstract {

/**
* Default value to return on failure.
Expand All @@ -27,14 +27,15 @@ final class WP_Auth0_Api_Change_Password extends WP_Auth0_Api_Abstract {
protected $token_decoded = null;

/**
* WP_Auth0_Api_Change_Password constructor.
* Set the User ID to change.
*
* @param WP_Auth0_Options $options - WP_Auth0_Options instance.
* @param string $user_id - Auth0 user ID to update.
* @param string $user_id - Auth0 user ID.
*
* @return WP_Auth0_Api_Change_Password
*/
public function __construct( WP_Auth0_Options $options, $user_id ) {
parent::__construct( $options );
public function init_path( $user_id ) {
$this->set_path( 'api/v2/users/' . rawurlencode( $user_id ) );
return $this;
}

/**
Expand Down
11 changes: 1 addition & 10 deletions lib/api/WP_Auth0_Api_Client_Credentials.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,14 @@ final class WP_Auth0_Api_Client_Credentials extends WP_Auth0_Api_Abstract {
*/
protected $token_decoded = null;

/**
* WP_Auth0_Api_Client_Credentials constructor.
*
* @param WP_Auth0_Options $options - WP_Auth0_Options instance.
*/
public function __construct( WP_Auth0_Options $options ) {
parent::__construct( $options );
$this->set_path( 'oauth/token' );
}

/**
* Set body data, make the API call, and handle the response.
*
* @return mixed|null
*/
public function call() {
return $this
->set_path( 'oauth/token' )
->send_client_id()
->send_client_secret()
->send_audience( 'api/v2/' )
Expand Down
Loading

0 comments on commit a746b2d

Please sign in to comment.