← All changes | includes/API/Login.php +16 -103 3.7.2 → 3.4.6 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 ) ) {
		@@ -105,9 +86,9 @@
105	86	if ( ! empty( $errors ) ) {
106	87	return $this->error( 'login_error', $errors, 'login', 400 );
107	88	}
108	89
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 } }';
	90	+ $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, reviews{ type, type_id, rating } }';
110	91
111	92	$response = $this->http()->mutation(
112	93	$viaAPI ? 'connectWithApiKey' : 'connect',
113	94	$query,
		@@ -117,34 +98,8 @@
117	98	if ( is_wp_error( $response ) ) {
118	99	return $response;
119	100	}
120	101
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	102	if ( $global_signin && ! Login::is_globally_signed() ) {
148	103	Options::set_global_login();
149	104	}
150	105
		@@ -180,17 +135,10 @@
180	135	unset( $response['user']['reviews'] );
181	136	$meta['reviews'] = $_reviews;
182	137	}
183	138
184		- if(Helper::is_dev_api()){
185		- $response['user']['is_dev_api'] = true;
186		- }
	139	+ // No longer need to manage is_live_api state - API selection is now handled by TEMPLATELY_DEV_API constant
187	140
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	141	$this->utils( 'options' )->set( 'user', $response['user'] );
194	142	$response['user']['meta'] = $this->user_meta( $meta );
195	143
196	144	return $response;
		@@ -196,28 +144,13 @@
196	144	return $response;
197	145	}
198	146
199	147	public function logout() {
200		- // Read the key off the acting user's own record. Options::get() falls back to
201		- // the global-login administrator when no target is given, so $this->api_key
202		- // resolves to the administrator's key for any linked user — disconnecting the
203		- // administrator's account on the cloud as well as locally.
204		- $api_key = $this->utils( 'options' )->get( 'api_key', '', get_current_user_id() );
205		-
206		- if ( empty( $api_key ) ) {
207		- return $this->error(
208		- 'logout_error',
209		- __( 'You are not connected to Templately.', 'templately' ),
210		- 'logout',
211		- 403
212		- );
213		- }
214		-
215	148	$response = $this->http()->mutation(
216	149	'disconnect',
217	150	'status, message, data',
218	151	[
219		- 'api_key' => $api_key,
	152	+ 'api_key' => $this->api_key,
220	153	"site_url" => home_url( '/' )
221	154	]
222	155	)->post();
223	156
		@@ -244,33 +177,22 @@
244	177	return $response;
245	178	}
246	179
247	180	public function delete(){
248		- $options = $this->utils( 'options' );
	181	+ $this->utils( 'options' )
	182	+ ->remove( 'user' )
	183	+ ->remove( 'favourites' )
	184	+ ->remove( 'reviews' )
	185	+ ->remove( 'cloud_activity' )
	186	+ ->remove( 'api_key' )
	187	+ ->remove( 'global_login' )
	188	+ ->remove( 'total_download_counts' )
	189	+ ->remove( 'templates_in_clouds' );
249	190
250		- // Pin the removals to the acting user. Without the pin, Options::user_id()
251		- // resolves a linked user to the global-login administrator and the delete
252		- // path wipes the administrator's connection instead of the caller's.
253		- $options->use_current_user( true );
	191	+ if ( $this->utils( 'options' )->who_am_i() === 'global' ) {
	192	+ $this->utils( 'options' )->remove_global_login();
	193	+ }
254	194
255		- try {
256		- $options
257		- ->remove( 'user' )
258		- ->remove( 'favourites' )
259		- ->remove( 'reviews' )
260		- ->remove( 'cloud_activity' )
261		- ->remove( 'api_key' )
262		- ->remove( 'global_login' )
263		- ->remove( 'total_download_counts' )
264		- ->remove( 'templates_in_clouds' );
265		-
266		- if ( $options->who_am_i() === 'global' ) {
267		- $options->remove_global_login();
268		- }
269		- } finally {
270		- $options->use_current_user( false );
271		- }
272		-
273	195	$global_user_id = $this->utils( 'options' )->is_global();
274	196	$global_user = null;
275	197
276	198	if ( $global_user_id !== $this->utils( 'options' )->current_user_id() ) {
		@@ -276,12 +198,8 @@
276	198	if ( $global_user_id !== $this->utils( 'options' )->current_user_id() ) {
277	199	$global_user = $this->utils( 'options' )->get( 'user', false, $global_user_id );
278	200
279	201	if ( ! empty( $global_user ) ) {
280		- if ( is_array( $global_user ) ) {
281		- unset( $global_user['api_key'] );
282		- }
283		-
284	202	$global_user['meta'] = $this->user_meta();
285	203	}
286	204	}
287	205
		@@ -295,13 +213,8 @@
295	213
296	214	$_user = ( new static )->utils( 'options' )->get( 'user', null );
297	215
298	216	if ( ! is_null( $_user ) ) {
299		- // Profiles stored before 3.7.1 may still carry the cloud API key.
300		- if ( is_array( $_user ) ) {
301		- unset( $_user['api_key'] );
302		- }
303		-
304	217	$_user['meta'] = self::get_instance()->user_meta();
305	218	}
306	219
307	220	if ( empty( $_user ) ) {
		@@ -334,5 +247,5 @@
334	247
335	248	public static function signed_as_global(): bool {
336	249	return rest_sanitize_boolean( ( new static )->utils( 'options' )->signed_as_global() );
337	250	}
338		-}
	251	+}