← All changes | includes/API/Login.php +8 -62 3.7.0 → 2.2.9 View file →

		@@ -17,12 +17,8 @@
17	17	if ( '/templately/v1/pricing' === $_route ) {
18	18	return true;
19	19	}
20	20
21		- if ( '/templately/v1/google-auth-url' === $_route ) {
22		- return true;
23		- }
24		-
25	21	return parent::permission_check( $request );
26	22	}
27	23
28	24	public function register_routes() {
		@@ -29,25 +25,10 @@
29	25	$this->post( 'login', [$this, 'login'] );
30	26	$this->post( 'logout', [$this, 'logout'] );
31	27	$this->get( 'is-signed', [$this, 'is_signed'] );
32	28	$this->get( 'pricing', [$this, 'pricing'] );
33		- $this->get( 'google-auth-url', [$this, 'google_auth_url'] );
34	29	}
35	30
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	31	public function pricing(){
51	32	$data = get_transient( "templately_subscriptions" );
52	33
53	34	if( is_array( $data ) && ! empty( $data ) ) {
		@@ -53,9 +34,9 @@
53	34	if( is_array( $data ) && ! empty( $data ) ) {
54	35	return $data;
55	36	}
56	37
57		- $query = 'id, price, name, discounted_price, type, sites, coupon';
	38	+ $query = 'id, price, name, discounted_price, type, sites';
58	39	$response = $this->http()->query(
59	40	'subscriptionPlans',
60	41	$query
61	42	)->post();
		@@ -79,10 +60,8 @@
79	60	'ip' => $_ip,
80	61	'site_url' => $_site_url
81	62	];
82	63
83		- $postArgs = [];
84		-
85	64	if ( $viaAPI ) {
86	65	$api_key = $this->get_param( 'api_key' );
87	66	$funcArgs['api_key'] = $api_key;
88	67
		@@ -105,24 +84,20 @@
105	84	if ( ! empty( $errors ) ) {
106	85	return $this->error( 'login_error', $errors, 'login', 400 );
107	86	}
108	87
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 } }';
	88	+ $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	89
111	90	$response = $this->http()->mutation(
112	91	$viaAPI ? 'connectWithApiKey' : 'connect',
113	92	$query,
114	93	$funcArgs
115		- )->post($postArgs);
	94	+ )->post();
116	95
117	96	if ( is_wp_error( $response ) ) {
118	97	return $response;
119	98	}
120	99
121		- if ( empty( $response['user']['api_key'] ) ) {
122		- return $this->error( 'login_error', $response['message'] ?? __('Invalid API key.', 'templately'), 'login', 400 );
123		- }
124		-
125	100	if ( $global_signin && ! Login::is_globally_signed() ) {
126	101	Options::set_global_login();
127	102	}
128	103
		@@ -150,25 +125,8 @@
150	125	unset( $response['user']['favourites'] );
151	126	$meta['favourites'] = $_favourites;
152	127	}
153	128
154		- if ( ! empty( $response['user']['reviews'] ) ) {
155		- $_reviews = $this->utils( 'helper' )->normalizeReviews( $response['user']['reviews'] );
156		- $this->utils( 'options' )->set( 'reviews', $_reviews );
157		-
158		- unset( $response['user']['reviews'] );
159		- $meta['reviews'] = $_reviews;
160		- }
161		-
162		- if(Helper::is_dev_api()){
163		- $response['user']['is_dev_api'] = true;
164		- }
165		-
166		- if(! empty( $response['user'] ) && is_array($response['user'])){
167		- $response['user']['ip'] = $_ip;
168		- $response['user']['site_url'] = base64_encode( $_site_url );
169		- }
170		-
171	129	$this->utils( 'options' )->set( 'user', $response['user'] );
172	130	$response['user']['meta'] = $this->user_meta( $meta );
173	131
174	132	return $response;
		@@ -210,16 +168,14 @@
210	168	public function delete(){
211	169	$this->utils( 'options' )
212	170	->remove( 'user' )
213	171	->remove( 'favourites' )
214		- ->remove( 'reviews' )
215	172	->remove( 'cloud_activity' )
216	173	->remove( 'api_key' )
217	174	->remove( 'global_login' )
218		- ->remove( 'total_download_counts' )
219	175	->remove( 'templates_in_clouds' );
220	176
221		- if ( $this->utils( 'options' )->who_am_i() === 'global' ) {
	177	+ if ( $this->utils( 'options' )->whoami() === 'global' ) {
222	178	$this->utils( 'options' )->remove_global_login();
223	179	}
224	180
225	181	$global_user_id = $this->utils( 'options' )->is_global();
		@@ -228,12 +184,8 @@
228	184	if ( $global_user_id !== $this->utils( 'options' )->current_user_id() ) {
229	185	$global_user = $this->utils( 'options' )->get( 'user', false, $global_user_id );
230	186
231	187	if ( ! empty( $global_user ) ) {
232		- if ( is_array( $global_user ) ) {
233		- unset( $global_user['api_key'] );
234		- }
235		-
236	188	$global_user['meta'] = $this->user_meta();
237	189	}
238	190	}
239	191
		@@ -239,9 +191,9 @@
239	191
240	192	return $global_user;
241	193	}
242	194
243		- public static function is_signed(): array {
	195	+ public static function is_signed() {
244	196	$_response = [
245	197	'status' => 'success'
246	198	];
247	199
		@@ -247,13 +199,8 @@
247	199
248	200	$_user = ( new static )->utils( 'options' )->get( 'user', null );
249	201
250	202	if ( ! is_null( $_user ) ) {
251		- // Profiles stored before 3.7.1 may still carry the cloud API key.
252		- if ( is_array( $_user ) ) {
253		- unset( $_user['api_key'] );
254		- }
255		-
256	203	$_user['meta'] = self::get_instance()->user_meta();
257	204	}
258	205
259	206	if ( empty( $_user ) ) {
		@@ -264,9 +211,9 @@
264	211
265	212	return $_response;
266	213	}
267	214
268		- public function user_meta( $meta = [] ): array {
	215	+ public function user_meta( $meta = [] ) {
269	216	$_meta = [
270	217	'link_account' => self::utils( 'options' )->link_account(),
271	218	'unlink_account' => self::utils( 'options' )->unlink_account(),
272	219	'is_globally_signed' => Login::is_globally_signed(),
		@@ -271,9 +218,8 @@
271	218	'unlink_account' => self::utils( 'options' )->unlink_account(),
272	219	'is_globally_signed' => Login::is_globally_signed(),
273	220	'signed_as_global' => Login::signed_as_global(),
274	221	'starred' => self::utils( 'options' )->get( 'favourites' ),
275		- 'reviews' => self::utils( 'options' )->get( 'reviews' ),
276	222	'cloud_activity' => self::utils( 'options' )->get( 'cloud_activity' ),
277	223	'has_api' => rest_sanitize_boolean( self::utils( 'options' )->get( 'api_key' ) )
278	224	];
279	225
		@@ -279,12 +225,12 @@
279	225
280	226	return array_merge( $_meta, $meta );
281	227	}
282	228
283		- public static function is_globally_signed(): bool {
	229	+ public static function is_globally_signed() {
284	230	return rest_sanitize_boolean( ( new static )->utils( 'options' )->is_globally_signed() );
285	231	}
286	232
287		- public static function signed_as_global(): bool {
	233	+ public static function signed_as_global() {
288	234	return rest_sanitize_boolean( ( new static )->utils( 'options' )->signed_as_global() );
289	235	}
290	236	}