← All changes | includes/API/Profile.php +40 -94 3.7.5 → 2.0.1 View file →

		@@ -10,16 +10,12 @@
10	10	$this->get( 'profile/sync', [ $this, 'sync' ] );
11	11	$this->get( 'profile/verified', [ $this, 'verified' ] );
12	12	$this->get( 'profile/download-history', [ $this, 'get_download_history' ] );
13	13	$this->get( 'profile/my-favourites', [ $this, 'get_my_favourites' ] );
14		- $this->get( 'profile/purchased-items', [ $this, 'get_my_purchased_items' ] );
15	14	}
16	15
17	16	public function sync() {
18		- // Keep the `subscription` field set in step with `Login::login()` — the
19		- // Subscription screen renders from whichever of the two answered last, so a
20		- // field missing here silently degrades the card after a profile sync.
21		- $query = 'status, message, user{ id, name, first_name, last_name, display_name, email, profile_photo, joined, is_verified, is_restricted_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, subscription_plan_id, ends_at, plan_type, cancel_at_period_end } }';
	17	+ $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 } }';
22	18
23	19	$funcArgs = [
24	20	'api_key' => $this->api_key,
25	21	'site_url' => home_url( '/' ),
		@@ -25,82 +21,55 @@
25	21	'site_url' => home_url( '/' ),
26	22	'ip' => Helper::get_ip()
27	23	];
28	24
29		- $response = $this->http()->mutation( 'connectWithApiKey', $query, $funcArgs )->post();
	25	+ $response = $this->http()->mutation(
	26	+ 'connectWithApiKey',
	27	+ $query,
	28	+ $funcArgs
	29	+ )->post();
30	30
31		- if ( is_wp_error( $response ) ) {
	31	+ if( is_wp_error( $response ) ) {
32	32	return $response;
33	33	}
34	34
35	35	$meta = [
36	36	'is_globally_signed' => Login::is_globally_signed(),
37		- 'signed_as_global' => Login::signed_as_global()
	37	+ 'signed_as_global' => Login::signed_as_global(),
38	38	];
39	39
40		- if ( ! empty( $response['user']['my_cloud']['last_pushed'] ) ) {
	40	+ if( ! empty( $response['user']['my_cloud']['last_pushed'] ) ) {
41	41	$_cloud_activity = unserialize( $response['user']['my_cloud']['last_pushed'] );
42		- $this->utils( 'options' )->set( 'cloud_activity', $_cloud_activity );
	42	+ $this->utils('options')->set( 'cloud_activity', $_cloud_activity );
43	43	$meta['cloud_activity'] = $_cloud_activity;
44	44	unset( $response['user']['my_cloud']['last_pushed'] );
45	45	}
46	46
47		- if ( ! empty( $response['user']['favourites'] ) ) {
48		- $_favourites = $this->utils( 'helper' )->normalizeFavourites( $response['user']['favourites'] );
49		- $this->utils( 'options' )->set( 'favourites', $_favourites );
	47	+ if( ! empty( $response['user']['favourites'] ) ) {
	48	+ $_favourites = $this->utils('helper')->normalizeFavourites( $response['user']['favourites'] );
	49	+ $this->utils('options')->set('favourites', $_favourites);
50	50
51	51	unset( $response['user']['favourites'] );
52	52	$meta['favourites'] = $_favourites;
53	53	}
54	54
55		- if ( ! empty( $response['user']['reviews'] ) ) {
56		- $_reviews = $this->utils( 'helper' )->normalizeReviews( $response['user']['reviews'] );
57		- $this->utils( 'options' )->set( 'reviews', $_reviews );
58		-
59		- unset( $response['user']['reviews'] );
60		- $meta['reviews'] = $_reviews;
61		- }
62		-
63		- if ( ! empty( $response['user']['reviews'] ) ) {
64		- $_reviews = $this->utils( 'helper' )->normalizeReviews( $response['user']['reviews'] );
65		- $this->utils( 'options' )->set( 'reviews', $_reviews );
66		-
67		- unset( $response['user']['reviews'] );
68		- $meta['reviews'] = $_reviews;
69		- }
70		-
71		- if ( ! empty( $response['user'] ) && is_array( $response['user'] ) ) {
72		- /**
73		- * The cloud API key must never be persisted here or sent to the client.
74		- * Under a global login this key belongs to the admin, while any user with
75		- * `delete_posts` can reach this endpoint. Login and SignUp already drop it.
76		- */
77		- unset( $response['user']['api_key'] );
78		-
79		- $response['user']['site_url'] = base64_encode( home_url( '/' ) );
80		- $response['user']['ip'] = Helper::get_ip();
81		- }
82		-
83		- $this->utils( 'options' )->set( 'user', $response['user'] );
	55	+ $this->utils('options')->set('user', $response['user']);
84	56	$response['user']['meta'] = Login::get_instance()->user_meta( $meta );
85	57
86	58	return $this->success( $response );
87	59	}
88	60
89		- public function verified() {
	61	+ public function verified(){
90	62	$funcArgs = [
91		- 'api_key' => $this->api_key
	63	+ 'api_key' => $this->api_key
92	64	];
93	65
94		- $response = $this->http()->query( 'isVerifiedUser', '', $funcArgs )->post();
	66	+ $response = $this->http()->query(
	67	+ 'isVerifiedUser',
	68	+ '',
	69	+ $funcArgs
	70	+ )->post();
95	71
96		- if ( $response && !is_wp_error( $response ) ) {
97		- $user = $this->utils( 'options' )->get( 'user' );
98		-
99		- $user['is_verified'] = true;
100		- $this->utils( 'options' )->set( 'user', $user );
101		- }
102		-
103	72	return $response;
104	73	}
105	74
106	75	public function get_download_history() {
		@@ -106,22 +75,27 @@
106	75	public function get_download_history() {
107	76	$page = $this->get_param( 'page', 1, 'intval' );
108	77	$per_page = $this->get_param( 'per_page', 10, 'intval' );
109	78
110		- $response = $this->http()->mutation( 'myDownloadHistory', 'data{ name, thumbnail, downloaded_at, slug, type }, current_page, total_page, total', [
	79	+ $response = $this->http()->mutation(
	80	+ 'myDownloadHistory',
	81	+ 'data{ name, thumbnail, downloaded_at, slug, type }, current_page, total_page',
	82	+ [
111	83	'api_key' => $this->api_key,
112	84	'per_page' => $per_page,
113	85	"page" => $page
114		- ] )->post();
	86	+ ]
	87	+ )->post();
115	88
116	89	if ( is_wp_error( $response ) ) {
117		- return $this->error( 'invalid_download_history_response', __( $response->get_error_message(), 'templately' ), 'profile/download-history' );
	90	+ return $this->error(
	91	+ 'invalid_download_history_response',
	92	+ __( $response->get_error_message(), 'templately' ),
	93	+ 'profile/download-history',
	94	+ $response->get_error_code()
	95	+ );
118	96	}
119	97
120		- if ( isset( $response['total'] ) ) {
121		- $this->utils( 'options' )->set( 'total_download_counts', $response['total'] );
122		- }
123		-
124	98	return $response;
125	99	}
126	100
127	101	public function get_my_favourites() {
		@@ -137,49 +111,21 @@
137	111	"per_page" => $per_page,
138	112	"plan_type" => $plan_type
139	113	];
140	114
141		- if ( $type != 'all' ) {
	115	+ if( $type != 'all' ) {
142	116	$funcArgs['type'] = $type;
143	117	}
144	118
145		- $response = $this->http()->mutation( 'myFavouriteItem', 'total_page, current_page, data { id, name, rating, type, slug, favourite_count, thumbnail, thumbnail2, thumbnail3, price, author{ display_name, name, joined }, dependencies{ id, name, icon, plugin_file, plugin_original_slug, is_pro, link } }', $funcArgs )->post();
	119	+ $response = $this->http()->mutation(
	120	+ 'myFavouriteItem',
	121	+ 'total_page, current_page, data { id, name, rating, type, slug, favourite_count, thumbnail, thumbnail2, thumbnail3, price, author{ display_name, name, joined } }',
	122	+ $funcArgs
	123	+ )->post();
146	124
147	125	if ( is_wp_error( $response ) ) {
148		- return $this->error( 'invalid_my_favourites_response', __( $response->get_error_message(), 'templately' ), 'profile/my-favourites' );
149		- }
150		-
151		- return $response;
152		- }
153		-
154		- public function get_my_purchased_items() {
155		- $page = $this->get_param( 'page', 1, 'intval' );
156		- $per_page = $this->get_param( 'per_page', 10, 'intval' );
157		- $_all = $this->get_param( 'all', false );
158		- $platform = $this->get_param( 'platform', 'elementor' );
159		-
160		- $funcArgs = [
161		- 'api_key' => $this->api_key,
162		- 'platform' => $platform,
163		- 'page' => $page,
164		- 'per_page' => $per_page
165		- ];
166		-
167		- $query = 'total_page, current_page, data { id, item_id, name, slug, type, platform, thumbnail, purchased_at }';
168		-
169		- if ( $_all ) {
170		- $query = 'total_page, current_page, data { id, item_id, type, platform }';
171		- $funcArgs['per_page'] = -1;
172		- }
173		-
174		- $response = $this->http()->query( 'myItems', $query, $funcArgs )->post();
175		-
176		- if ( $response ) {
177		- // $user = $this->utils('options')->get('user');
178		-
179		- // $user['is_verified'] = true;
180		- // $this->utils('options')->set('user', $user);
	126	+ return $this->error( 'invalid_my_favourites_response', __( $response->get_error_message(), 'templately' ), 'profile/my-favourites', $response->get_error_code() );
181	127	}
182	128
183	129	return $response;
184	130	}
185	131	}