| @@ -250,9 +250,9 @@ | ||
| 250 | 250 | public function refresh_token( WP_REST_Request $request ): WP_REST_Response { |
| 251 | 251 | $refresh_token = $request->get_param( 'refresh_token' ); |
| 252 | 252 | |
| 253 | 253 | if ( empty( $refresh_token ) ) { |
| 254 | - return rest_ensure_response( | |
| 254 | + return new WP_REST_Response( | |
| 255 | 255 | array( |
| 256 | 256 | 'error' => 'invalid_request', |
| 257 | 257 | 'error_description' => 'Missing refresh_token parameter', |
| 258 | 258 | ), |
| @@ -276,9 +276,9 @@ | ||
| 276 | 276 | } elseif ( false !== strpos( $error_code, 'user_not_found' ) ) { |
| 277 | 277 | $oauth_error = 'invalid_grant'; |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | - return rest_ensure_response( | |
| 280 | + return new WP_REST_Response( | |
| 281 | 281 | array( |
| 282 | 282 | 'error' => $oauth_error, |
| 283 | 283 | 'error_description' => $error_msg, |
| 284 | 284 | ), |
| @@ -346,9 +346,9 @@ | ||
| 346 | 346 | $jti = $request->get_param( 'jti' ); |
| 347 | 347 | $user_id = $request->get_param( 'user_id' ); |
| 348 | 348 | |
| 349 | 349 | if ( empty( $jti ) || empty( $user_id ) ) { |
| 350 | - return rest_ensure_response( | |
| 350 | + return new WP_REST_Response( | |
| 351 | 351 | array( |
| 352 | 352 | 'success' => false, |
| 353 | 353 | 'message' => /* translators: REST API schema field label or error message. */ __( 'Missing required parameters.', 'woocommerce-pos' ), |
| 354 | 354 | ), |
| @@ -369,9 +369,9 @@ | ||
| 369 | 369 | ) |
| 370 | 370 | ); |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | - return rest_ensure_response( | |
| 373 | + return new WP_REST_Response( | |
| 374 | 374 | array( |
| 375 | 375 | 'success' => false, |
| 376 | 376 | 'message' => __( 'Failed to revoke session.', 'woocommerce-pos' ), |
| 377 | 377 | ), |
| @@ -390,9 +390,9 @@ | ||
| 390 | 390 | $user_id = $request->get_param( 'user_id' ); |
| 391 | 391 | $except_current = $request->get_param( 'except_current' ); |
| 392 | 392 | |
| 393 | 393 | if ( empty( $user_id ) ) { |
| 394 | - return rest_ensure_response( | |
| 394 | + return new WP_REST_Response( | |
| 395 | 395 | array( |
| 396 | 396 | 'success' => false, |
| 397 | 397 | 'message' => /* translators: REST API schema field label or error message. */ __( 'Missing user_id parameter.', 'woocommerce-pos' ), |
| 398 | 398 | ), |
| @@ -406,9 +406,9 @@ | ||
| 406 | 406 | // Get current JTI from request. |
| 407 | 407 | $current_jti = $this->get_current_jti_from_request( $request ); |
| 408 | 408 | |
| 409 | 409 | if ( empty( $current_jti ) ) { |
| 410 | - return rest_ensure_response( | |
| 410 | + return new WP_REST_Response( | |
| 411 | 411 | array( |
| 412 | 412 | 'success' => false, |
| 413 | 413 | 'message' => __( 'Could not determine current session.', 'woocommerce-pos' ), |
| 414 | 414 | ), |
| @@ -429,9 +429,9 @@ | ||
| 429 | 429 | ) |
| 430 | 430 | ); |
| 431 | 431 | } |
| 432 | 432 | |
| 433 | - return rest_ensure_response( | |
| 433 | + return new WP_REST_Response( | |
| 434 | 434 | array( |
| 435 | 435 | 'success' => false, |
| 436 | 436 | 'message' => __( 'Failed to revoke sessions.', 'woocommerce-pos' ), |
| 437 | 437 | ), |
| @@ -446,18 +446,12 @@ | ||
| 446 | 446 | * |
| 447 | 447 | * @return WP_REST_Response |
| 448 | 448 | */ |
| 449 | 449 | public function get_all_users_sessions( WP_REST_Request $request ): WP_REST_Response { |
| 450 | - global $wpdb; | |
| 451 | - | |
| 452 | 450 | $auth_service = AuthService::instance(); |
| 453 | 451 | |
| 454 | 452 | // Get all users who have refresh tokens. |
| 455 | - $user_ids = $wpdb->get_col( | |
| 456 | - "SELECT DISTINCT user_id | |
| 457 | - FROM {$wpdb->usermeta} | |
| 458 | - WHERE meta_key = '_woocommerce_pos_refresh_tokens'" | |
| 459 | - ); | |
| 453 | + $user_ids = $auth_service->sessions()->users_with_sessions(); | |
| 460 | 454 | |
| 461 | 455 | $users_data = array(); |
| 462 | 456 | |
| 463 | 457 | // Get current JTI if available from the request token. |