← All changes | includes/API/Login.php +8 -107 3.7.1 → 2.2.2 View file →

		@@ -13,16 +13,8 @@
13	13	if ( '/templately/v1/login' === $_route ) {
14	14	return true;
15	15	}
16	16
17		- if ( '/templately/v1/pricing' === $_route ) {
18		- return true;
19		- }
20		-
21		- if ( '/templately/v1/google-auth-url' === $_route ) {
22		- return true;
23		- }
24		-
25	17	return parent::permission_check( $request );
26	18	}
27	19
28	20	public function register_routes() {
		@@ -28,44 +20,10 @@
28	20	public function register_routes() {
29	21	$this->post( 'login', [$this, 'login'] );
30	22	$this->post( 'logout', [$this, 'logout'] );
31	23	$this->get( 'is-signed', [$this, 'is_signed'] );
32		- $this->get( 'pricing', [$this, 'pricing'] );
33		- $this->get( 'google-auth-url', [$this, 'google_auth_url'] );
34	24	}
35	25
36		- public function google_auth_url() {
37		- // Get redirect_to parameter from request if provided
38		- $redirect_to = $this->get_param( 'redirect-to', '' );
39		-
40		- // Use client-provided current_url instead of HTTP_REFERER for reliability
41		- $current_url = $this->get_param( 'current_url', '' );
42		-
43		- $url = $this->http()->google_auth_url( $redirect_to, $current_url );
44		- return [
45		- 'status' => 'success',
46		- 'url' => $url
47		- ];
48		- }
49		-
50		- public function pricing(){
51		- $data = get_transient( "templately_subscriptions" );
52		-
53		- if( is_array( $data ) && ! empty( $data ) ) {
54		- return $data;
55		- }
56		-
57		- $query = 'id, price, name, discounted_price, type, sites, coupon';
58		- $response = $this->http()->query(
59		- 'subscriptionPlans',
60		- $query
61		- )->post();
62		-
63		- set_transient( "templately_subscriptions", $response, WEEK_IN_SECONDS );
64		-
65		- return $response;
66		- }
67		-
68	26	public function login() {
69	27	$errors = [];
70	28	$_ip = Helper::get_ip();
71	29	$_site_url = home_url( '/' );
		@@ -79,10 +37,8 @@
79	37	'ip' => $_ip,
80	38	'site_url' => $_site_url
81	39	];
82	40
83		- $postArgs = [];
84		-
85	41	if ( $viaAPI ) {
86	42	$api_key = $this->get_param( 'api_key' );
87	43	$funcArgs['api_key'] = $api_key;
88	44
		@@ -105,46 +61,20 @@
105	61	if ( ! empty( $errors ) ) {
106	62	return $this->error( 'login_error', $errors, 'login', 400 );
107	63	}
108	64
109		- $query = 'status, message, user{ id, name, first_name, last_name, display_name, email, profile_photo, joined, is_verified, is_company_user, api_key, plan, plan_expire_at, my_cloud{ limit, usages, last_pushed }, favourites{ id, type }, show_notice, reviews{ type, type_id, rating }, subscription { id, name, sites } }';
	65	+ $query = 'status, message, user{ id, name, first_name, last_name, display_name, email, profile_photo, joined, is_verified, api_key, plan, plan_expire_at, my_cloud{ limit, usages, last_pushed }, favourites{ id, type }, show_notice }';
110	66
111	67	$response = $this->http()->mutation(
112	68	$viaAPI ? 'connectWithApiKey' : 'connect',
113	69	$query,
114	70	$funcArgs
115		- )->post($postArgs);
	71	+ )->post();
116	72
117	73	if ( is_wp_error( $response ) ) {
118	74	return $response;
119	75	}
120	76
121		- if ( empty( $response['user']['api_key'] ) ) {
122		- return $this->error( 'login_error', $response['message'] ?? __('Invalid API key.', 'templately'), 'login', 400 );
123		- }
124		-
125		- $options = $this->utils( 'options' );
126		- $options->use_current_user( true );
127		-
128		- try {
129		- return $this->store_connection( $response, $global_signin, $_ip, $_site_url );
130		- } finally {
131		- $options->use_current_user( false );
132		- }
133		- }
134		-
135		- /**
136		- * Persist an authenticated connection against the acting user.
137		- *
138		- * @param array $response Cloud response, already validated.
139		- * @param bool $global_signin Whether the user asked to sign in globally.
140		- * @param string $_ip Request IP, echoed back into the profile.
141		- * @param string $_site_url Site URL, echoed back into the profile.
142		- *
143		- * @return array
144		- */
145		- private function store_connection( $response, $global_signin, $_ip, $_site_url ) {
146		-
147	77	if ( $global_signin && ! Login::is_globally_signed() ) {
148	78	Options::set_global_login();
149	79	}
150	80
		@@ -172,25 +102,8 @@
172	102	unset( $response['user']['favourites'] );
173	103	$meta['favourites'] = $_favourites;
174	104	}
175	105
176		- if ( ! empty( $response['user']['reviews'] ) ) {
177		- $_reviews = $this->utils( 'helper' )->normalizeReviews( $response['user']['reviews'] );
178		- $this->utils( 'options' )->set( 'reviews', $_reviews );
179		-
180		- unset( $response['user']['reviews'] );
181		- $meta['reviews'] = $_reviews;
182		- }
183		-
184		- if(Helper::is_dev_api()){
185		- $response['user']['is_dev_api'] = true;
186		- }
187		-
188		- if(! empty( $response['user'] ) && is_array($response['user'])){
189		- $response['user']['ip'] = $_ip;
190		- $response['user']['site_url'] = base64_encode( $_site_url );
191		- }
192		-
193	106	$this->utils( 'options' )->set( 'user', $response['user'] );
194	107	$response['user']['meta'] = $this->user_meta( $meta );
195	108
196	109	return $response;
		@@ -232,16 +145,14 @@
232	145	public function delete(){
233	146	$this->utils( 'options' )
234	147	->remove( 'user' )
235	148	->remove( 'favourites' )
236		- ->remove( 'reviews' )
237	149	->remove( 'cloud_activity' )
238	150	->remove( 'api_key' )
239	151	->remove( 'global_login' )
240		- ->remove( 'total_download_counts' )
241	152	->remove( 'templates_in_clouds' );
242	153
243		- if ( $this->utils( 'options' )->who_am_i() === 'global' ) {
	154	+ if ( $this->utils( 'options' )->whoami() === 'global' ) {
244	155	$this->utils( 'options' )->remove_global_login();
245	156	}
246	157
247	158	$global_user_id = $this->utils( 'options' )->is_global();
		@@ -250,12 +161,8 @@
250	161	if ( $global_user_id !== $this->utils( 'options' )->current_user_id() ) {
251	162	$global_user = $this->utils( 'options' )->get( 'user', false, $global_user_id );
252	163
253	164	if ( ! empty( $global_user ) ) {
254		- if ( is_array( $global_user ) ) {
255		- unset( $global_user['api_key'] );
256		- }
257		-
258	165	$global_user['meta'] = $this->user_meta();
259	166	}
260	167	}
261	168
		@@ -261,9 +168,9 @@
261	168
262	169	return $global_user;
263	170	}
264	171
265		- public static function is_signed(): array {
	172	+ public static function is_signed() {
266	173	$_response = [
267	174	'status' => 'success'
268	175	];
269	176
		@@ -269,13 +176,8 @@
269	176
270	177	$_user = ( new static )->utils( 'options' )->get( 'user', null );
271	178
272	179	if ( ! is_null( $_user ) ) {
273		- // Profiles stored before 3.7.1 may still carry the cloud API key.
274		- if ( is_array( $_user ) ) {
275		- unset( $_user['api_key'] );
276		- }
277		-
278	180	$_user['meta'] = self::get_instance()->user_meta();
279	181	}
280	182
281	183	if ( empty( $_user ) ) {
		@@ -286,9 +188,9 @@
286	188
287	189	return $_response;
288	190	}
289	191
290		- public function user_meta( $meta = [] ): array {
	192	+ public function user_meta( $meta = [] ) {
291	193	$_meta = [
292	194	'link_account' => self::utils( 'options' )->link_account(),
293	195	'unlink_account' => self::utils( 'options' )->unlink_account(),
294	196	'is_globally_signed' => Login::is_globally_signed(),
		@@ -293,9 +195,8 @@
293	195	'unlink_account' => self::utils( 'options' )->unlink_account(),
294	196	'is_globally_signed' => Login::is_globally_signed(),
295	197	'signed_as_global' => Login::signed_as_global(),
296	198	'starred' => self::utils( 'options' )->get( 'favourites' ),
297		- 'reviews' => self::utils( 'options' )->get( 'reviews' ),
298	199	'cloud_activity' => self::utils( 'options' )->get( 'cloud_activity' ),
299	200	'has_api' => rest_sanitize_boolean( self::utils( 'options' )->get( 'api_key' ) )
300	201	];
301	202
		@@ -301,12 +202,12 @@
301	202
302	203	return array_merge( $_meta, $meta );
303	204	}
304	205
305		- public static function is_globally_signed(): bool {
	206	+ public static function is_globally_signed() {
306	207	return rest_sanitize_boolean( ( new static )->utils( 'options' )->is_globally_signed() );
307	208	}
308	209
309		- public static function signed_as_global(): bool {
	210	+ public static function signed_as_global() {
310	211	return rest_sanitize_boolean( ( new static )->utils( 'options' )->signed_as_global() );
311	212	}
312		-}
	213	+}