← All changes | includes/Plugin.php +8 -56 3.7.3 → 3.5.3 View file →

		@@ -17,11 +17,9 @@
17	17	use Templately\API\Conditions;
18	18	use Templately\API\ThemeBuilderApi;
19	19	use Templately\Builder\ThemeBuilder;
20	20	use Templately\Core\Importer\FullSiteImport;
21		-use Templately\Utils\AuthErrorCode;
22	21	use Templately\Utils\Base;
23		-use Templately\Utils\Database;
24	22	use Templately\Utils\Enqueue;
25	23
26	24	use Templately\Core\Admin;
27	25	use Templately\Core\Module;
		@@ -28,11 +26,9 @@
28	26
29	27	use Templately\API\Tags;
30	28	use Templately\API\Items;
31	29	use Templately\API\Login;
32		-use Templately\API\Checkout;
33	30	use Templately\API\SignUp;
34		-use Templately\API\AiCredit;
35	31	use Templately\API\Profile;
36	32	use Templately\API\Import;
37	33	use Templately\API\MyClouds;
38	34	use Templately\API\WorkSpaces;
		@@ -40,10 +36,8 @@
40	36	use Templately\API\Dependencies;
41	37	use Templately\API\TemplateTypes;
42	38	use Templately\API\SavedTemplates;
43	39	use Templately\API\Sites;
44		-use Templately\API\Tour;
45		-use Templately\Core\DeactivationSurvey;
46	40	use Templately\Core\Maintenance;
47	41	use Templately\Core\Migrator;
48	42	use Templately\Core\Platform\Gutenberg;
49	43	use Templately\Core\Platform\Elementor;
		@@ -48,9 +42,9 @@
48	42	use Templately\Core\Platform\Gutenberg;
49	43	use Templately\Core\Platform\Elementor;
50	44
51	45	final class Plugin extends Base {
52		- public $version = '3.7.3';
	46	+ public $version = '3.5.3';
53	47
54	48	public $admin;
55	49	public $settings;
56	50	/**
		@@ -79,9 +73,8 @@
79	73	$this->define_constants();
80	74	$this->set_locale();
81	75
82	76	Maintenance::init();
83		- DeactivationSurvey::init();
84	77
85	78	$this->assets = Enqueue::get_instance( TEMPLATELY_URL, TEMPLATELY_PATH, $this->version );
86	79	$this->admin = Admin::get_instance();
87	80	$this->settings = Settings::get_instance();
		@@ -196,17 +189,14 @@
196	189	Items::get_instance();
197	190	SavedTemplates::get_instance();
198	191
199	192	Login::get_instance();
200		- Checkout::get_instance();
201	193	SignUp::get_instance();
202	194	Import::get_instance();
203	195	Profile::get_instance();
204		- AiCredit::get_instance();
205	196	MyClouds::get_instance();
206	197	WorkSpaces::get_instance();
207	198	Sites::get_instance();
208		- Tour::get_instance();
209	199
210	200	APISettings::get_instance();
211	201	// Note: DeveloperSettings::get_instance() is called in Developer::init_modules() when developer functionality is available and enabled
212	202	}
		@@ -276,46 +266,12 @@
276	266	if ( empty( $_GET['templately_google_login'] ) ) {
277	267	return;
278	268	}
279	269
280		- if ( wp_doing_ajax() || wp_doing_cron() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
281		- return;
282		- }
	270	+ $redirect_url = remove_query_arg( [ 'templately_google_login', 'api_key', 'error', 'state', 'redirect-to' ] );
283	271
284		- // Checked before the token is consumed: the callback can land while the
285		- // auth cookie is missing (expired session, cookie not yet set), and WP
286		- // will bounce the user through wp-login and back to this same URL.
287		- // Burning the token here would fail that legitimate retry.
288		- if ( ! is_user_logged_in() ) {
289		- return;
290		- }
291		-
292		- $state = '';
293		- if ( ! empty( $_GET['templately_state'] ) ) {
294		- $state = sanitize_text_field( wp_unslash( $_GET['templately_state'] ) );
295		- } elseif ( ! empty( $_GET['state'] ) ) {
296		- $state = sanitize_text_field( wp_unslash( $_GET['state'] ) );
297		- }
298		-
299		- $state_user_id = false;
300		- if ( ! empty( $state ) ) {
301		- $state_user_id = Database::get_transient( 'google_state_' . $state );
302		- Database::delete_transient( 'google_state_' . $state );
303		- }
304		-
305		- $is_authorized = false !== $state_user_id
306		- && intval( $state_user_id ) === get_current_user_id()
307		- && current_user_can( 'delete_posts' );
308		-
309		- $redirect_url = remove_query_arg( [ 'templately_google_login', 'templately_state', 'api_key', 'error', 'state', 'redirect-to' ] );
310		-
311		- if ( ! $is_authorized ) {
312		- $error_code = AuthErrorCode::AUTH_STATE_INVALID;
313		- } elseif ( ! empty( $_GET['error'] ) ) {
314		- // Google's own reason is deliberately dropped rather than forwarded:
315		- // everything on this query string is attacker-controlled, and the
316		- // screen that displays it must never be handed prose from the URL.
317		- $error_code = AuthErrorCode::AUTH_PROVIDER_FAILED;
	272	+ if ( ! empty( $_GET['error'] ) ) {
	273	+ $error_message = sanitize_text_field( $_GET['error'] );
318	274	} elseif ( ! empty( $_GET['api_key'] ) ) {
319	275	$request = new \WP_REST_Request( 'POST', '/templately/v1/login' );
320	276	$request->set_param( 'viaAPI', true );
321	277	$request->set_param( 'api_key', sanitize_text_field( $_GET['api_key'] ) );
		@@ -324,11 +280,8 @@
324	280	* @var Login $login
325	281	*/
326	282	$login = Login::get_instance();
327	283	$login->permission_check( $request );
328		-
329		- // login() pins the write target to the acting user itself — no pin
330		- // here, or its finally would release ours mid-request.
331	284	$response = $login->login();
332	285
333	286	if ( ! is_wp_error( $response ) && ! empty( $response['user'] ) ) {
334	287	$redirect_path = ! empty( $_GET['redirect-to'] ) ? sanitize_text_field( wp_unslash( $_GET['redirect-to'] ) ) : '';
		@@ -354,18 +307,17 @@
354	307
355	308	wp_safe_redirect( $redirect_url );
356	309	exit;
357	310	} else {
358		- // The cloud's own wording stays server-side; the screen resolves
359		- // its copy from the code.
360		- $error_code = AuthErrorCode::INVALID_API_KEY;
	311	+ $error_message = ( is_wp_error( $response ) ) ? $response->get_error_message() : __( 'Login failed.', 'templately' );
361	312	}
362	313	} else {
363		- $error_code = AuthErrorCode::AUTH_MISSING_API_KEY;
	314	+ $error_message = __( 'Missing API Key.', 'templately' );
364	315	}
365	316
366	317	$redirect_url = add_query_arg( [
367		- 'templately_error' => $error_code,
	318	+ 'templately_error' => 'login_failed',
	319	+ 'error_message' => urlencode( $error_message ),
368	320	], $redirect_url );
369	321
370	322	wp_safe_redirect( $redirect_url );
371	323	exit;