Skip to content

Commit 0453444

Browse files
committed
DO NOT MERGE
- This is an initial attempt at addressing the conflict. This is not ready for merge, but wanted to test to see if the general approach fixes the conflict for @mhinton
1 parent d4ba4eb commit 0453444

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

src/Auth.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ public static function validate_token( $token = null, $refresh = false ) {
561561
/**
562562
* The Token is decoded now validate the iss
563563
*/
564-
if ( get_bloginfo( 'url' ) !== $token->iss ) {
564+
if ( ! isset( $token->iss ) || get_bloginfo( 'url' ) !== $token->iss ) {
565565
throw new \Exception( __( 'The iss do not match with this server', 'wp-graphql-jwt-authentication' ) );
566566
}
567567

wp-graphql-jwt-authentication.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -166,20 +166,11 @@ private function includes() {
166166
*/
167167
private static function init() {
168168

169-
170169
/**
171170
* Initialize the GraphQL fields for managing tokens
172171
*/
173172
ManageTokens::init();
174173

175-
/**
176-
* Filter how WordPress determines the current user
177-
*/
178-
add_filter( 'determine_current_user', [
179-
'\WPGraphQL\JWT_Authentication\Auth',
180-
'filter_determine_current_user'
181-
], 1, 1 );
182-
183174
/**
184175
* Filter the rootMutation fields
185176
*/

0 commit comments

Comments
 (0)