Changeset 619230

Timestamp:

10/30/2012 09:59:57 PM (13 years ago)

Author:

jascott

Message:

OAuth fix for non-browser authorize validation

File:

• kickpress/trunk/kickpress-oauth.php (modified) (6 diffs)

kickpress/trunk/kickpress-oauth.php

@@ -448 +448 @@
                     
                     $authorize = strtolower( $query['authorize'] );
-                    unset( $query['authorize'] );
+                    
+                    $return_query = array( 'oauth_token' => $query['oauth_token'] );
                     
                     // Check for prior authorization
@@ -457 +458 @@
                         update_option( $option, $oauth );
                         
-                        $query['oauth_verifier'] = $oauth->oauth_verifier;
+                        $return_query['oauth_verifier'] = $oauth->oauth_verifier;
                         
                         $is_blog_user = false;
@@ -475 +476 @@
                             add_user_to_blog( $blog_id, $user_id, 'subscriber' );
                     } elseif ( 'no' == $authorize ) {
-                        $query['oauth_error'] = 'Denied access by user';
+                        $return_query['oauth_error'] = 'Denied access by user';
                     } else {
                         self::authorize_form( $args );
@@ -482 +483 @@
                     
                     if ( kickpress_is_remote_app() ) {
-                        unset( $query['login'], $query['password'] );
-                        die( self::normalize_params( $query ) );
+                        die( self::normalize_params( $return_query ) );
                     }
                     
                     $url = $oauth->oauth_callback . '?'
-                         . http_build_query( $query );
+                         . http_build_query( $return_query );
                     
                     header( 'Location: ' . $url );
@@ -596 +596 @@
                                 array( 'oauth_token' => $token ) );
                             
+                            $option = sprintf( 'kickpress_oauth_request_token_%x',
+                                hexdec( kickpress_app_hash( 'crc32', $token ) ) );
+                            
                             if ( $meta = @array_shift( $meta ) ) {
                                 $token        = $meta->oauth_token;
@@ -602 +605 @@
                                 $consumer->set_user_id( $meta->user_id );
                                 $consumer->set_blog_id( $meta->blog_id );
+                            } elseif ( $option = get_option( $option, null ) ) {
+                                $token        = $option->oauth_token;
+                                $token_secret = $option->oauth_token_secret;
                             }
                         }