Update demo to use CSRF form (#30)

* Update demo to use CSRF form
Update CSRF data handler to only hydrate value on generateInput, preventing null CSRF on hydrate been automatically corrected

* version bump

demo/index.php

@@ -1,5 +1,6 @@
 <?php
 
+use Packaged\Form\Csrf\CsrfForm;
 use Packaged\Form\DataHandlers\BooleanDataHandler;
 use Packaged\Form\DataHandlers\EmailDataHandler;
 use Packaged\Form\DataHandlers\EnumDataHandler;
@@ -11,7 +12,6 @@
 use Packaged\Form\DataHandlers\ReadOnlyDataHandler;
 use Packaged\Form\DataHandlers\SecureTextDataHandler;
 use Packaged\Form\DataHandlers\TextDataHandler;
-use Packaged\Form\Form\Form;
 use Packaged\Helpers\Arrays;
 use Packaged\SafeHtml\SafeHtml;
 use Packaged\Validate\Validators\ConfirmationValidator;
@@ -23,7 +23,7 @@
 
 require('../vendor/autoload.php');
 
-class DemoForm extends Form
+class DemoForm extends CsrfForm
 {
   /**
    * @var TextDataHandler
@@ -76,6 +76,8 @@ class DemoForm extends Form
 
   protected function _initDataHandlers()
   {
+    parent::_initDataHandlers();
+
     $this->name = TextDataHandler::i()->addValidator(new StringValidator(2, 20));
     $this->email = EmailDataHandler::i()
       ->setAutocomplete('email');
@@ -120,7 +122,7 @@ protected function _configureDataHandlers()
 }
 
 $data = array_merge($_POST, $_FILES);
-$form = new DemoForm();
+$form = new DemoForm('secret');
 if(!empty($data))
 {
   $errors = $form->hydrate($data);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@packaged/form",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "main": "/index.js",
   "repository": "[email protected]:packaged/form",
   "author": "Tom Kay <[email protected]>",

php/src/Csrf/CsrfDataHandler.php

@@ -2,6 +2,7 @@
 namespace Packaged\Form\Csrf;
 
 use Packaged\Form\DataHandlers\HiddenDataHandler;
+use Packaged\Ui\Html\HtmlElement;
 
 class CsrfDataHandler extends HiddenDataHandler
 {
@@ -86,4 +87,30 @@ protected function _setupValidators()
   {
     $this->addValidator(new CsrfValidator($this->_generatePassword(), $this->_expiryMins));
   }
+
+  public function getValue($default = null, $withDefault = false, $formatValue = true)
+  {
+    return parent::getValue($default, $withDefault, $formatValue);
+  }
+
+  protected function _generateInput(): HtmlElement
+  {
+    $ele = $this->_createBaseElement();
+    $ele->addAttributes(
+      [
+        'name'        => $this->getName(),
+        'id'          => $this->getId(),
+        'value'       => $this->formatValue($this->getValue(null, true)),
+        'placeholder' => $this->getPlaceholder(),
+      ]
+    );
+
+    $autocomplete = $this->getAutocomplete();
+    if(!empty($autocomplete))
+    {
+      $ele->setAttribute('autocomplete', $autocomplete);
+    }
+
+    return $ele;
+  }
 }