← All changes | sal/class.json-api-token.php +15 -10 12.9.5 → 16.2 View file →

		@@ -4,8 +4,12 @@
4	4	*
5	5	* @package automattic/jetpack
6	6	*/
7	7
	8	+if ( ! defined( 'ABSPATH' ) ) {
	9	+ exit( 0 );
	10	+}
	11	+
8	12	/**
9	13	* Base class for Jetpack_Site, so that we have a real class instead of just passing around an array.
10	14	*/
11	15	class SAL_Token {
		@@ -80,14 +84,14 @@
80	84	$this->auth_type = $auth_type;
81	85	}
82	86
83	87	/**
84		- * Set's the scope variable to 'global'.
	88	+ * Checks if the scope is 'global'.
85	89	*
86		- * @return string
	90	+ * @return bool
87	91	*/
88	92	public function is_global() {
89		- return $scope === 'global'; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
	93	+ return $this->scope === 'global';
90	94	}
91	95
92	96	/**
93	97	* This function is used to create a SAL_Token instance with only a user id, if a token doesn't already exist.
		@@ -113,17 +117,18 @@
113	117	*
114	118	* @return SAL_Token
115	119	*/
116	120	public static function from_rest_token( $token ) {
117		- $user_id = isset( $token['user_id'] ) ? $token['user_id'] : get_current_user_id();
118		- $scope = isset( $token['scope'] ) ? $token['scope'][0] : null;
119		- $client_id = isset( $token['client_id'] ) ? $token['client_id'] : null;
120		- $external_user_id = isset( $token['external_user_id'] ) ? $token['external_user_id'] : null;
121		- $external_user_code = isset( $token['external_user_code'] ) ? $token['external_user_code'] : null;
122		- $auth = isset( $token['auth'] ) ? $token['auth'] : null;
	121	+ $user_id = $token['user_id'] ?? get_current_user_id();
	122	+ $scope = $token['scope'][0] ?? null;
	123	+ $client_id = $token['client_id'] ?? null;
	124	+ $external_user_id = $token['external_user_id'] ?? null;
	125	+ $external_user_code = $token['external_user_code'] ?? null;
	126	+ $auth = $token['auth'] ?? null;
	127	+ $blog_id = $token['blog_id'] ?? null;
123	128
124	129	return new SAL_Token(
125		- $token['blog_id'],
	130	+ $blog_id,
126	131	$user_id,
127	132	$scope, // there's only ever one scope in our current API implementation, auth or global.
128	133	$client_id,
129	134	$external_user_id,