Use the correct variables

This was messed up in a merge previously.

Author: rmccue

lib/class-wp-json-authentication-oauth1.php

@@ -167,7 +167,7 @@ public function authenticate( $user ) {
 		list( $consumer, $user ) = $result;
 
 		// Perform OAuth validation
-		$error = $this->check_oauth_signature( $user, $params, $token );
+		$error = $this->check_oauth_signature( $consumer, $params, $token );
 		if ( is_wp_error( $error ) ) {
 			$this->auth_status = $error;
 			return null;
@@ -180,7 +180,7 @@ public function authenticate( $user ) {
 		}
 
 		$this->auth_status = true;
-		return $user;
+		return $user->ID;
 	}
 
 	/**
@@ -518,10 +518,11 @@ protected function check_oauth_signature( $consumer, $oauth_params, $token = nul
 		}
 		$query_string = implode( '%26', $query_params ); // join with ampersand
 
+		$token = (array) $token;
 		$string_to_sign = $http_method . '&' . $base_request_uri . '&' . $query_string;
 		$key_parts = array(
 			$consumer->secret,
-			( $token ? $token->secret : '' )
+			( $token ? $token['secret'] : '' )
 		);
 		$key = implode( '&', $key_parts );