From 4aedffbf11ead1acf5984b11a8756f19c053af5f Mon Sep 17 00:00:00 2001
From: Nicola Galgano <optimus4joomla@gmail.com>
Date: Fri, 19 Jun 2020 12:14:17 +0200
Subject: [PATCH] [4.0][api][com_content] render the image field (#29630)

---
 .../com_content/src/Model/ArticlesModel.php   |  1 +
 .../com_content/src/Helper/ContentHelper.php  | 40 +++++++++++++++++++
 .../src/View/Articles/JsonapiView.php         | 20 ++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 api/components/com_content/src/Helper/ContentHelper.php

diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
index a616cd6ae2037..642935d5bbf40 100644
--- a/administrator/components/com_content/src/Model/ArticlesModel.php
+++ b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -260,6 +260,7 @@ protected function getListQuery()
 					$db->quoteName('a.introtext'),
 					$db->quoteName('a.fulltext'),
 					$db->quoteName('a.note'),
+					$db->quoteName('a.images'),
 				]
 			)
 		)
diff --git a/api/components/com_content/src/Helper/ContentHelper.php b/api/components/com_content/src/Helper/ContentHelper.php
new file mode 100644
index 0000000000000..bb076c9d35c89
--- /dev/null
+++ b/api/components/com_content/src/Helper/ContentHelper.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Api
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Content\Api\Helper;
+
+\defined('_JEXEC') or die;
+
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * Content api helper.
+ *
+ * @since  4.0
+ */
+class ContentHelper
+{
+	/**
+	 * Fully Qualified Domain name for the image url
+	 *
+	 * @param   string  $uri      The uri to resolve
+	 *
+	 * @return  string
+	 */
+	public static function resolve(string $uri): string
+	{
+		// Check if external URL.
+		if (stripos($uri, 'http') !== 0)
+		{
+			return Uri::root() . $uri;
+		}
+
+		return $uri;
+	}
+}
diff --git a/api/components/com_content/src/View/Articles/JsonapiView.php b/api/components/com_content/src/View/Articles/JsonapiView.php
index 45bafba168d9f..13b12bc8e8ec1 100644
--- a/api/components/com_content/src/View/Articles/JsonapiView.php
+++ b/api/components/com_content/src/View/Articles/JsonapiView.php
@@ -15,8 +15,10 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\MVC\View\JsonApiView as BaseApiView;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Component\Content\Api\Helper\ContentHelper;
 use Joomla\Component\Content\Api\Serializer\ContentSerializer;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
+use Joomla\Registry\Registry;
 
 /**
  * The article view
@@ -43,6 +45,7 @@ class JsonapiView extends BaseApiView
 		'category',
 		'created',
 		'author',
+		'images',
 	];
 
 	/**
@@ -63,6 +66,7 @@ class JsonapiView extends BaseApiView
 		'category',
 		'created',
 		'author',
+		'images',
 	];
 
 	/**
@@ -189,6 +193,22 @@ protected function prepareItem($item)
 			$item->tags = [];
 		}
 
+		if (isset($item->images))
+		{
+			$registry = new Registry($item->images);
+			$item->images = $registry->toArray();
+
+			if (!empty($item->images['image_intro']))
+			{
+				$item->images['image_intro'] = ContentHelper::resolve($item->images['image_intro']);
+			}
+
+			if (!empty($item->images['image_fulltext']))
+			{
+				$item->images['image_fulltext'] = ContentHelper::resolve($item->images['image_fulltext']);
+			}
+		}
+
 		return parent::prepareItem($item);
 	}
 }