Merge remote-tracking branch 'origin/MC-42105' into MC-24548

Author: OlgaVasyltsun

app/code/Magento/ProductVideo/Test/Mftf/Data/ProductVideoData.xml

@@ -18,4 +18,7 @@
         <data key="videoTitle">The New Vimeo Player (You Know, For Videos)</data>
         <data key="videoShortTitle">The New Vimeo Player</data>
     </entity>
+    <entity name="VimeoPrivateVideo" type="product_video">
+        <data key="videoUrl">https://vimeo.com/313826626</data>
+    </entity>
 </entities>

app/code/Magento/ProductVideo/Test/Mftf/Test/AdminValidatePrivacyOnVimeoGetVideoInformationTest.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminValidatePrivacyOnVimeoGetVideoInformationTest">
+        <annotations>
+            <features value="ProductVideo"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Admin validates Vimeo video privacy when getting video information"/>
+            <description value="Admin should be able to see warning message when adding Vimeo video with restricted privacy privacy when getting video information"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-42471"/>
+            <useCaseId value="MC-42105"/>
+            <group value="productVideo"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="openNewProductPage"/>
+        <actionGroup ref="AdminOpenProductVideoModalActionGroup" stepKey="openAddProductVideoModal"/>
+        <actionGroup ref="AdminFillProductVideoFieldActionGroup" stepKey="fillVideoUrlField">
+            <argument name="input" value="{{AdminProductNewVideoSection.videoUrlTextField}}"/>
+            <argument name="value" value="{{VimeoPrivateVideo.videoUrl}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminGetVideoInformationActionGroup" stepKey="clickOnGetVideoInformation"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForWarningMessage"/>
+        <see selector="{{AdminConfirmationModalSection.message}}" userInput='Because of its privacy settings, this video cannot be played here.' stepKey="seeAdminWarningMessage"/>
+    </test>
+</tests>

app/code/Magento/ProductVideo/i18n/en_US.csv

@@ -41,3 +41,4 @@ Delete,Delete
 "Show related video","Show related video"
 "Auto restart video","Auto restart video"
 "Delete image in all store views","Delete image in all store views"
+"Because of its privacy settings, this video cannot be played here.","Because of its privacy settings, this video cannot be played here."

app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js

@@ -495,28 +495,40 @@ define([
                  */
                 function _onVimeoLoaded(data) {
                     var tmp,
-                        respData;
+                        respData,
+                        videoDescription = '';
 
                     if (!data) {
                         this._onRequestError($.mage.__('Video not found'));
 
                         return null;
                     }
                     tmp = data;
-                    respData = {
-                        duration: this._formatVimeoDuration(tmp.duration),
-                        channel: tmp['author_name'],
-                        channelId: tmp['author_url'],
-                        uploaded: tmp['upload_date'],
-                        title: tmp.title,
-                        description: tmp.description.replace(/(&nbsp;|<([^>]+)>)/ig, ''),
-                        thumbnail: tmp['thumbnail_url'],
-                        videoId: videoInfo.id,
-                        videoProvider: videoInfo.type
-                    };
-                    this._videoInformation = respData;
-                    this.element.trigger(this._UPDATE_VIDEO_INFORMATION_TRIGGER, respData);
-                    this.element.trigger(this._FINISH_UPDATE_INFORMATION_TRIGGER, true);
+
+                    if (tmp.description !== null) {
+                        videoDescription = tmp.description;
+                    }
+
+                    if (tmp.duration == null) {
+                        this._onRequestError(
+                            $.mage.__('Because of its privacy settings, this video cannot be played here.')
+                        );
+                    } else {
+                        respData = {
+                            duration: this._formatVimeoDuration(tmp.duration),
+                            channel: tmp['author_name'],
+                            channelId: tmp['author_url'],
+                            uploaded: tmp['upload_date'],
+                            title: tmp.title,
+                            description: videoDescription.replace(/(&nbsp;|<([^>]+)>)/ig, ''),
+                            thumbnail: tmp['thumbnail_url'],
+                            videoId: videoInfo.id,
+                            videoProvider: videoInfo.type
+                        };
+                        this._videoInformation = respData;
+                        this.element.trigger(this._UPDATE_VIDEO_INFORMATION_TRIGGER, respData);
+                        this.element.trigger(this._FINISH_UPDATE_INFORMATION_TRIGGER, true);
+                    }
                 }
 
                 type = videoInfo.type;