Merge pull request #20 from fatguytyson/master

Bolt 5.0 compatibility
bolt · Jan 6, 2022 · 5f0c150 · 5f0c150
2 parents 6830c5e + 5f448e3
commit 5f0c150
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/Exclude/ProtectedDetailController.php b/src/Exclude/ProtectedDetailController.php
@@ -42,15 +42,15 @@ public function __construct(DetailController $detailController, Config $config)
      *
      * @param string|int $slugOrId
      */
-    public function record($slugOrId, ?string $contentTypeSlug = null, bool $requirePublished = true): Response
+    public function record($slugOrId, ?string $contentTypeSlug = null, bool $requirePublished = true, string $_locale = null): Response
     {
         $contentType = ContentType::factory($contentTypeSlug, $this->config->get('contenttypes'));
         $this->applyAllowForGroupsGuard($contentType);
 
         return $this->detailController->record($slugOrId, $contentTypeSlug, $requirePublished);
     }
 
-    public function contentByFieldValue(string $contentTypeSlug, string $field, string $value): Response
+    public function contentByFieldValue(string $contentTypeSlug, string $field, string $value, string $_locale = null): Response
     {
         $contentType = ContentType::factory($contentTypeSlug, $this->config->get('contenttypes'));
         $this->applyAllowForGroupsGuard($contentType);

diff --git a/src/Twig/LoginFormExtension.php b/src/Twig/LoginFormExtension.php
@@ -7,6 +7,7 @@
 use Bolt\UsersExtension\ExtensionConfigInterface;
 use Bolt\UsersExtension\ExtensionConfigTrait;
 use Bolt\UsersExtension\Utils\ExtensionUtils;
+use Bolt\Version;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Extension\AbstractExtension;
@@ -64,20 +65,22 @@ public function getLoginForm(bool $withLabels = true, array $labels = []): strin
 
     public function getUsernameField(bool $withLabel, array $labels): string
     {
+        $name = $this->useOldLoginForm() ? 'username' : 'login[username]';
         $text = array_key_exists('username', $labels) ? $labels['username'] : 'Username';
-        $label = $withLabel ? sprintf('<label for="username">%s</label>', $text) : '';
+        $label = $withLabel ? sprintf('<label for="%s">%s</label>', $name, $text) : '';
 
-        $input = '<input type="text" id="username" name="username">';
+        $input = sprintf('<input type="text" id="username" name="%s">', $name);
 
         return $label . $input;
     }
 
     public function getPasswordField(bool $withLabel, array $labels): string
     {
+        $name = $this->useOldLoginForm() ? 'password' : 'login[password]';
         $text = array_key_exists('password', $labels) ? $labels['password'] : 'Password';
-        $label = $withLabel ? sprintf('<label for="password">%s</label>', $text) : '';
+        $label = $withLabel ? sprintf('<label for="%s">%s</label>', $name, $text) : '';
 
-        $input = '<input type="password" id="password" name="password">';
+        $input = sprintf('<input type="password" id="password" name="%s">', $name);
 
         return $label . $input;
     }
@@ -101,9 +104,10 @@ public function getSubmitButton(array $labels = []): string
 
     public function getCsrfField(): string
     {
-        $token = $this->csrfTokenManager->getToken('authenticate');
+        $name = $this->useOldLoginForm() ? '_csrf_token' : 'login[_token]';
+        $token = $this->csrfTokenManager->getToken($this->useOldLoginForm() ? 'authenticate' : 'login_csrf_token');
 
-        return sprintf('<input type="hidden" name="_csrf_token" value="%s">', $token);
+        return sprintf('<input type="hidden" name="%s" value="%s">', $name, $token);
     }
 
     public function getRedirectField(string $group = '', string $pathOrUrl = ''): string
@@ -118,4 +122,8 @@ public function getRedirectField(string $group = '', string $pathOrUrl = ''): st
 
         return sprintf('<input type="hidden" name="_target_path" value="%s">', $pathOrUrl);
     }
+
+    private function useOldLoginForm(): bool{
+        return Version::compare('4.2.2', '>=');
+    }
 }