| @@ -125,16 +125,12 @@ | ||
| 125 | 125 | * |
| 126 | 126 | * @return WP_Error|boolean |
| 127 | 127 | */ |
| 128 | 128 | public function _permission_check( WP_REST_Request $request ) { |
| 129 | - $this->request = $request; | |
| 130 | - $this->api_key = $this->utils('options')->get( 'api_key' ); | |
| 131 | 129 | if(!current_user_can('delete_posts')){ |
| 132 | 130 | return false; |
| 133 | 131 | } |
| 134 | 132 | |
| 135 | - add_filter('wp_redirect', '__return_false', 999); | |
| 136 | - | |
| 137 | 133 | return $this->permission_check( $request ); |
| 138 | 134 | } |
| 139 | 135 | |
| 140 | 136 | /** |
| @@ -162,9 +158,9 @@ | ||
| 162 | 158 | * @return WP_Error |
| 163 | 159 | */ |
| 164 | 160 | protected function permission_error( $message, $endpoint = '') { |
| 165 | 161 | if( empty( $message ) ) { |
| 166 | - $message = __( 'Your session has expired. Please log in again.', 'templately' ); | |
| 162 | + $message = __( 'Sorry, you need to login/re-login again.', 'templately' ); | |
| 167 | 163 | } |
| 168 | 164 | |
| 169 | 165 | $_additional_data = [ |
| 170 | 166 | 'status' => rest_authorization_required_code(), |
| @@ -173,27 +169,18 @@ | ||
| 173 | 169 | if( ! empty( $endpoint ) ) { |
| 174 | 170 | $_additional_data['endpoint'] = $endpoint; |
| 175 | 171 | } |
| 176 | 172 | |
| 177 | - // Delete user logged meta data — pinned to the acting user, otherwise | |
| 178 | - // Options::user_id() resolves a linked user to the global-login | |
| 179 | - // administrator and clears the administrator's session instead. | |
| 180 | - $options = $this->utils('options'); | |
| 181 | - $options->use_current_user( true ); | |
| 173 | + // Delete user logged meta data | |
| 174 | + $this->utils('options') | |
| 175 | + ->remove('user') | |
| 176 | + ->remove('favourites') | |
| 177 | + ->remove('reviews') | |
| 178 | + ->remove('cloud_activity') | |
| 179 | + ->remove('api_key'); | |
| 182 | 180 | |
| 183 | - try { | |
| 184 | - $options | |
| 185 | - ->remove('user') | |
| 186 | - ->remove('favourites') | |
| 187 | - ->remove('reviews') | |
| 188 | - ->remove('cloud_activity') | |
| 189 | - ->remove('api_key'); | |
| 190 | - | |
| 191 | - if( $options->who_am_i() === 'global' ) { | |
| 192 | - $options->remove_global_login(); | |
| 193 | - } | |
| 194 | - } finally { | |
| 195 | - $options->use_current_user( false ); | |
| 181 | + if( $this->utils('options')->who_am_i() === 'global' ) { | |
| 182 | + $this->utils('options')->remove_global_login(); | |
| 196 | 183 | } |
| 197 | 184 | |
| 198 | 185 | return new WP_Error( 'invalid_api_key', $message, $_additional_data ); |
| 199 | 186 | } |
| @@ -238,24 +225,8 @@ | ||
| 238 | 225 | * @return WP_REST_Response |
| 239 | 226 | */ |
| 240 | 227 | public function success( $data ) { |
| 241 | 228 | return new WP_REST_Response( $data, 200 ); |
| 242 | - } | |
| 243 | - | |
| 244 | - /** | |
| 245 | - * Enhanced success response wrapper that automatically adds success flag and wraps data | |
| 246 | - * | |
| 247 | - * @param $data mixed The data to be wrapped in the response | |
| 248 | - * | |
| 249 | - * @return WP_REST_Response | |
| 250 | - */ | |
| 251 | - public function successWithData( $data ) { | |
| 252 | - $enhanced_response = [ | |
| 253 | - 'success' => true, | |
| 254 | - 'data' => $data | |
| 255 | - ]; | |
| 256 | - | |
| 257 | - return $this->success( $enhanced_response ); | |
| 258 | 229 | } |
| 259 | 230 | /** |
| 260 | 231 | * @param $error_code string |
| 261 | 232 | * @param $error_message string|array |
