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.

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

Change access tokens into a post type. #216

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

Change access tokens into a post type. #216

Show file tree
Hide file tree
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
23 changes: 12 additions & 11 deletions admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
function rest_oauth1_profile_section( $user ) {
global $wpdb;

$results = $wpdb->get_col( "SELECT option_value FROM {$wpdb->options} WHERE option_name LIKE 'oauth1_access_%'", 0 );
$approved = array();
foreach ( $results as $result ) {
$row = unserialize( $result );
if ( $row['user'] === $user->ID ) {
$approved[] = $row;
}
}

$post_list = get_posts( array(
'author' => $user->ID,
'post_type' => 'oauth1_access_token',
'posts_per_page' => 100,
'suppress_filters' => false,

) );
$approved = array();
$authenticator = new WP_REST_OAuth1();

foreach ( $post_list as $result ) {
$approved[] = $authenticator->get_access_token( $result->post_name );
}
?>
<table class="form-table">
<table class="form-table">
<tbody>
<tr>
<th scope="row"><?php _e( 'Authorized Applications', 'rest_oauth1' ) ?></th>
Expand Down
71 changes: 60 additions & 11 deletions lib/class-wp-rest-oauth1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,11 +533,36 @@ public function remove_request_token( $key ) {
*/
public function get_access_token( $oauth_token ) {
$data = get_option( 'oauth1_access_' . $oauth_token, null );
if ( empty( $data ) ) {
if ( ! empty( $data ) ) {
$this->create_access_token( $data['key'], $data['consumer'], $data['user'], $data['secret'] );
}

$post = get_page_by_path( $oauth_token, ARRAY_A, 'oauth1_access_token' );

if ( ! $post ) {
return null;
}

return $data;
$map = [
'post_name' => 'key',
'post_content' => 'secret',
'post_parent' => 'consumer',
'post_author' => 'user',
'ID' => 'post_id',
];


$token = [];

foreach ( $map as $new_key => $old_key ) {
$token[ $old_key ] = $post[ $new_key ];
}
$post_meta = get_post_meta( $post->ID );
foreach ( $post_meta as $meta_key => $meta_value ) {
$token[ $old_key ] = array_shift( $meta_value );
}

return $token;
}

/**
Expand Down Expand Up @@ -588,14 +613,12 @@ public function generate_access_token( $params ) {

// Issue access token
$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'],
);
$data = apply_filters( 'json_oauth1_access_token_data', $data );
add_option( 'oauth1_access_' . $key, $data, null, 'no' );

$access_token = $this->create_access_token( $key, $consumer->ID, $token['user'] );

if ( is_wp_error( $access_token ) ) {
return $access_token;
}

// Delete the request token
$this->remove_request_token( $params['oauth_token'] );
Expand All @@ -608,6 +631,32 @@ public function generate_access_token( $params ) {
return $data;
}

/**
* @param $key
* @param $consumer
* @param $user
*/
public function create_access_token( $key, $consumer, $user, $password = false, $meta = [] ) {
$password = ( $password ) ? $password : wp_generate_password( self::TOKEN_SECRET_LENGTH, false );
$data = [
'post_name' => $key,
'post_content' => $password,
'post_parent' => $consumer,
'post_author' => $user,
'post_type' => 'oauth1_access_token',
];

$post_id = wp_insert_post( $data );
if ( is_wp_error( $post_id ) ) {
return $post_id;
}
$meta_keys = apply_filters( 'json_oauth1_access_token_data', $meta );
foreach ( $meta_keys as $meta_key => $meta_value ) {
add_post_meta( $post_id, $meta_key, $meta_value );
}
return true;
}

/**
* Revoke an access token
*
Expand All @@ -620,7 +669,7 @@ public function revoke_access_token( $key ) {
return new WP_Error( 'json_oauth1_invalid_token', __( 'Access token does not exist', 'rest_oauth1' ), array( 'status' => 401 ) );
}

delete_option( 'oauth1_access_' . $key );
wp_delete_post( $data['post_id'], true );
do_action( 'json_oauth1_revoke_token', $data, $key );

return true;
Expand Down
12 changes: 12 additions & 0 deletions oauth-server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@ function rest_oauth1_setup_authentication() {
'delete_with_user' => true,
'query_var' => false,
) );

register_post_type( 'oauth1_access_token', array(
'labels' => array(
'name' => __( 'Access Token', 'rest_oauth1' ),
'singular_name' => __( 'Access Tokens', 'rest_oauth1' ),
),
'public' => false,
'hierarchical' => false,
'rewrite' => false,
'delete_with_user' => true,
'query_var' => false,
) );
}
add_action( 'init', 'rest_oauth1_setup_authentication' );

Expand Down