← All changes | modules/oauth/classes/data.php +16 -7 1.0.1 → 1.7.7 View file →

		@@ -1,12 +1,12 @@
1	1	<?php
2	2
3		-namespace ImageOptimizer\Modules\Oauth\Classes;
	3	+namespace ImageOptimization\Modules\Oauth\Classes;
4	4
5		-use ImageOptimizer\Modules\Oauth\Components\Connect;
	5	+use ImageOptimization\Modules\Oauth\Components\Connect;
6	6
7	7	if ( ! defined( 'ABSPATH' ) ) {
8		- exit; // Exit if accessed directly
	8	+ exit; // Exit if accessed directly.
9	9	}
10	10
11	11	/**
12	12	* Class Data
		@@ -11,9 +11,8 @@
11	11	/**
12	12	* Class Data
13	13	*/
14	14	class Data {
15		-
16	15	const CONNECT_CLIENT_DATA_OPTION_NAME = 'image_optimizer_client_data';
17	16	const CONNECT_DATA_OPTION_NAME = 'image_optimizer_connect_data';
18	17	const OPTION_CONNECT_SITE_KEY = 'image_optimizer_site_key';
19	18	const OPTION_CONNECT_STATE = 'image_optimizer_connect_state';
		@@ -42,9 +41,8 @@
42	41	'auth_secret' => '',
43	42	] );
44	43	}
45	44
46		-
47	45	/**
48	46	* get_client_id
49	47	* @return string
50	48	*/
		@@ -52,8 +50,16 @@
52	50	return self::get_client_data()['client_id'] ?? '';
53	51	}
54	52
55	53	/**
	54	+ * get_client_secret
	55	+ * @return string
	56	+ */
	57	+ public static function get_client_secret(): string {
	58	+ return self::get_client_data()['auth_secret'] ?? '';
	59	+ }
	60	+
	61	+ /**
56	62	* get_connect_data
57	63	*
58	64	* @param bool $force
59	65	*
		@@ -60,9 +66,9 @@
60	66	* @return array|null
61	67	*/
62	68	public static function get_connect_data( bool $force = false ): array {
63	69	static $connect_data = null;
64		- if ( $connect_data === null || $force ) {
	70	+ if ( null === $connect_data || $force ) {
65	71	$connect_data = array_merge(
66	72	[
67	73	'access_token' => '',
68	74	'access_token_secret' => '',
		@@ -68,8 +74,9 @@
68	74	'access_token_secret' => '',
69	75	'last_update' => 0,
70	76	'token_type' => 'bearer',
71	77	'user' => [],
	78	+ 'version' => 1,
72	79	],
73	80	get_option( self::CONNECT_DATA_OPTION_NAME, [] )
74	81	);
75	82	}
		@@ -82,8 +89,9 @@
82	89	* @param array $data
83	90	*/
84	91	public static function set_connect_data( array $data = [] ): bool {
85	92	$data['last_update'] = time();
	93	+ $data['version'] = 1;
86	94
87	95	update_option( self::OPTION_OWNER_USER_ID, get_current_user_id() );
88	96	return update_option( self::CONNECT_DATA_OPTION_NAME, $data );
89	97	}
		@@ -155,12 +163,13 @@
155	163
156	164	delete_option( self::OPTION_OWNER_USER_ID );
157	165	delete_option( static::CONNECT_DATA_OPTION_NAME );
158	166	delete_option( self::CONNECT_CLIENT_DATA_OPTION_NAME );
	167	+ delete_transient( Connect::STATUS_CHECK_TRANSIENT );
159	168	}
160	169
161	170	public static function images_left(): int {
162		- $plan_data = Connect::check_connect_status();
	171	+ $plan_data = Connect::get_connect_status();
163	172
164	173	if ( empty( $plan_data ) ) {
165	174	return 0;
166	175	}