Using youtube api (v3) instead of v2 to get the video duration .

TNL-2413

cms/envs/acceptance.py

@@ -118,6 +118,6 @@ except ImportError:
     pass
 
 # Point the URL used to test YouTube availability to our stub YouTube server
-YOUTUBE['API'] = "127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
-YOUTUBE['TEST_URL'] = "127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
+YOUTUBE['API'] = "http://127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
+YOUTUBE['METADATA_URL'] = "http://127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
 YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YOUTUBE_PORT)

cms/envs/aws.py

@@ -312,3 +312,6 @@ VIDEO_UPLOAD_PIPELINE = ENV_TOKENS.get('VIDEO_UPLOAD_PIPELINE', VIDEO_UPLOAD_PIP
 #date format the api will be formatting the datetime values
 API_DATE_FORMAT = '%Y-%m-%d'
 API_DATE_FORMAT = ENV_TOKENS.get('API_DATE_FORMAT', API_DATE_FORMAT)
+
+XBLOCK_SETTINGS = ENV_TOKENS.get('XBLOCK_SETTINGS', {})
+XBLOCK_SETTINGS.setdefault("VideoModule", {})['YOUTUBE_API_KEY'] = AUTH_TOKENS.get('YOUTUBE_API_KEY', YOUTUBE_API_KEY)

cms/envs/bok_choy.py

@@ -73,8 +73,8 @@ DEBUG = True
 
 # Point the URL used to test YouTube availability to our stub YouTube server
 YOUTUBE_PORT = 9080
-YOUTUBE['API'] = "127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
-YOUTUBE['TEST_URL'] = "127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
+YOUTUBE['API'] = "http://127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
+YOUTUBE['METADATA_URL'] = "http://127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
 YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YOUTUBE_PORT)
 
 #####################################################################

cms/envs/common.py

@@ -36,7 +36,8 @@ import lms.envs.common
 # Although this module itself may not use these imported variables, other dependent modules may.
 from lms.envs.common import (
     USE_TZ, TECH_SUPPORT_EMAIL, PLATFORM_NAME, BUGS_EMAIL, DOC_STORE_CONFIG, ALL_LANGUAGES, WIKI_ENABLED, MODULESTORE,
-    update_module_store_settings, ASSET_IGNORE_REGEX, COPYRIGHT_YEAR
+    update_module_store_settings, ASSET_IGNORE_REGEX, COPYRIGHT_YEAR,
+    YOUTUBE_API_KEY,
 )
 from path import path
 from warnings import simplefilter
@@ -594,10 +595,10 @@ CELERY_QUEUES = {
 
 YOUTUBE = {
     # YouTube JavaScript API
-    'API': 'www.youtube.com/iframe_api',
+    'API': 'https://www.youtube.com/iframe_api',
 
-    # URL to test YouTube availability
-    'TEST_URL': 'gdata.youtube.com/feeds/api/videos/',
+    # URL to get YouTube metadata
+    'METADATA_URL': 'https://www.googleapis.com/youtube/v3/videos',
 
     # Current youtube api for requesting transcripts.
     # For example: http://video.google.com/timedtext?lang=en&v=j_jEn79vS3g.
@@ -868,3 +869,10 @@ FILES_AND_UPLOAD_TYPE_FILTERS = {
         'application/vnd.ms-powerpoint',
     ],
 }
+
+
+XBLOCK_SETTINGS = {
+    'VideoModule': {
+        'YOUTUBE_API_KEY': YOUTUBE_API_KEY
+    }
+}

cms/templates/ux/reference/container.html

@@ -137,7 +137,7 @@
 
                                                             <h2>Video</h2>
 
-                                                            <div id="video_i4x-AndyA-ABT101-video-72b5a0d74e8c4ed4a4d4e6bf67837c09" class="video closed is-initialized" data-streams="1.00:OEoXaMPEzfM" data-save-state-url="/preview/xblock/i4x:;_;_AndyA;_ABT101;_video;_72b5a0d74e8c4ed4a4d4e6bf67837c09/handler/xmodule_handler/save_user_state" data-caption-data-dir="None" data-show-captions="true" data-general-speed="1.0" data-speed="null" data-start="0.0" data-end="0.0" data-caption-asset-path="/c4x/AndyA/ABT101/asset/subs_" data-autoplay="False" data-yt-test-timeout="1500" data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/" data-autohide-html5="False" tabindex="-1">
+                                                            <div id="video_i4x-AndyA-ABT101-video-72b5a0d74e8c4ed4a4d4e6bf67837c09" class="video closed is-initialized" data-streams="1.00:OEoXaMPEzfM" data-save-state-url="/preview/xblock/i4x:;_;_AndyA;_ABT101;_video;_72b5a0d74e8c4ed4a4d4e6bf67837c09/handler/xmodule_handler/save_user_state" data-caption-data-dir="None" data-show-captions="true" data-general-speed="1.0" data-speed="null" data-start="0.0" data-end="0.0" data-caption-asset-path="/c4x/AndyA/ABT101/asset/subs_" data-autoplay="False" data-yt-test-timeout="1500" data-yt-test-url="https://www.googleapis.com/youtube/v3/videos/" data-autohide-html5="False" tabindex="-1">
                                                                 <div class="focus_grabber first" tabindex="-1"></div>
 
                                                                 <div class="tc-wrapper">

common/djangoapps/terrain/setup_prereqs.py

@@ -28,8 +28,7 @@ SERVICES = {
 
 YOUTUBE_API_URLS = {
     'main': 'https://www.youtube.com/',
-    'player': 'http://www.youtube.com/iframe_api',
-    'metadata': 'http://gdata.youtube.com/feeds/api/videos/',
+    'player': 'https://www.youtube.com/iframe_api',
     # For transcripts, you need to check an actual video, so we will
     # just specify our default video and see if that one is available.
     'transcript': 'http://video.google.com/timedtext?lang=en&v=OEoXaMPEzfM',

common/djangoapps/terrain/stubs/youtube.py

@@ -95,6 +95,9 @@ class StubYouTubeHandler(StubHttpRequestHandler):
             if self.server.config.get('youtube_api_blocked'):
                 self.send_response(404, content='', headers={'Content-type': 'text/plain'})
             else:
+                # Delay the response to simulate network latency
+                time.sleep(self.server.config.get('time_to_response', self.DEFAULT_DELAY_SEC))
+
                 # Get the response to send from YouTube.
                 # We need to do this every time because Google sometimes sends different responses
                 # as part of their own experiments, which has caused our tests to become "flaky"
@@ -117,17 +120,16 @@ class StubYouTubeHandler(StubHttpRequestHandler):
 
         # Construct the response content
         callback = self.get_params['callback']
-        youtube_metadata = json.loads(
-            requests.get(
-                "http://gdata.youtube.com/feeds/api/videos/{id}?v=2&alt=jsonc".format(id=youtube_id)
-            ).text
-        )
+
         data = OrderedDict({
-            'data': OrderedDict({
+            'items': list(
+                OrderedDict({
+                    'contentDetails': OrderedDict({
                         'id': youtube_id,
-                'message': message,
-                'duration': youtube_metadata['data']['duration'],
+                        'duration': 'PT2M20S',
+                    })
                 })
+            )
         })
         response = "{cb}({data})".format(cb=callback, data=json.dumps(data))
 

common/lib/xmodule/xmodule/js/fixtures/video.html

@@ -18,7 +18,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-api-url="www.youtube.com/iframe_api"
-        data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
+        data-yt-test-url="www.googleapis.com/youtube/v3/videos/"
         data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>

common/lib/xmodule/xmodule/js/fixtures/video_all.html

@@ -19,7 +19,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-api-url="www.youtube.com/iframe_api"
-        data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
+        data-yt-test-url="www.googleapis.com/youtube/v3/videos/"
         data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>

common/lib/xmodule/xmodule/js/fixtures/video_html5.html

@@ -19,7 +19,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-api-url="www.youtube.com/iframe_api"
-        data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
+        data-yt-test-url="www.googleapis.com/youtube/v3/videos/"
         data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>

common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html

@@ -18,7 +18,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-api-url="www.youtube.com/iframe_api"
-        data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
+        data-yt-test-url="www.googleapis.com/youtube/v3/videos/"
         data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>

common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html

@@ -18,7 +18,7 @@
         data-autoplay="False"
         data-yt-test-timeout="1500"
         data-yt-api-url="www.youtube.com/iframe_api"
-        data-yt-test-url="gdata.youtube.com/feeds/api/videos/"
+        data-yt-test-url="www.googleapis.com/youtube/v3/videos/"
         data-autohide-html5="True"
       >
         <div class="focus_grabber first"></div>
@@ -88,7 +88,7 @@
         data-transcript-available-translations-url="/transcript/available_translations"
         data-autoplay="False"
         data-yt-test-timeout="1500"
-        data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+        data-yt-test-url="www.googleapis.com/youtube/v3/videos/"
 
         data-autohide-html5="True"
       >
@@ -153,7 +153,7 @@
         data-transcript-available-translations-url="/transcript/available_translations"
         data-autoplay="False"
         data-yt-test-timeout="1500"
-        data-yt-test-url="https://gdata.youtube.com/feeds/api/videos/"
+        data-yt-test-url="www.googleapis.com/youtube/v3/videos/"
 
         data-autohide-html5="True"
       >

common/lib/xmodule/xmodule/js/js_test.yml

@@ -59,6 +59,7 @@ lib_paths:
     - common_static/js/src/utility.js
     - public/js/split_test_staff.js
     - common_static/js/src/accessibility_tools.js
+    - common_static/js/vendor/moment.min.js
 
 # Paths to spec (test) JavaScript files
 spec_paths:

common/lib/xmodule/xmodule/js/spec/helper.js

@@ -36,7 +36,7 @@
             return f();
         }
     };
-
+    jasmine.YT = stubbedYT;
     // Stub YouTube API.
     window.YT = stubbedYT;
 
@@ -76,19 +76,27 @@
 
     jasmine.stubbedMetadata = {
         '7tqY6eQzVhE': {
+            contentDetails : {
                 id: '7tqY6eQzVhE',
-            duration: 300
+                duration: 'PT5M0S'
+            }
         },
         'cogebirgzzM': {
+            contentDetails : {
                 id: 'cogebirgzzM',
-            duration: 200
+                duration: 'PT3M20S'
+            }
         },
         'abcdefghijkl': {
+            contentDetails : {
                 id: 'abcdefghijkl',
-            duration: 400
+                duration: 'PT6M40S'
+            }
         },
         bogus: {
-            duration: 100
+            contentDetails : {
+                duration: 'PT1M40S'
+            }
         }
     };
 
@@ -122,7 +130,7 @@
         }
         return spy.andCallFake(function (settings) {
             var match = settings.url
-                    .match(/youtube\.com\/.+\/videos\/(.+)\?v=2&alt=jsonc/),
+                    .match(/googleapis\.com\/.+\/videos\/\?id=(.+)&part=contentDetails/),
                 status, callCallback;
             if (match) {
                 status = match[1].split('_');
@@ -138,7 +146,7 @@
                     };
                 } else if (settings.success) {
                     return settings.success({
-                        data: jasmine.stubbedMetadata[match[1]]
+                        items: jasmine.stubbedMetadata[match[1]]
                     });
                 } else {
                     return {
@@ -168,15 +176,6 @@
                 return;
             } else if (settings.url === '/save_user_state') {
                 return {success: true};
-            } else if (settings.url === 'http://www.youtube.com/iframe_api') {
-                // Stub YouTube API.
-                window.YT = stubbedYT;
-
-                // Call the callback that must be called when YouTube API is
-                // loaded. By specification.
-                window.onYouTubeIframeAPIReady();
-
-                return {success: true};
             } else {
                 throw 'External request attempted for ' +
                     settings.url +
@@ -221,6 +220,19 @@
     // Stub jQuery.scrollTo module.
     $.fn.scrollTo = jasmine.createSpy('jQuery.scrollTo');
 
+    // Stub window.Video.loadYouTubeIFrameAPI()
+    window.Video.loadYouTubeIFrameAPI = jasmine.createSpy('window.Video.loadYouTubeIFrameAPI').andReturn(
+        function (scriptTag) {
+            var event = document.createEvent('Event');
+            if (fixture === "video.html") {
+                event.initEvent('load', false, false);
+            } else {
+                event.initEvent('error', false, false);
+            }
+            scriptTag.dispatchEvent(event);
+        }
+    );
+
     jasmine.initializePlayer = function (fixture, params) {
         var state;
 

common/lib/xmodule/xmodule/js/spec/video/general_spec.js

@@ -122,6 +122,12 @@
                     return state.youtubeApiAvailable === true;
                 }, 'YouTube API is loaded', 3000);
 
+                window.YT = jasmine.YT;
+
+                // Call the callback that must be called when YouTube API is
+                // loaded. By specification.
+                window.onYouTubeIframeAPIReady();
+
                 runs(function () {
                     // If YouTube API is not loaded, then the code will should create
                     // a global callback that will be called by API once it is loaded.

common/lib/xmodule/xmodule/js/spec/video/initialize_spec.js

@@ -223,10 +223,10 @@ function (Initialize) {
                     speed: '1.50',
                     metadata: {
                         'testId': {
-                            duration: 400
+                            duration: 'PT6M40S'
                         },
                         'videoId': {
-                            duration: 100
+                            duration: 'PT1M40S'
                         }
                     },
                     videos: {

common/lib/xmodule/xmodule/js/src/video/10_main.js

@@ -113,6 +113,8 @@
                 youtubeXhr = null;
             };
 
+            window.Video.loadYouTubeIFrameAPI = initialize.prototype.loadYouTubeIFrameAPI;
+
             // Invoke the mock Video constructor so that the elements stored within it can be processed by the real
             // `window.Video` constructor.
             oldVideo(null, true);

common/lib/xmodule/xmodule/tests/test_video.py

@@ -582,3 +582,4 @@ class VideoCdnTest(unittest.TestCase):
         cdn_response.return_value = Mock(status_code=404)
         fake_cdn_url = 'http://fake_cdn.com/'
         self.assertIsNone(get_video_from_cdn(fake_cdn_url, original_video_url))
+

common/lib/xmodule/xmodule/video_module/video_module.py

@@ -26,6 +26,7 @@ from pkg_resources import resource_string
 
 from django.conf import settings
 
+from xblock.core import XBlock
 from xblock.fields import ScopeIds
 from xblock.runtime import KvsFieldData
 
@@ -77,6 +78,7 @@ log = logging.getLogger(__name__)
 _ = lambda text: text
 
 
+@XBlock.wants('settings')
 class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers, XModule):
     """
     XML source example:
@@ -230,6 +232,14 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
 
         track_url, transcript_language, sorted_languages = self.get_transcripts_for_student()
 
+        settings_service = self.runtime.service(self, 'settings')
+
+        yt_api_key = None
+        if settings_service:
+            xblock_settings = settings_service.get_settings_bucket(self)
+            if xblock_settings and 'YOUTUBE_API_KEY' in xblock_settings:
+                yt_api_key = xblock_settings['YOUTUBE_API_KEY']
+
         return self.system.render_template('video.html', {
             'ajax_url': self.system.ajax_url + '/save_user_state',
             'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', False),
@@ -254,7 +264,8 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
             # configuration setting field.
             'yt_test_timeout': 1500,
             'yt_api_url': settings.YOUTUBE['API'],
-            'yt_test_url': settings.YOUTUBE['TEST_URL'],
+            'yt_test_url': settings.YOUTUBE['METADATA_URL'],
+            'yt_key': yt_api_key,
             'transcript_download_format': transcript_download_format,
             'transcript_download_formats_list': self.descriptor.fields['transcript_download_format'].values,
             'transcript_language': transcript_language,

common/test/acceptance/tests/helpers.py

@@ -49,8 +49,7 @@ def is_youtube_available():
 
     youtube_api_urls = {
         'main': 'https://www.youtube.com/',
-        'player': 'http://www.youtube.com/iframe_api',
-        'metadata': 'http://gdata.youtube.com/feeds/api/videos/',
+        'player': 'https://www.youtube.com/iframe_api',
         # For transcripts, you need to check an actual video, so we will
         # just specify our default video and see if that one is available.
         'transcript': 'http://video.google.com/timedtext?lang=en&v=OEoXaMPEzfM',

lms/djangoapps/courseware/features/video.feature

@@ -3,7 +3,7 @@ Feature: LMS.Video component
   As a student, I want to view course videos in LMS
 
   # 1
-  Scenario: Verify that each video in each sub-section includes a transcript for non-Youtube countries
+  Scenario: Verify that each video in sub-section includes a transcript for Youtube and non-Youtube countries
     Given youtube server is up and response time is 2 seconds
     And I am registered for the course "test_course"
     And I have a "subs_OEoXaMPEzfM.srt.sjson" transcript file in assets
@@ -24,9 +24,9 @@ Feature: LMS.Video component
       | Hi, welcome to Edx. |
       | Equal transcripts   |
     When I open video "C"
-    Then the video has rendered in "HTML5" mode
+    Then the video has rendered in "YOUTUBE" mode
     And I make sure captions are opened
     And I see "好 各位同学" text in the captions
     When I open video "D"
-    Then the video has rendered in "HTML5" mode
-    And the video does not show the captions
+    Then the video has rendered in "YOUTUBE" mode
+    And I make sure captions are opened

lms/djangoapps/courseware/tests/test_video_mongo.py

@@ -55,8 +55,9 @@ class TestVideoYouTube(TestVideo):
             'track': None,
             'youtube_streams': create_youtube_string(self.item_descriptor),
             'yt_test_timeout': 1500,
-            'yt_api_url': 'www.youtube.com/iframe_api',
-            'yt_test_url': 'gdata.youtube.com/feeds/api/videos/',
+            'yt_api_url': 'https://www.youtube.com/iframe_api',
+            'yt_test_url': 'https://www.googleapis.com/youtube/v3/videos/',
+            'yt_key': None,
             'transcript_download_format': 'srt',
             'transcript_download_formats_list': [{'display_name': 'SubRip (.srt) file', 'value': 'srt'}, {'display_name': 'Text (.txt) file', 'value': 'txt'}],
             'transcript_language': u'en',
@@ -119,8 +120,9 @@ class TestVideoNonYouTube(TestVideo):
             'youtube_streams': '1.00:OEoXaMPEzfM',
             'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', True),
             'yt_test_timeout': 1500,
-            'yt_api_url': 'www.youtube.com/iframe_api',
-            'yt_test_url': 'gdata.youtube.com/feeds/api/videos/',
+            'yt_api_url': 'https://www.youtube.com/iframe_api',
+            'yt_test_url': 'https://www.googleapis.com/youtube/v3/videos/',
+            'yt_key': None,
             'transcript_download_format': 'srt',
             'transcript_download_formats_list': [{'display_name': 'SubRip (.srt) file', 'value': 'srt'}, {'display_name': 'Text (.txt) file', 'value': 'txt'}],
             'transcript_language': u'en',
@@ -221,8 +223,9 @@ class TestGetHtmlMethod(BaseTestXmodule):
             'youtube_streams': '1.00:OEoXaMPEzfM',
             'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', True),
             'yt_test_timeout': 1500,
-            'yt_api_url': 'www.youtube.com/iframe_api',
-            'yt_test_url': 'gdata.youtube.com/feeds/api/videos/',
+            'yt_api_url': 'https://www.youtube.com/iframe_api',
+            'yt_test_url': 'https://www.googleapis.com/youtube/v3/videos/',
+            'yt_key': None,
             'transcript_download_formats_list': [{'display_name': 'SubRip (.srt) file', 'value': 'srt'}, {'display_name': 'Text (.txt) file', 'value': 'txt'}],
         }
 
@@ -337,8 +340,9 @@ class TestGetHtmlMethod(BaseTestXmodule):
             'youtube_streams': '1.00:OEoXaMPEzfM',
             'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', True),
             'yt_test_timeout': 1500,
-            'yt_api_url': 'www.youtube.com/iframe_api',
-            'yt_test_url': 'gdata.youtube.com/feeds/api/videos/',
+            'yt_api_url': 'https://www.youtube.com/iframe_api',
+            'yt_test_url': 'https://www.googleapis.com/youtube/v3/videos/',
+            'yt_key': None,
             'transcript_download_format': 'srt',
             'transcript_download_formats_list': [{'display_name': 'SubRip (.srt) file', 'value': 'srt'}, {'display_name': 'Text (.txt) file', 'value': 'txt'}],
             'transcript_language': u'en',
@@ -476,8 +480,9 @@ class TestGetHtmlMethod(BaseTestXmodule):
             'youtube_streams': '1.00:OEoXaMPEzfM',
             'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', True),
             'yt_test_timeout': 1500,
-            'yt_api_url': 'www.youtube.com/iframe_api',
-            'yt_test_url': 'gdata.youtube.com/feeds/api/videos/',
+            'yt_api_url': 'https://www.youtube.com/iframe_api',
+            'yt_test_url': 'https://www.googleapis.com/youtube/v3/videos/',
+            'yt_key': None,
             'transcript_download_format': 'srt',
             'transcript_download_formats_list': [{'display_name': 'SubRip (.srt) file', 'value': 'srt'}, {'display_name': 'Text (.txt) file', 'value': 'txt'}],
             'transcript_language': u'en',
@@ -593,8 +598,9 @@ class TestGetHtmlMethod(BaseTestXmodule):
             'youtube_streams': '1.00:OEoXaMPEzfM',
             'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', True),
             'yt_test_timeout': 1500,
-            'yt_api_url': 'www.youtube.com/iframe_api',
-            'yt_test_url': 'gdata.youtube.com/feeds/api/videos/',
+            'yt_api_url': 'https://www.youtube.com/iframe_api',
+            'yt_test_url': 'https://www.googleapis.com/youtube/v3/videos/',
+            'yt_key': None,
             'transcript_download_format': 'srt',
             'transcript_download_formats_list': [{'display_name': 'SubRip (.srt) file', 'value': 'srt'}, {'display_name': 'Text (.txt) file', 'value': 'txt'}],
             'transcript_language': u'en',
@@ -696,8 +702,9 @@ class TestGetHtmlMethod(BaseTestXmodule):
             'youtube_streams': '1.00:OEoXaMPEzfM',
             'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', True),
             'yt_test_timeout': 1500,
-            'yt_api_url': 'www.youtube.com/iframe_api',
-            'yt_test_url': 'gdata.youtube.com/feeds/api/videos/',
+            'yt_api_url': 'https://www.youtube.com/iframe_api',
+            'yt_test_url': 'https://www.googleapis.com/youtube/v3/videos/',
+            'yt_key': None,
             'transcript_download_format': 'srt',
             'transcript_download_formats_list': [{'display_name': 'SubRip (.srt) file', 'value': 'srt'}, {'display_name': 'Text (.txt) file', 'value': 'txt'}],
             'transcript_language': u'en',
@@ -891,3 +898,4 @@ class VideoDescriptorTest(VideoDescriptorTestBase):
         ]
         rendered_context = self.descriptor.get_context()
         self.assertListEqual(rendered_context['tabs'], correct_tabs)
+

lms/envs/acceptance.py

@@ -176,6 +176,6 @@ XQUEUE_INTERFACE = {
 }
 
 # Point the URL used to test YouTube availability to our stub YouTube server
-YOUTUBE['API'] = "127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
-YOUTUBE['TEST_URL'] = "127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
+YOUTUBE['API'] = "http://127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
+YOUTUBE['METADATA_URL'] = "http://127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
 YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YOUTUBE_PORT)

lms/envs/aws.py

@@ -500,3 +500,6 @@ PDF_RECEIPT_LOGO_HEIGHT_MM = ENV_TOKENS.get('PDF_RECEIPT_LOGO_HEIGHT_MM', PDF_RE
 PDF_RECEIPT_COBRAND_LOGO_HEIGHT_MM = ENV_TOKENS.get(
     'PDF_RECEIPT_COBRAND_LOGO_HEIGHT_MM', PDF_RECEIPT_COBRAND_LOGO_HEIGHT_MM
 )
+
+XBLOCK_SETTINGS = ENV_TOKENS.get('XBLOCK_SETTINGS', {})
+XBLOCK_SETTINGS.setdefault("VideoModule", {})['YOUTUBE_API_KEY'] = AUTH_TOKENS.get('YOUTUBE_API_KEY', YOUTUBE_API_KEY)

lms/envs/bok_choy.py

@@ -103,8 +103,8 @@ FEATURES['ENTRANCE_EXAMS'] = True
 
 # Point the URL used to test YouTube availability to our stub YouTube server
 YOUTUBE_PORT = 9080
-YOUTUBE['API'] = "127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
-YOUTUBE['TEST_URL'] = "127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
+YOUTUBE['API'] = "http://127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
+YOUTUBE['METADATA_URL'] = "http://127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
 YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YOUTUBE_PORT)
 
 ############################# SECURITY SETTINGS ################################

lms/envs/common.py

@@ -1459,10 +1459,10 @@ EMAIL_OPTIN_MINIMUM_AGE = 13
 
 YOUTUBE = {
     # YouTube JavaScript API
-    'API': 'www.youtube.com/iframe_api',
+    'API': 'https://www.youtube.com/iframe_api',
 
-    # URL to test YouTube availability
-    'TEST_URL': 'gdata.youtube.com/feeds/api/videos/',
+    # URL to get YouTube metadata
+    'METADATA_URL': 'https://www.googleapis.com/youtube/v3/videos/',
 
     # Current youtube api for requesting transcripts.
     # For example: http://video.google.com/timedtext?lang=en&v=j_jEn79vS3g.
@@ -1474,6 +1474,7 @@ YOUTUBE = {
         },
     },
 }
+YOUTUBE_API_KEY = None
 
 ################################### APPS ######################################
 INSTALLED_APPS = (

lms/static/js_test.yml

@@ -58,6 +58,7 @@ lib_paths:
     - xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js
     - xmodule_js/common_static/js/test/i18n.js
     - xmodule_js/common_static/js/vendor/date.js
+    - xmodule_js/common_static/js/vendor/moment.min.js
 
 # Paths to source JavaScript files
 src_paths: