| @@ -3,14 +3,13 @@ | ||
| 3 | 3 | namespace ImageOptimization\Modules\Optimization\Rest; |
| 4 | 4 | |
| 5 | 5 | use ImageOptimization\Classes\Async_Operation\Exceptions\Async_Operation_Exception; |
| 6 | 6 | use ImageOptimization\Modules\Optimization\Classes\{ |
| 7 | - Bulk_Optimization_Controller, | |
| 7 | + Bulk_Optimization\Bulk_Optimization_Controller, | |
| 8 | 8 | Route_Base, |
| 9 | 9 | }; |
| 10 | 10 | use ImageOptimization\Classes\Image\Exceptions\Invalid_Image_Exception; |
| 11 | 11 | use ImageOptimization\Classes\Exceptions\Quota_Exceeded_Error; |
| 12 | -use ImageOptimization\Modules\Oauth\Components\Connect; | |
| 13 | 12 | use Throwable; |
| 14 | 13 | use WP_REST_Request; |
| 15 | 14 | use ImageOptimization\Plugin; |
| 16 | 15 | |
| @@ -31,13 +30,17 @@ | ||
| 31 | 30 | return [ 'POST' ]; |
| 32 | 31 | } |
| 33 | 32 | |
| 34 | 33 | public function POST( WP_REST_Request $request ) { |
| 35 | - $this->verify_nonce_and_capability( | |
| 34 | + $error = $this->verify_nonce_and_capability( | |
| 36 | 35 | $request->get_param( self::NONCE_NAME ), |
| 37 | 36 | self::NONCE_NAME |
| 38 | 37 | ); |
| 39 | 38 | |
| 39 | + if ( $error ) { | |
| 40 | + return $error; | |
| 41 | + } | |
| 42 | + | |
| 40 | 43 | if ( ! Plugin::instance()->modules_manager->get_modules( 'connect-manager' )->connect_instance->is_activated() ) { |
| 41 | 44 | return $this->respond_error_json([ |
| 42 | 45 | 'message' => esc_html__( 'Invalid activation', 'image-optimization' ), |
| 43 | 46 | 'code' => 'unauthorized', |
| @@ -73,9 +76,9 @@ | ||
| 73 | 76 | 'code' => 'forbidden', |
| 74 | 77 | ] ); |
| 75 | 78 | } |
| 76 | 79 | |
| 77 | - Bulk_Optimization_Controller::find_images_and_schedule_optimization(); | |
| 80 | + Bulk_Optimization_Controller::create_optimization_queue(); | |
| 78 | 81 | |
| 79 | 82 | return $this->respond_success_json(); |
| 80 | 83 | } |
| 81 | 84 | |
| @@ -91,9 +94,9 @@ | ||
| 91 | 94 | 'code' => 'forbidden', |
| 92 | 95 | ] ); |
| 93 | 96 | } |
| 94 | 97 | |
| 95 | - Bulk_Optimization_Controller::find_optimized_images_and_schedule_reoptimization(); | |
| 98 | + Bulk_Optimization_Controller::create_reoptimization_queue(); | |
| 96 | 99 | |
| 97 | 100 | return $this->respond_success_json(); |
| 98 | 101 | } |
| 99 | 102 | } |