Merge pull request #15 from contentstack/bug/image-src-to-url

Image link and embed tag support for attribute url added

Author: uttamukkoji

LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 
-Copyright (c) 2016-2021 Contentstack
+Copyright (c) 2016-2022 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

SECURITY.md

@@ -0,0 +1,27 @@
+## Security
+
+Contentstack takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations.
+
+If you believe you have found a security vulnerability in any Contentstack-owned repository, please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Send email to [security@contentstack.com](mailto:security@contentstack.com).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message.
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+[https://www.contentstack.com/trust/](https://www.contentstack.com/trust/)

__test__/json-to-html.test.ts

@@ -14,10 +14,12 @@ import {
     orderListJson,
     unorderListJson,
     imgJson,
+    imgJsonURL,
     tableJson,
     blockquoteJson,
     codeJson,
-    linkInPJson} from './mock/json-element-mock'
+    linkInPJson,
+    linkInPJsonUrl} from './mock/json-element-mock'
 import {
     blockquoteHtml,
     codeHtml,
@@ -350,7 +352,7 @@ describe('Node parse image content', () => {
             uid: 'entry_uid_19',
             supercharged_rte: [
                 {
-                    ...imgJson
+                    ...imgJsonURL
                 }
             ],
             _embedded_items: {}
@@ -477,7 +479,7 @@ describe('Node parse link in paragraph content', () => {
             uid: 'entry_uid_19',
             supercharged_rte: [
                 {
-                    ...linkInPJson
+                    ...linkInPJsonUrl
                 },
             ],
             _embedded_items: {}

__test__/mock/json-element-mock.ts

@@ -348,6 +348,32 @@ const imgJson = {
   type: "doc"
 }
 
+const imgJsonURL = {
+  uid: "06e34a7a4849d7fc2acd",
+  _version: 13,
+  attrs: {},
+  children: [
+    {
+      "uid": "f3be74be3b64646e626",
+      "type": "img",
+      "attrs": {
+          "url": "https://image.url/Donald.jog.png",
+          "width": 33.69418132611637,
+          "height": "auto",
+          "redactor-attributes": {
+              "asset_uid": "47f1aa5ae422cd1"
+          }
+      },
+      "children": [
+          {
+              "text": ""
+          }
+      ]
+    }
+  ],
+  type: "doc"
+}
+
 const paragraphJson = {
     uid: "0d7fd",
     _version: 13,
@@ -610,6 +636,51 @@ const linkInPJson = {
   type: "doc"
 }
 
+
+const linkInPJsonUrl = {
+  uid: "06e34a7190849d7f2acd",
+  _version: 13,
+  attrs: {},
+  children: [
+    {
+      "type": "ps",
+      "attrs": {
+          "style": {
+          "text-align": "left"
+          },
+          "redactor-attributes": {}
+      },
+      "uid": "d88dcdf4590dff2d",
+      "children": [
+          {
+          "text": "",
+          "bold": true,
+          "italic": true,
+          "underline": true,
+          "subscript": true
+          },
+          {
+          "uid": "0d06598201aa8b47",
+          "type": "a",
+          "attrs": {
+              "url": "LINK.com",
+              "target": "_self"
+          },
+          "children": [
+              {
+              "text": "LINK"
+              }
+          ]
+          },
+          {
+          "text": ""
+          }
+      ]
+      }
+  ],
+  type: "doc"
+}
+
 const assetReferenceJson = {
     uid: "node_uid_12",
     _version: 1,
@@ -954,9 +1025,11 @@ export {
   h5Json,
   h6Json,
   imgJson,
+  imgJsonURL,
   codeJson,
   tableJson,
   linkInPJson,
+  linkInPJsonUrl,
   plainTextJson,
   paragraphJson, 
   orderListJson,

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/utils",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Contentstack utilities for Javascript",
   "main": "dist/index.es.js",
   "types": "dist/types/index.d.ts",

package.json

@@ -11,13 +11,13 @@ export const defaultNodeOption: RenderOption = {
          return `<p>${next(node.children)}</p>`
     },
     [NodeType.LINK]:(node: Node, next: Next) => {
-         return `<a href="${node.attrs.href}">${next(node.children)}</a>`
+         return `<a href="${node.attrs.href || node.attrs.url}">${next(node.children)}</a>`
     },
     [NodeType.IMAGE]:(node: Node, next: Next) => {
-        return `<img src="${node.attrs.src}" />${next(node.children)}`
+        return `<img src="${node.attrs.src || node.attrs.url}" />${next(node.children)}`
     },
     [NodeType.EMBED]:(node: Node, next: Next) => {
-        return `<iframe src="${node.attrs.src}">${next(node.children)}</iframe>`
+        return `<iframe src="${node.attrs.src || node.attrs.url}">${next(node.children)}</iframe>`
     },
     [NodeType.HEADING_1]:(node: Node, next: Next) => {
         return `<h1>${next(node.children)}</h1>`