Merge pull request #1897 from WeCodePixels/1.4

Bugfix | Added missing RememberMeBadge into OAuth passport
hwi · Jul 21, 2022 · 88455e6 · 88455e6
2 parents 77498fc + d29affc
commit 88455e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/OAuth/ResourceOwner/AppleResourceOwner.php b/OAuth/ResourceOwner/AppleResourceOwner.php
@@ -146,7 +146,7 @@ protected function configureOptions(OptionsResolver $resolver)
 
     private static function jwt_decode($id_token)
     {
-        //// from http://stackoverflow.com/a/28748285/624544
+        // // from http://stackoverflow.com/a/28748285/624544
         [, $jwt] = explode('.', $id_token, 3);
 
         // if the token was urlencoded, do some fixes to ensure that it is valid base64 encoded

diff --git a/OAuth/Response/SensioConnectUserResponse.php b/OAuth/Response/SensioConnectUserResponse.php
@@ -112,7 +112,7 @@ public function setData($data)
             throw new AuthenticationException('Could not retrieve valid user info.');
         }
 
-        $this->xpath = new \DOMXpath($dom);
+        $this->xpath = new \DOMXPath($dom);
 
         $nodes = $this->xpath->evaluate('/api/root');
         $user = $this->xpath->query('./foaf:Person', $nodes->item(0));

diff --git a/Security/Http/Authenticator/OAuthAuthenticator.php b/Security/Http/Authenticator/OAuthAuthenticator.php
@@ -28,6 +28,7 @@
 use Symfony\Component\Security\Http\Authentication\AuthenticationFailureHandlerInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationSuccessHandlerInterface;
 use Symfony\Component\Security\Http\Authenticator\AuthenticatorInterface;
+use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
 use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface;
 use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
@@ -180,7 +181,8 @@ class_exists(UserBadge::class)
                     method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(),
                     static function () use ($user) { return $user; }
                 )
-                : $user
+                : $user,
+            [new RememberMeBadge()]
         );
     }