Skip to content
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.

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

Extract creation and storage of the access token into its own method. #185

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
40 changes: 28 additions & 12 deletions lib/class-wp-rest-oauth1.php
Original file line number Diff line number Diff line change
Expand Up @@ -587,24 +587,40 @@ public function generate_access_token( $params ) {
}

// Issue access token
$access_token = self::create_access_token( $consumer, $token['user'] );

// Delete the request token
$this->remove_request_token( $params['oauth_token'] );

// Return the new token's data
$data = array(
'oauth_token' => self::urlencode_rfc3986( $access_token['key'] ),
'oauth_token_secret' => self::urlencode_rfc3986( $access_token['secret'] ),
);
return $data;
}

/**
* Creates new access token
*
* This function is invoked by WP_REST_OAuth1::generate_access_token() and
* handles the actual creation and storage of the access token.
*
* @param WP_Post $consumer
* @param int $user_id
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation is off in a couple of places here.

* @return array Array of token data on success
*/
public static function create_access_token( $consumer, $user_id ) {
$key = apply_filters( 'json_oauth1_access_token_key', wp_generate_password( self::TOKEN_KEY_LENGTH, false ) );
$data = array(
'key' => $key,
'secret' => wp_generate_password( self::TOKEN_SECRET_LENGTH, false ),
'consumer' => $consumer->ID,
'user' => $token['user'],
'user' => $user_id,
);
$data = apply_filters( 'json_oauth1_access_token_data', $data );
add_option( 'oauth1_access_' . $key, $data, null, 'no' );

// Delete the request token
$this->remove_request_token( $params['oauth_token'] );

// Return the new token's data
$data = array(
'oauth_token' => self::urlencode_rfc3986( $key ),
'oauth_token_secret' => self::urlencode_rfc3986( $data['secret'] ),
);
return $data;
}

Expand Down Expand Up @@ -783,13 +799,13 @@ public function check_oauth_timestamp_and_nonce( $consumer, $timestamp, $nonce )
return new WP_Error( 'json_oauth1_nonce_already_used', __( 'Invalid nonce - nonce has already been used', 'rest_oauth1' ), array( 'status' => 401 ) );

$used_nonces[ $timestamp ] = $nonce;

// Get the current time
$current_time = time();

// Remove expired nonces
foreach ( $used_nonces as $nonce_timestamp => $nonce ) {

// If the nonce timestamp is expired
if ( $nonce_timestamp < $current_time - $valid_window )
unset( $used_nonces[ $nonce_timestamp ] );
Expand Down