Use new oauth2 endpoints (#422)

* Update oauth2 endpoints

* Fix test

Author: kangkyu

.gitignore

@@ -25,5 +25,3 @@ doc/
 .yardoc/
 _site/
 TODO.md
-
-spec/cassettes

lib/yt/associations/has_authentication.rb

@@ -32,6 +32,7 @@ def initialize(options = {})
         @force = options[:force]
         @scopes = options[:scopes]
         @authentication = options[:authentication]
+        @state = options[:state]
       end
 
       def auth
@@ -48,7 +49,7 @@ def authentication
 
       def authentication_url
         host = 'accounts.google.com'
-        path = '/o/oauth2/auth'
+        path = '/o/oauth2/v2/auth'
         query = authentication_url_params.to_param
         URI::HTTPS.build(host: host, path: path, query: query).to_s
       end
@@ -190,6 +191,7 @@ def authentication_url_params
           params[:access_type] = :offline
           params[:approval_prompt] = @force ? :force : :auto
           # params[:include_granted_scopes] = true
+          params[:state] = @state if @state
         end
       end
 
@@ -243,4 +245,4 @@ def client_secret
       end
     end
   end
-end
+end

lib/yt/collections/authentications.rb

@@ -16,8 +16,8 @@ def attributes_for_new_item(data)
 
       def list_params
         super.tap do |params|
-          params[:host] = 'accounts.google.com'
-          params[:path] = '/o/oauth2/token'
+          params[:host] = 'oauth2.googleapis.com'
+          params[:path] = '/token'
           params[:request_format] = :form
           params[:method] = :post
           params[:auth] = nil

lib/yt/collections/device_flows.rb

@@ -15,9 +15,10 @@ def attributes_for_new_item(data)
 
       def list_params
         super.tap do |params|
-          params[:path] = '/o/oauth2/device/code'
+          params[:host] = 'oauth2.googleapis.com'
+          params[:path] = '/device/code'
         end
       end
     end
   end
-end
+end

lib/yt/collections/revocations.rb

@@ -15,10 +15,10 @@ def attributes_for_new_item(data)
 
       def list_params
         super.tap do |params|
-          params[:host] = 'accounts.google.com'
-          params[:path] = '/o/oauth2/revoke'
-          params[:request_format] = nil
-          params[:method] = :get
+          params[:host] = 'oauth2.googleapis.com'
+          params[:path] = '/revoke'
+          params[:request_format] = :form
+          params[:method] = :post
           params[:auth] = nil
           params[:body] = nil
           params[:camelize_body] = false

lib/yt/collections/user_infos.rb

@@ -13,7 +13,7 @@ class UserInfos < Base
       # @see https://developers.google.com/+/api/latest/people/getOpenIdConnect
       def list_params
         super.tap do |params|
-          params[:path] = '/oauth2/v2/userinfo'
+          params[:path] = '/oauth2/v3/userinfo'
           params[:expected_response] = Net::HTTPOK
         end
       end
@@ -33,4 +33,4 @@ def next_page
       end
     end
   end
-end
+end

lib/yt/models/statistics_set.rb

@@ -17,7 +17,12 @@ def initialize(options = {})
       has_attribute :view_count, type: Integer
       has_attribute :comment_count, type: Integer
       has_attribute :like_count, type: Integer
+
+      # statistics.dislikeCount property included in an API response
+      # only if the API request was authenticated by the video owner
+      # as of December 13, 2021
       has_attribute :dislike_count, type: Integer
+
       has_attribute :favorite_count, type: Integer
       has_attribute :video_count, type: Integer
       has_attribute :subscriber_count, type: Integer

spec/requests/as_account/account_spec.rb

@@ -42,7 +42,7 @@
       let(:count) { test_account.videos.where(q: query).count }
 
       context 'given a query string that matches any video owned by the account' do
-        let(:query) { 'coffee' }
+        let(:query) { 'Test' }
         it { expect(count).to be > 0 }
       end
 
@@ -90,24 +90,27 @@
     end
   end
 
-  describe '.video_groups' do
-    let(:video_group) { test_account.video_groups.first }
-    before do
-      allow(Date).to receive(:today).and_return(Date.new(2020, 2, 12))
-    end
-
-    specify 'returns the first video-group created by the account' do
-      expect(video_group).to be_a Yt::VideoGroup
-      expect(video_group.title).to be_a String
-      expect(video_group.item_count).to be_an Integer
-      expect(video_group.published_at).to be_a Time
-    end
-
-    specify 'allows to run reports against each video-group' do
-      expect(video_group.views).to be
-    end
-  end
-
+  # TODO: uncomment video_groups test and run when we have a test account with
+  # video groups. (I think only cms can add a video group)
+  # describe '.video_groups' do
+  #   let(:video_group) { test_account.video_groups.first }
+  #   before do
+  #     allow(Date).to receive(:today).and_return(Date.new(2020, 2, 12))
+  #   end
+
+  #   specify 'returns the first video-group created by the account' do
+  #     expect(video_group).to be_a Yt::VideoGroup
+  #     expect(video_group.title).to be_a String
+  #     expect(video_group.item_count).to be_an Integer
+  #     expect(video_group.published_at).to be_a Time
+  #   end
+
+  #   specify 'allows to run reports against each video-group' do
+  #     expect(video_group.views).to be
+  #   end
+  # end
+
+  # FYI: there's a limit to upload videos, once hit the limit, need wait 24 hours
   describe '.upload_video' do
     let(:video_params) do
       {title: 'Test Yt upload', privacy_status: 'private', category_id: 17, self_declared_made_for_kids: true}

spec/requests/as_account/channel_spec.rb

@@ -116,12 +116,14 @@
       # end
     end
 
-    specify 'with a public list of subscriptions' do
-      expect(channel.subscribed_channels.first).to be_a Yt::Channel
-    end
+    # NOTE: API doesn't grant access to the subscriptions of other users
+    # any more.
+    # specify 'with a public list of subscriptions' do
+    #   expect(channel.subscribed_channels.first).to be_a Yt::Channel
+    # end
 
     context 'with a hidden list of subscriptions' do
-      let(:id) { 'UCUZHFZ9jIKrLroW8LcyJEQQ' } # YouTube Creators - better make our own one
+      # let(:id) { 'UCUZHFZ9jIKrLroW8LcyJEQQ' } # YouTube Creators
       it { expect{channel.subscribed_channels.size}.to raise_error Yt::Errors::Forbidden }
     end
 

spec/requests/as_account/channels_spec.rb

@@ -7,7 +7,7 @@
 
   context 'with a list of parts' do
     let(:part) { 'statistics' }
-    let(:channel) { channels.where(part: part, id: 'UCZDZGN_73I019o6UYD2-4bg').first }
+    let(:channel) { channels.where(part: part, id: 'UCBR8-60-B28hp2BmDPdntcQ').first } # YouTube
 
     specify 'load ONLY the specified parts of the channels' do
       expect(channel.instance_variable_defined? :@snippet).to be false

spec/requests/as_account/playlist_item_spec.rb

@@ -5,7 +5,7 @@
   subject(:item) { Yt::PlaylistItem.new id: id, auth: test_account }
 
   context 'given an existing playlist item' do
-    let(:id) { 'UExiai1JRGU2Zzh2dGF4MVNha0xFd09kT0V2LW52aml5MC41NkI0NEY2RDEwNTU3Q0M2' }
+    let(:id) { 'UEx3akRSUDVaWF9NRnNldlI4ZGlRMmx2M0hiTW81eGJLYy41NkI0NEY2RDEwNTU3Q0M2' }
 
     it 'returns valid metadata' do
       expect(item.title).to be_a String
@@ -23,7 +23,7 @@
   end
 
   context 'given one of my own playlist items that I want to update' do
-    let(:id) { 'UExiai1JRGU2Zzh2dGF4MVNha0xFd09kT0V2LW52aml5MC41NkI0NEY2RDEwNTU3Q0M2' }
+    let(:id) { 'UEx3akRSUDVaWF9NRnNldlI4ZGlRMmx2M0hiTW81eGJLYy41MjE1MkI0OTQ2QzJGNzNG' }
     let!(:old_title) { item.title }
     let!(:old_privacy_status) { item.privacy_status }
     let(:update) { item.update attrs }

spec/requests/as_account/playlist_spec.rb

@@ -65,13 +65,13 @@
   end
 
   context 'given one of my own playlists that I want to delete' do
-    let(:id) { 'PLbj-IDe6g8vuN_pRohu-634bvJKZzxWht' }
+    let(:id) { 'PLwjDRP5ZX_MFsevR8diQ2lv3HbMo5xbKc' }
 
     it { expect(playlist.delete).to be true }
   end
 
   context 'given one of my own playlists that I want to update' do
-    let(:id) { 'PLbj-IDe6g8vtax1SakLEwOdOEv-nvjiy0' }
+    let(:id) { 'PLwjDRP5ZX_MFsevR8diQ2lv3HbMo5xbKc' }
     let!(:old_title) { playlist.title }
     let!(:old_privacy_status) { playlist.privacy_status }
     let(:update) { playlist.update attrs }

spec/requests/as_account/video_spec.rb

@@ -25,7 +25,7 @@
       expect(video.live_broadcast_content).to be_a String
       expect(video.view_count).to be_an Integer
       expect(video.like_count).to be_an Integer
-      expect(video.dislike_count).to be_an Integer
+      # expect(video.dislike_count).to be_an Integer
       expect(video.favorite_count).to be_an Integer
       expect(video.comment_count).to be_an Integer
       expect(video.duration).to be_an Integer
@@ -92,7 +92,7 @@
   end
 
   context 'given someone else’s live video broadcast scheduled in the future' do
-    let(:id) { 'PqzGI8gO_gk' }
+    let(:id) { '3mJE9obZgUc' }
 
     it 'returns valid live streaming details' do
       expect(video.actual_start_time).to be_nil
@@ -103,13 +103,13 @@
   end
 
   context 'given someone else’s past live video broadcast' do
-    let(:id) { 'COOM8_tOy6U' }
+    let(:id) { 'hGil507jyoU' }
 
     it 'returns valid live streaming details' do
       expect(video.actual_start_time).to be_a Time
       expect(video.actual_end_time).to be_a Time
-      expect(video.scheduled_start_time).to be_a Time
-      expect(video.scheduled_end_time).to be_a Time
+      expect(video.scheduled_start_time).to be_nil
+      expect(video.scheduled_end_time).to be_nil
       expect(video.concurrent_viewers).to be_nil
     end
   end
@@ -126,13 +126,13 @@
   end
 
   context 'given one of my own videos that I want to delete' do
-    let(:id) { 'eVyohfo-I2Q' }
+    let(:id) { '505qC3W3DrY' }
 
     it { expect(video.delete).to be true }
   end
 
   context 'given one of my own videos that I want to update' do
-    let(:id) { 'eVyohfo-I2Q' }
+    let(:id) { '505qC3W3DrY' }
     let!(:old_title) { video.title }
     let!(:old_privacy_status) { video.privacy_status }
     let(:update) { video.update attrs }

spec/requests/as_server_app/channel_spec.rb

@@ -5,7 +5,7 @@
   subject(:channel) { Yt::Channel.new attrs }
 
   context 'given an existing channel ID' do
-    let(:attrs) { {id: 'UCAmh1DexLGcMtDlzMCIxo4w'} }
+    let(:attrs) { {id: 'UCJkWoS4RsldA1coEIot5yDA'} } # MotherGooseClub
 
     it 'returns valid snippet data' do
       expect(channel.snippet).to be_a Yt::Snippet
@@ -24,12 +24,14 @@
     it { expect(channel.related_playlists).to be_a Yt::Collections::Playlists }
     it { expect(channel.related_playlists.first).to be_a Yt::Playlist }
 
-    specify 'with a public list of subscriptions' do
-      expect(channel.subscribed_channels.first).to be_a Yt::Channel
-    end
+    # NOTE: API doesn't grant access to the subscriptions of other users
+    # any more.
+    # specify 'with a public list of subscriptions' do
+    #   expect(channel.subscribed_channels.first).to be_a Yt::Channel
+    # end
 
     context 'with a hidden list of subscriptions' do
-      let(:attrs) { {id: 'UCZDZGN_73I019o6UYD2-4bg'} }
+      let(:attrs) { {id: 'UCBR8-60-B28hp2BmDPdntcQ'} } # YouTube
       it { expect{channel.subscribed_channels.size}.to raise_error Yt::Errors::Forbidden }
     end
   end

spec/requests/as_server_app/comment_thread_spec.rb

@@ -5,10 +5,27 @@
 describe Yt::CommentThread, :server_app, :vcr do
   subject(:comment_thread) { Yt::CommentThread.new attrs }
 
-  context 'given an existing comment thread ID about a channel' do
-    let(:attrs) { {id: 'UgzzJVW75s5KrSaf0Ah4AaABAg'} }
+  # Probably, channel-based comment thread has been deprecated.
+  # Need more investigation but, commented out for now.
+  # context 'given an existing comment thread ID about a channel' do
+  #   let(:attrs) { {id: 'UgzzJVW75s5KrSaf0Ah4AaABAg'} }
+
+  #   it { expect(comment_thread.video_id).to be_nil }
+  #   it { expect(comment_thread.total_reply_count).to be_an Integer }
+  #   it { expect(comment_thread.can_reply?).to be true }
+  #   it { expect(comment_thread).to be_public }
+
+  #   it { expect(comment_thread.top_level_comment).to be_a Yt::Comment }
+  #   it { expect(comment_thread.text_display).not_to be_empty }
+  #   it { expect(comment_thread.author_display_name).not_to be_empty }
+  #   it { expect(comment_thread.updated_at).to be_a Time }
+  #   it { expect(comment_thread.like_count).to be_a Integer }
+  # end
+
+  context 'given an comment thread ID about a video' do
+    let(:attrs) { {id: 'z134e1gyav3qt3nnr22phjeavv2zdfef0'} }
+    it { expect(comment_thread.video_id).to be_a String }
 
-    it { expect(comment_thread.video_id).to be_nil }
     it { expect(comment_thread.total_reply_count).to be_an Integer }
     it { expect(comment_thread.can_reply?).to be true }
     it { expect(comment_thread).to be_public }
@@ -19,9 +36,4 @@
     it { expect(comment_thread.updated_at).to be_a Time }
     it { expect(comment_thread.like_count).to be_a Integer }
   end
-
-  context 'given an comment thread ID about a video' do
-    let(:attrs) { {id: 'z134e1gyav3qt3nnr22phjeavv2zdfef0'} }
-    it { expect(comment_thread.video_id).to be_a String }
-  end
 end

spec/requests/as_server_app/comment_threads_spec.rb

@@ -20,9 +20,10 @@
       expect(comment_threads.where(videoId: 'MsplPPW7tFo').size).to be > 0
     end
 
-    specify 'with a channelId param, returns comment threads for the channel' do
-      expect(comment_threads.where(channelId: 'UC-lHJZR3Gqxm24_Vd_AJ5Yw').size).to be > 0
-    end
+    # Could be undocumented change. Currently not working.
+    # specify 'with a channelId param, returns comment threads for the channel' do
+    #   expect(comment_threads.where(channelId: 'UC-lHJZR3Gqxm24_Vd_AJ5Yw').size).to be > 0
+    # end
   end
 
   context "with parent association", :ruby2 do
@@ -33,9 +34,18 @@
       it { expect(comment_threads.size).to be > 0 }
     end
 
-    context "parent as channel" do
-      let(:parent) { Yt::Models::Channel.new id: 'UC-lHJZR3Gqxm24_Vd_AJ5Yw' }
-      it { expect(comment_threads.size).to be > 0 }
-    end
+    # Commented out because possible YouTube behavior change. It does not work
+    # on 'Try this method' section either, currently. The error looks like:
+    #   {
+    #     "message": "The video identified by the \u003ccode\u003e\u003ca href=\"/youtube/v3/docs/commentThreads/list#videoId\"\u003evideoId\u003c/a\u003e\u003c/code\u003e parameter could not be found.",
+    #     "domain": "youtube.commentThread",
+    #     "reason": "videoNotFound",
+    #     "location": "videoId",
+    #     "locationType": "parameter"
+    #   }
+    # context "parent as channel" do
+    #   let(:parent) { Yt::Models::Channel.new id: 'UC-lHJZR3Gqxm24_Vd_AJ5Yw' }
+    #   it { expect(comment_threads.size).to be > 0 }
+    # end
   end
 end

spec/requests/as_server_app/playlist_item_spec.rb

@@ -5,7 +5,7 @@
   subject(:item) { Yt::PlaylistItem.new id: id }
 
   context 'given an existing playlist item' do
-    let(:id) { 'UExiai1JRGU2Zzh2c0FQT0RFci1xRUZjRERvWHhqRzhEVC41MjE1MkI0OTQ2QzJGNzNG' }
+    let(:id) { 'UExnbkRNdzZ4STVwbE9YYUtzNXpOREIzelJXWUVhOFppLS41NkI0NEY2RDEwNTU3Q0M2' }
 
     it 'returns valid snippet data' do
       expect(item.snippet).to be_a Yt::Snippet

spec/requests/as_server_app/playlist_spec.rb

@@ -5,7 +5,7 @@
   subject(:playlist) { Yt::Playlist.new attrs }
 
   context 'given an existing playlist ID' do
-    let(:attrs) { {id: 'PLpjK416fmKwQ6Ene4GKRLICznoE1QFyt4'} }
+    let(:attrs) { {id: 'PLgnDMw6xI5plOXaKs5zNDB3zRWYEa8Zi-'} }
 
     it 'returns valid snippet data' do
       expect(playlist.snippet).to be_a Yt::Snippet