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

Conflicts with "The Events Calendar" also active #40

Merged
merged 7 commits into from
Jul 19, 2019
Merged

Conflicts with "The Events Calendar" also active #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4ba4eb
DO NOT MERGE
jasonbahl Jul 16, 2019
0453444
DO NOT MERGE
jasonbahl Jul 16, 2019
e69b4b4
- Bail in determine_current_user filter if it's not a GraphQL HTTP Re…
jasonbahl Jul 17, 2019
3bbf50b
- More adjustments for the determine_current_user callback
jasonbahl Jul 17, 2019
e2f8130
Merge branch 'master' into bug/#39-conflict-with-the-events-calendar
jasonbahl Jul 18, 2019
e1c903a
#41 - JWT fields cannot be retrieved via viewer query
jasonbahl Jul 18, 2019
42fff3a
#41 - JWT fields cannot be retrieved via viewer query
jasonbahl Jul 18, 2019
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
7 changes: 4 additions & 3 deletions src/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ protected static function authenticate_user( $username, $password ) {
* @param (int|bool) $user Logged User ID
*
* @return mixed|false|\WP_User
* @throws \Exception
*/
public static function filter_determine_current_user( $user ) {

Expand All @@ -377,7 +378,7 @@ public static function filter_determine_current_user( $user ) {
/**
* If no token was generated, return the existing value for the $user
*/
if ( empty( $token ) ) {
if ( empty( $token ) || is_wp_error( $token ) ) {

/**
* Return the user that was passed in to the filter
Expand All @@ -397,7 +398,6 @@ public static function filter_determine_current_user( $user ) {

}


/**
* Everything is ok, return the user ID stored in the token
*/
Expand Down Expand Up @@ -488,6 +488,7 @@ public static function unrevoke_user_secret( int $user_id ) {

}


protected static function set_status( $status_code ) {
add_filter( 'graphql_response_status_code', function() use ( $status_code ) {
return $status_code;
Expand Down Expand Up @@ -560,7 +561,7 @@ public static function validate_token( $token = null, $refresh = false ) {
/**
* The Token is decoded now validate the iss
*/
if ( get_bloginfo( 'url' ) !== $token->iss ) {
if ( ! isset( $token->iss ) || get_bloginfo( 'url' ) !== $token->iss ) {
throw new \Exception( __( 'The iss do not match with this server', 'wp-graphql-jwt-authentication' ) );
}

Expand Down
4 changes: 2 additions & 2 deletions vendor/composer/ClassLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ public function isClassMapAuthoritative()
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
}

/**
Expand Down Expand Up @@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
$search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
Expand Down
5 changes: 2 additions & 3 deletions wp-graphql-jwt-authentication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ private function includes() {
*/
private static function init() {


/**
* Initialize the GraphQL fields for managing tokens
*/
Expand All @@ -175,7 +174,7 @@ private static function init() {
add_filter( 'determine_current_user', [
'\WPGraphQL\JWT_Authentication\Auth',
'filter_determine_current_user'
], 10, 1 );
], 99, 1 );

/**
* Filter the rootMutation fields
Expand All @@ -202,4 +201,4 @@ function init() {
return JWT_Authentication::instance();
}

add_action( 'plugins_loaded', '\WPGraphQL\JWT_Authentication\init' );
add_action( 'plugins_loaded', '\WPGraphQL\JWT_Authentication\init', 1 );