Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20089 from woocommerce/fix/20042 

Allow oAuth1.0a under SSL
This commit is contained in:
Mike Jolley 2018-05-30 15:37:45 +01:00 committed by GitHub
parent c90afb9af2 dbec84e0a9
commit 79c34ba843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/api/class-wc-rest-authentication.php
View File

@ -78,7 +78,11 @@ class WC_REST_Authentication {
}
if ( is_ssl() ) {
return $this->perform_basic_authentication();
$user_id = $this->perform_basic_authentication();
}
if ( $user_id ) {
return $user_id;
}
return $this->perform_oauth_authentication();