← All changes | includes/API/API.php +3 -37 3.6.8 → 2.2.11 View file →

		@@ -124,30 +124,12 @@
124	124	* @param $request WP_REST_Request for getting all route request in time.
125	125	*
126	126	* @return WP_Error|boolean
127	127	*/
128		- public function _permission_check( WP_REST_Request $request ) {
129		- $this->request = $request;
130		- $this->api_key = $this->utils('options')->get( 'api_key' );
131		- if(!current_user_can('delete_posts')){
132		- return false;
133		- }
134		-
135		- add_filter('wp_redirect', '__return_false', 999);
136		-
137		- return $this->permission_check( $request );
138		- }
139		-
140		- /**
141		- * @param $request WP_REST_Request for getting all route request in time.
142		- *
143		- * @return WP_Error|boolean
144		- */
145	128	public function permission_check( WP_REST_Request $request ) {
146	129	$this->request = $request;
147	130	$this->api_key = $this->utils('options')->get( 'api_key' );
148	131
149		-
150	132	if ( ! empty( $this->api_key ) ) {
151	133	return true;
152	134	}
153	135
		@@ -162,9 +144,9 @@
162	144	* @return WP_Error
163	145	*/
164	146	protected function permission_error( $message, $endpoint = '') {
165	147	if( empty( $message ) ) {
166		- $message = __( 'Your session has expired. Please log in again.', 'templately' );
	148	+ $message = __( 'Sorry, you need to login/re-login again.', 'templately' );
167	149	}
168	150
169	151	$_additional_data = [
170	152	'status' => rest_authorization_required_code(),
		@@ -181,9 +163,9 @@
181	163	->remove('reviews')
182	164	->remove('cloud_activity')
183	165	->remove('api_key');
184	166
185		- if( $this->utils('options')->who_am_i() === 'global' ) {
	167	+ if( $this->utils('options')->whoami() === 'global' ) {
186	168	$this->utils('options')->remove_global_login();
187	169	}
188	170
189	171	return new WP_Error( 'invalid_api_key', $message, $_additional_data );
		@@ -202,9 +184,9 @@
202	184	$endpoint,
203	185	[
204	186	'methods' => $methods,
205	187	'callback' => $callback,
206		- 'permission_callback' => [ $this, '_permission_check' ],
	188	+ 'permission_callback' => [ $this, 'permission_check' ],
207	189	'args' => $args,
208	190	]
209	191	);
210	192	}
		@@ -229,24 +211,8 @@
229	211	* @return WP_REST_Response
230	212	*/
231	213	public function success( $data ) {
232	214	return new WP_REST_Response( $data, 200 );
233		- }
234		-
235		- /**
236		- * Enhanced success response wrapper that automatically adds success flag and wraps data
237		- *
238		- * @param $data mixed The data to be wrapped in the response
239		- *
240		- * @return WP_REST_Response
241		- */
242		- public function successWithData( $data ) {
243		- $enhanced_response = [
244		- 'success' => true,
245		- 'data' => $data
246		- ];
247		-
248		- return $this->success( $enhanced_response );
249	215	}
250	216	/**
251	217	* @param $error_code string
252	218	* @param $error_message string|array