Skip to content

Use late binding for static Podio method invocation #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2019
Merged

Use late binding for static Podio method invocation #178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f9b160
Use late binding for static Podio method invocation
daniel-sc Jan 29, 2016
35b69e5
reusing refresh_access_token method
daniel-sc Jul 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions lib/Podio.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@ public static function setup($client_id, $client_secret, $options = array('sessi
}

public static function authenticate_with_app($app_id, $app_token) {
return self::authenticate('app', array('app_id' => $app_id, 'app_token' => $app_token));
return static::authenticate('app', array('app_id' => $app_id, 'app_token' => $app_token));
}

public static function authenticate_with_password($username, $password) {
return self::authenticate('password', array('username' => $username, 'password' => $password));
return static::authenticate('password', array('username' => $username, 'password' => $password));
}

public static function authenticate_with_authorization_code($authorization_code, $redirect_uri) {
return self::authenticate('authorization_code', array('code' => $authorization_code, 'redirect_uri' => $redirect_uri));
return static::authenticate('authorization_code', array('code' => $authorization_code, 'redirect_uri' => $redirect_uri));
}

public static function refresh_access_token() {
return self::authenticate('refresh_token', array('refresh_token' => self::$oauth->refresh_token));
return static::authenticate('refresh_token', array('refresh_token' => self::$oauth->refresh_token));
}

public static function authenticate($grant_type, $attributes) {
Expand Down Expand Up @@ -104,7 +104,7 @@ public static function authenticate($grant_type, $attributes) {
}

$request_data = array_merge($data, array('client_id' => self::$client_id, 'client_secret' => self::$client_secret));
if ($response = self::request(self::POST, '/oauth/token', $request_data, array('oauth_request' => true))) {
if ($response = static::request(self::POST, '/oauth/token', $request_data, array('oauth_request' => true))) {
$body = $response->json_body();
self::$oauth = new PodioOAuth($body['access_token'], $body['refresh_token'], $body['expires_in'], $body['ref'], $body['scope']);

Expand Down Expand Up @@ -166,7 +166,7 @@ public static function request($method, $url, $attributes = array(), $options =

$separator = strpos($url, '?') ? '&' : '?';
if ($attributes) {
$query = self::encode_attributes($attributes);
$query = static::encode_attributes($attributes);
$url = $url.$separator.$query;
}

Expand All @@ -178,7 +178,7 @@ public static function request($method, $url, $attributes = array(), $options =

$separator = strpos($url, '?') ? '&' : '?';
if ($attributes) {
$query = self::encode_attributes($attributes);
$query = static::encode_attributes($attributes);
$url = $url.$separator.$query;
}

Expand All @@ -202,7 +202,7 @@ public static function request($method, $url, $attributes = array(), $options =
}
else {
// x-www-form-urlencoded
$encoded_attributes = self::encode_attributes($attributes);
$encoded_attributes = static::encode_attributes($attributes);
curl_setopt(self::$ch, CURLOPT_POSTFIELDS, $encoded_attributes);
self::$headers['Content-type'] = 'application/x-www-form-urlencoded';
}
Expand Down Expand Up @@ -232,7 +232,7 @@ public static function request($method, $url, $attributes = array(), $options =
self::$headers['Accept'] = '*/*';
}

curl_setopt(self::$ch, CURLOPT_HTTPHEADER, self::curl_headers());
curl_setopt(self::$ch, CURLOPT_HTTPHEADER, static::curl_headers());
curl_setopt(self::$ch, CURLOPT_URL, empty($options['file_download']) ? self::$url.$url : $url);

$response = new PodioResponse();
Expand All @@ -251,7 +251,7 @@ public static function request($method, $url, $attributes = array(), $options =

fseek($result_handle, 0);
$response->status = curl_getinfo(self::$ch, CURLINFO_HTTP_CODE);
$response->headers = self::parse_headers(fread($result_handle, $raw_headers_size));
$response->headers = static::parse_headers(fread($result_handle, $raw_headers_size));
self::$last_response = $response;
return $result_handle;
}
Expand All @@ -264,12 +264,12 @@ public static function request($method, $url, $attributes = array(), $options =

$response->body = substr($raw_response, $raw_headers_size);
$response->status = curl_getinfo(self::$ch, CURLINFO_HTTP_CODE);
$response->headers = self::parse_headers(substr($raw_response, 0, $raw_headers_size));
$response->headers = static::parse_headers(substr($raw_response, 0, $raw_headers_size));
self::$last_response = $response;

if (!isset($options['oauth_request'])) {
$curl_info = curl_getinfo(self::$ch, CURLINFO_HEADER_OUT);
self::log_request($method, $url, $encoded_attributes, $response, $curl_info);
static::log_request($method, $url, $encoded_attributes, $response, $curl_info);
}

switch ($response->status) {
Expand All @@ -283,7 +283,7 @@ public static function request($method, $url, $attributes = array(), $options =
$body = $response->json_body();
if (strstr($body['error'], 'invalid_grant')) {
// Reset access token & refresh_token
self::clear_authentication();
static::clear_authentication();
throw new PodioInvalidGrantError($response->body, $response->status, $url);
break;
}
Expand All @@ -296,24 +296,24 @@ public static function request($method, $url, $attributes = array(), $options =
if (strstr($body['error_description'], 'expired_token') || strstr($body['error'], 'invalid_token')) {
if (self::$oauth->refresh_token) {
// Access token is expired. Try to refresh it.
if (self::authenticate('refresh_token', array('refresh_token' => self::$oauth->refresh_token))) {
if (static::refresh_access_token()) {
// Try the original request again.
return self::request($method, $original_url, $attributes);
return static::request($method, $original_url, $attributes);
}
else {
self::clear_authentication();
static::clear_authentication();
throw new PodioAuthorizationError($response->body, $response->status, $url);
}
}
else {
// We have tried in vain to get a new access token. Log the user out.
self::clear_authentication();
static::clear_authentication();
throw new PodioAuthorizationError($response->body, $response->status, $url);
}
}
elseif (strstr($body['error'], 'invalid_request') || strstr($body['error'], 'unauthorized')) {
// Access token is invalid.
self::clear_authentication();
static::clear_authentication();
throw new PodioAuthorizationError($response->body, $response->status, $url);
}
break;
Expand Down Expand Up @@ -348,16 +348,16 @@ public static function request($method, $url, $attributes = array(), $options =
}

public static function get($url, $attributes = array(), $options = array()) {
return self::request(Podio::GET, $url, $attributes, $options);
return static::request(Podio::GET, $url, $attributes, $options);
}
public static function post($url, $attributes = array(), $options = array()) {
return self::request(Podio::POST, $url, $attributes, $options);
return static::request(Podio::POST, $url, $attributes, $options);
}
public static function put($url, $attributes = array()) {
return self::request(Podio::PUT, $url, $attributes);
return static::request(Podio::PUT, $url, $attributes);
}
public static function delete($url, $attributes = array()) {
return self::request(Podio::DELETE, $url, $attributes);
return static::request(Podio::DELETE, $url, $attributes);
}

public static function curl_headers() {
Expand Down