| @@ -1,21 +1,23 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -namespace ImageOptimizer\Modules\Oauth\Rest; | |
| 3 | +namespace ImageOptimization\Modules\Oauth\Rest; | |
| 4 | 4 | |
| 5 | -use ImageOptimizer\Classes\Utils; | |
| 6 | -use ImageOptimizer\Modules\Oauth\Classes\{ | |
| 7 | - Data, | |
| 8 | - Route_Base | |
| 5 | +use ImageOptimization\Modules\Oauth\{ | |
| 6 | + Classes\Route_Base, | |
| 7 | + Components\Connect, | |
| 9 | 8 | }; |
| 10 | -use ImageOptimizer\Modules\Oauth\Components\{ | |
| 11 | - Checkpoint, | |
| 12 | - Connect | |
| 13 | -}; | |
| 9 | + | |
| 10 | +use Throwable; | |
| 14 | 11 | use WP_REST_Request; |
| 15 | 12 | |
| 13 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 14 | + exit; // Exit if accessed directly. | |
| 15 | +} | |
| 16 | + | |
| 16 | 17 | class Activate extends Route_Base { |
| 17 | - const NONCE_NAME = 'image-optimizer-activate-subscription'; | |
| 18 | + const NONCE_NAME = 'image-optimization-activate-subscription'; | |
| 19 | + | |
| 18 | 20 | protected string $path = 'activate'; |
| 19 | 21 | |
| 20 | 22 | public function get_name(): string { |
| 21 | 23 | return 'activate'; |
| @@ -25,16 +27,20 @@ | ||
| 25 | 27 | return [ 'POST' ]; |
| 26 | 28 | } |
| 27 | 29 | |
| 28 | 30 | public function POST( WP_REST_Request $request ) { |
| 29 | - $this->verify_nonce_and_capability( | |
| 31 | + $error = $this->verify_nonce_and_capability( | |
| 30 | 32 | $request->get_param( self::NONCE_NAME ), |
| 31 | 33 | self::NONCE_NAME |
| 32 | 34 | ); |
| 33 | 35 | |
| 36 | + if ( $error ) { | |
| 37 | + return $error; | |
| 38 | + } | |
| 39 | + | |
| 34 | 40 | if ( ! Connect::is_connected() ) { |
| 35 | 41 | return $this->respond_error_json( [ |
| 36 | - 'message' => esc_html__( 'Please connect first', 'image-optimizer' ), | |
| 42 | + 'message' => esc_html__( 'Please connect first', 'image-optimization' ), | |
| 37 | 43 | 'code' => 'forbidden', |
| 38 | 44 | ] ); |
| 39 | 45 | } |
| 40 | 46 | |
| @@ -39,9 +45,9 @@ | ||
| 39 | 45 | } |
| 40 | 46 | |
| 41 | 47 | if ( Connect::is_activated() ) { |
| 42 | 48 | return $this->respond_error_json( [ |
| 43 | - 'message' => esc_html__( 'Already activated', 'image-optimizer' ), | |
| 49 | + 'message' => esc_html__( 'Already activated', 'image-optimization' ), | |
| 44 | 50 | 'code' => 'bad_request', |
| 45 | 51 | ] ); |
| 46 | 52 | } |
| 47 | 53 | |
| @@ -46,38 +52,23 @@ | ||
| 46 | 52 | } |
| 47 | 53 | |
| 48 | 54 | if ( ! $request->get_param( 'license_key' ) ) { |
| 49 | 55 | return $this->respond_error_json( [ |
| 50 | - 'message' => esc_html__( 'Missing license key', 'image-optimizer' ), | |
| 56 | + 'message' => esc_html__( 'Missing license key', 'image-optimization' ), | |
| 51 | 57 | 'code' => 'bad_request', |
| 52 | 58 | ] ); |
| 53 | 59 | } |
| 54 | 60 | |
| 55 | - $key = $request->get_param( 'license_key' ); | |
| 61 | + $license_key = $request->get_param( 'license_key' ); | |
| 56 | 62 | |
| 57 | - $response = Utils::get_api_client()->make_request( | |
| 58 | - 'POST', | |
| 59 | - 'activation/activate', | |
| 60 | - [], | |
| 61 | - [ 'key' => $key ] | |
| 62 | - ); | |
| 63 | + try { | |
| 64 | + Connect::activate( $license_key ); | |
| 63 | 65 | |
| 64 | - if ( is_wp_error( $response ) ) { | |
| 66 | + return $this->respond_success_json(); | |
| 67 | + } catch ( Throwable $t ) { | |
| 65 | 68 | return $this->respond_error_json( [ |
| 66 | - 'message' => $response->get_error_message(), | |
| 69 | + 'message' => $t->getMessage(), | |
| 67 | 70 | 'code' => 'internal_server_error', |
| 68 | 71 | ] ); |
| 69 | 72 | } |
| 70 | - | |
| 71 | - if ( ! isset( $response->id ) ) { | |
| 72 | - return $this->respond_error_json( [ | |
| 73 | - 'message' => esc_html__( 'Invalid response from server', 'image-optimizer' ), | |
| 74 | - 'code' => 'internal_server_error', | |
| 75 | - ] ); | |
| 76 | - } | |
| 77 | - | |
| 78 | - Data::set_activation_state( $key ); | |
| 79 | - | |
| 80 | - do_action( Checkpoint::ON_ACTIVATE, $key ); | |
| 81 | - return rest_ensure_response( [ 'success' => true ] ); | |
| 82 | - } | |
| 73 | + } | |
| 83 | 74 | } |