Skip to content
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

Fix credentials refreshment in Google OAuth2 #941

Merged
merged 1 commit into from
Apr 27, 2021
Merged

Fix credentials refreshment in Google OAuth2 #941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 22 additions & 4 deletions includes/google/class-google-oauth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,32 @@ private static function get_google_auth_saved_data() {
* @return object|bool Basic information, or false if unauthorised.
*/
private static function authenticated_user_basic_information() {
$auth_data = self::get_google_auth_saved_data();
if ( ! isset( $auth_data['access_token'] ) ) {
$oauth2_credentials = self::get_oauth2_credentials();
if ( false === $oauth2_credentials ) {
return false;
}

if ( $oauth2_credentials instanceof OAuth2 ) {
// These are non-refreshable credentials, we just have the access token stored.
$access_token = $oauth2_credentials->getAccessToken();
} elseif ( $oauth2_credentials instanceof UserRefreshCredentials ) {
// These credentials are refreshable, let's request a new access token.
try {
$token_response = $oauth2_credentials->fetchAuthToken();
} catch ( \Exception $e ) {
// Credentials might be broken, remove them.
delete_user_meta( get_current_user_id(), self::AUTH_DATA_USERMETA_NAME );
return false;
}

if ( ! isset( $token_response['access_token'] ) ) {
return false;
}

$access_token = $token_response['access_token'];
}

// Validate access token.
$access_token = $auth_data['access_token'];
$token_info_response = wp_safe_remote_get(
add_query_arg(
'access_token',
Expand All @@ -224,7 +243,6 @@ private static function authenticated_user_basic_information() {
)
);


if ( 200 === $token_info_response['response']['code'] ) {
$user_info_response = wp_safe_remote_get(
add_query_arg(
Expand Down