Fixes #537 Relative paths in Cards link field (#636)

az-digital · Apr 7, 2021 · 58cbf32 · 58cbf32
1 parent ee5997e
commit 58cbf32
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 6 deletions.
diff --git a/modules/custom/az_card/config/schema/az_card.schema.yml b/modules/custom/az_card/config/schema/az_card.schema.yml
@@ -17,7 +17,7 @@ field.value.az_card:
       type: string
       label: Card Link Title
     link_uri:
-      type: uri
+      type: string
       label: Card Link URI
     options:
       type: text

diff --git a/modules/custom/az_card/css/az-card-widget.css b/modules/custom/az_card/css/az-card-widget.css
@@ -25,7 +25,6 @@ tr.odd .az-card-elements .form-item {
 }
 
 .az-card-elements.az-card-elements-closed .form-type--textfield,
-.az-card-elements.az-card-elements-closed .form-type--url,
 .az-card-elements.az-card-elements-closed .form-type--textarea,
 .az-card-elements.az-card-elements-closed .filter-wrapper,
 .az-card-elements.az-card-elements-closed .form-type--select,

diff --git a/modules/custom/az_card/src/Plugin/Field/FieldFormatter/AZCardDefaultFormatter.php b/modules/custom/az_card/src/Plugin/Field/FieldFormatter/AZCardDefaultFormatter.php
@@ -6,7 +6,6 @@
 use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\paragraphs\ParagraphInterface;
 
@@ -37,6 +36,13 @@ class AZCardDefaultFormatter extends FormatterBase implements ContainerFactoryPl
    */
   protected $cardImageHelper;
 
+  /**
+   * Drupal\Core\Path\PathValidator definition.
+   *
+   * @var \Drupal\Core\Path\PathValidator
+   */
+  protected $pathValidator;
+
   /**
    * {@inheritdoc}
    */
@@ -50,6 +56,7 @@ public static function create(ContainerInterface $container, array $configuratio
 
     $instance->cardImageHelper = $container->get('az_card.image');
     $instance->entityTypeManager = $container->get('entity_type.manager');
+    $instance->pathValidator = $container->get('path.validator');
     return $instance;
   }
 
@@ -106,10 +113,11 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       // Link.
       $link_render_array = [];
       if ($item->link_title || $item->link_uri) {
+        $link_url = $this->pathValidator->getUrlIfValid($item->link_uri);
         $link_render_array = [
           '#type' => 'link',
           '#title' => $item->link_title ?? '',
-          '#url' => $item->link_uri ? Url::fromUri($item->link_uri) : '#',
+          '#url' => $link_url ? $link_url : '#',
           '#attributes' => ['class' => ['btn', 'btn-default', 'w-100']],
         ];
       }

diff --git a/modules/custom/az_card/src/Plugin/Field/FieldType/AZCardItem.php b/modules/custom/az_card/src/Plugin/Field/FieldType/AZCardItem.php
@@ -49,7 +49,7 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
       ->setLabel(t('Card Media'));
     $properties['link_title'] = DataDefinition::create('string')
       ->setLabel(t('Card Link Title'));
-    $properties['link_uri'] = DataDefinition::create('uri')
+    $properties['link_uri'] = DataDefinition::create('string')
       ->setLabel(t('Card Link URI'));
     $properties['options'] = MapDataDefinition::create()
       ->setLabel(t('Card Options'));

diff --git a/modules/custom/az_card/src/Plugin/Field/FieldWidget/AZCardWidget.php b/modules/custom/az_card/src/Plugin/Field/FieldWidget/AZCardWidget.php
@@ -215,8 +215,10 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     ];
 
     $element['link_uri'] = [
-      '#type' => 'url',
+      // Url FAPI element does not support internal paths.
+      '#type' => 'textfield',
       '#title' => $this->t('Card Link URL'),
+      '#element_validate' => [[$this, 'validateCardLink']],
       '#default_value' => isset($items[$delta]->link_uri) ? $items[$delta]->link_uri : NULL,
     ];
 
@@ -307,6 +309,26 @@ public function cardAjax(array &$form, FormStateInterface $form_state) {
     return $element;
   }
 
+  /**
+   * Form element validation handler for the 'link_url' field.
+   *
+   * Disallows saving inaccessible or untrusted URLs.
+   */
+  public function validateCardLink(&$element, FormStateInterface $form_state, &$complete_form) {
+
+    if (!empty($element['#value'])) {
+      // Check to make sure the path can be found.
+      if ($url = $this->pathValidator->getUrlIfValid($element['#value'])) {
+        // Url is valid, no conversion required.
+        return;
+      }
+      $form_state
+        ->setError($element, t('This link does not exist or you do not have permission to link to %path.', [
+          '%path' => $element['#value'],
+        ]));
+    }
+  }
+
   /**
    * {@inheritdoc}
    */