Add YouTube NoCookie support, fixes #826

Author: sprankhub

app/code/Magento/PageBuilder/etc/di.xml

@@ -361,6 +361,7 @@
         <arguments>
             <argument name="allowedHosts" xsi:type="array">
                 <item name="youtube" xsi:type="string">youtube.com</item>
+                <item name="youtube-nocookie" xsi:type="string">youtube-nocookie.com</item>
                 <item name="vimeo" xsi:type="string">vimeo.com</item>
             </argument>
         </arguments>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/src.js

@@ -38,12 +38,16 @@ export default class Src implements ConverterInterface {
 
         const youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
             "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+        const youtubeNoCookieRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
+            "(?:youtube-nocookie\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
         const vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" +
             "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
         const fileRegExp = new RegExp("^(?:https:|http:)?\\/\\/.*[\\\\\\/].+\\.(webm|mp4|ogv)(?!\w)");
 
         if (youtubeRegExp.test(value)) {
             return "https://www.youtube.com/embed/" + youtubeRegExp.exec(value)[1];
+        } else if (youtubeNoCookieRegExp.test(value)) {
+            return "https://www.youtube-nocookie.com/embed/" + youtubeNoCookieRegExp.exec(value)[1];
         } else if (vimeoRegExp.test(value)) {
             return "https://player.vimeo.com/video/" + vimeoRegExp.exec(value)[3] + "?title=0&byline=0&portrait=0";
         } else if (fileRegExp.test(value)) {

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/videosrc.js

@@ -99,12 +99,17 @@ export default class VideoSrc implements ConverterInterface {
 
         const youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
             "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+        const youtubeNoCookieRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
+            "(?:youtube-nocookie\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
         const vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" +
             "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
 
         if (youtubeRegExp.test(value)) {
             return "https://www.youtube.com/embed/" + youtubeRegExp.exec(value)[1] +
                 VideoSrc.parseYoutubeGetParams(value, data);
+        } else if (youtubeNoCookieRegExp.test(value)) {
+            return "https://www.youtube-nocookie.com/embed/" + youtubeNoCookieRegExp.exec(value)[1] +
+                VideoSrc.parseYoutubeGetParams(value, data);
         } else if (vimeoRegExp.test(value)) {
             return "https://player.vimeo.com/video/" + vimeoRegExp.exec(value)[3] +
                 "?title=0&byline=0&portrait=0" + (data.autoplay === "true" ? "&autoplay=1&autopause=0&muted=1" : "");

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/master.js

@@ -9,7 +9,8 @@ export default class Master extends BaseMaster {
 
     public isHosted(src: string): boolean {
         const youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
-            "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+            "(?:youtu\\.be\/|(?:youtube\\.com\/|youtube-nocookie\\.com\/)(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))" +
+            "([\\w-]{11})(?![\\w-])");
         const vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" +
             "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
         return (vimeoRegExp.test(src) || youtubeRegExp.test(src));

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/preview.js

@@ -34,7 +34,8 @@ export default class Preview extends BasePreview {
 
     public isHosted(src: string): boolean {
         const youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
-            "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+            "(?:youtu\\.be\/|(?:youtube\\.com\/|youtube-nocookie\\.com\/)(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))" +
+            "([\\w-]{11})(?![\\w-])");
         const vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" +
             "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
         return (vimeoRegExp.test(src) || youtubeRegExp.test(src));