← All changes | includes/API/Login.php +108 -17 3.0.6 → 3.7.2 View file →

		@@ -17,8 +17,12 @@
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	+
21	25	return parent::permission_check( $request );
22	26	}
23	27
24	28	public function register_routes() {
		@@ -25,10 +29,25 @@
25	29	$this->post( 'login', [$this, 'login'] );
26	30	$this->post( 'logout', [$this, 'logout'] );
27	31	$this->get( 'is-signed', [$this, 'is_signed'] );
28	32	$this->get( 'pricing', [$this, 'pricing'] );
	33	+ $this->get( 'google-auth-url', [$this, 'google_auth_url'] );
29	34	}
30	35
	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	+
31	50	public function pricing(){
32	51	$data = get_transient( "templately_subscriptions" );
33	52
34	53	if( is_array( $data ) && ! empty( $data ) ) {
		@@ -34,9 +53,9 @@
34	53	if( is_array( $data ) && ! empty( $data ) ) {
35	54	return $data;
36	55	}
37	56
38		- $query = 'id, price, name, discounted_price, type, sites';
	57	+ $query = 'id, price, name, discounted_price, type, sites, coupon';
39	58	$response = $this->http()->query(
40	59	'subscriptionPlans',
41	60	$query
42	61	)->post();
		@@ -60,8 +79,10 @@
60	79	'ip' => $_ip,
61	80	'site_url' => $_site_url
62	81	];
63	82
	83	+ $postArgs = [];
	84	+
64	85	if ( $viaAPI ) {
65	86	$api_key = $this->get_param( 'api_key' );
66	87	$funcArgs['api_key'] = $api_key;
67	88
		@@ -84,20 +105,46 @@
84	105	if ( ! empty( $errors ) ) {
85	106	return $this->error( 'login_error', $errors, 'login', 400 );
86	107	}
87	108
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, reviews{ type, type_id, rating } }';
	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 } }';
89	110
90	111	$response = $this->http()->mutation(
91	112	$viaAPI ? 'connectWithApiKey' : 'connect',
92	113	$query,
93	114	$funcArgs
94		- )->post();
	115	+ )->post($postArgs);
95	116
96	117	if ( is_wp_error( $response ) ) {
97	118	return $response;
98	119	}
99	120
	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	+
100	147	if ( $global_signin && ! Login::is_globally_signed() ) {
101	148	Options::set_global_login();
102	149	}
103	150
		@@ -133,8 +180,17 @@
133	180	unset( $response['user']['reviews'] );
134	181	$meta['reviews'] = $_reviews;
135	182	}
136	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	+
137	193	$this->utils( 'options' )->set( 'user', $response['user'] );
138	194	$response['user']['meta'] = $this->user_meta( $meta );
139	195
140	196	return $response;
		@@ -140,13 +196,28 @@
140	196	return $response;
141	197	}
142	198
143	199	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	+
144	215	$response = $this->http()->mutation(
145	216	'disconnect',
146	217	'status, message, data',
147	218	[
148		- 'api_key' => $this->api_key,
	219	+ 'api_key' => $api_key,
149	220	"site_url" => home_url( '/' )
150	221	]
151	222	)->post();
152	223
		@@ -173,22 +244,33 @@
173	244	return $response;
174	245	}
175	246
176	247	public function delete(){
177		- $this->utils( 'options' )
178		- ->remove( 'user' )
179		- ->remove( 'favourites' )
180		- ->remove( 'reviews' )
181		- ->remove( 'cloud_activity' )
182		- ->remove( 'api_key' )
183		- ->remove( 'global_login' )
184		- ->remove( 'total_download_counts' )
185		- ->remove( 'templates_in_clouds' );
	248	+ $options = $this->utils( 'options' );
186	249
187		- if ( $this->utils( 'options' )->who_am_i() === 'global' ) {
188		- $this->utils( 'options' )->remove_global_login();
189		- }
	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 );
190	254
	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	+
191	273	$global_user_id = $this->utils( 'options' )->is_global();
192	274	$global_user = null;
193	275
194	276	if ( $global_user_id !== $this->utils( 'options' )->current_user_id() ) {
		@@ -194,8 +276,12 @@
194	276	if ( $global_user_id !== $this->utils( 'options' )->current_user_id() ) {
195	277	$global_user = $this->utils( 'options' )->get( 'user', false, $global_user_id );
196	278
197	279	if ( ! empty( $global_user ) ) {
	280	+ if ( is_array( $global_user ) ) {
	281	+ unset( $global_user['api_key'] );
	282	+ }
	283	+
198	284	$global_user['meta'] = $this->user_meta();
199	285	}
200	286	}
201	287
		@@ -209,8 +295,13 @@
209	295
210	296	$_user = ( new static )->utils( 'options' )->get( 'user', null );
211	297
212	298	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	+
213	304	$_user['meta'] = self::get_instance()->user_meta();
214	305	}
215	306
216	307	if ( empty( $_user ) ) {
		@@ -243,5 +334,5 @@
243	334
244	335	public static function signed_as_global(): bool {
245	336	return rest_sanitize_boolean( ( new static )->utils( 'options' )->signed_as_global() );
246	337	}
247		-}
	338	+}