rspotify 1.25.0 → 1.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 943084e2909b53a19452860de7622fdd2b560fcd
-  data.tar.gz: a3949ea7c84455b591823b2771403053df0cbbe6
+  metadata.gz: 329704cda3c04b00d6fd736a343ff454ae10bab0
+  data.tar.gz: 99112da79287ac9ae9d4dad05dfda682973d79fc
 SHA512:
-  metadata.gz: 3f317d488ee29a682d3aaf5e0af397057017ff1852a61d98ad2cb38b26d32097623aeddb410034e6911af65f9a5b6640d6533f861b44742afa6b0d8626999b53
-  data.tar.gz: 6cc388d0d04d78f07b47002f439b358865f1f4dce1fcb21bc24642f107ed2579691f360281565b6fa6073b8ff42f2332dfd0be551b32583a10161cd91e6269b1
+  metadata.gz: f39f9a8d1d9747ae269676f13b5e672028e398097da3f667417239228905922bd8460f29bd0d0eb081df659d5ce29cdb86b232059b32f42c64b05670c4c3971e
+  data.tar.gz: 35603e5d98e9e732ab289e55f51dea5648fbd7b1f82899cf76848c47b42e3f738c851546567546df397a254484a87acebf904b53a8582523301b18ab47f48f47

data/lib/rspotify/connection.rb

@@ -11,6 +11,7 @@ module RSpotify
 
   class << self
     attr_accessor :raw_response
+    attr_reader :client_token
 
     # Authenticates access to restricted data. Requires {https://developer.spotify.com/my-applications user credentials}
     #
@@ -32,7 +33,7 @@ module RSpotify
 
     VERBS.each do |verb|
       define_method verb do |path, *params|
-        params << { 'Authorization' => "Bearer #{@client_token}" } if @client_token
+        params << { 'Authorization' => "Bearer #{client_token}" } if client_token
         send_request(verb, path, *params)
       end
     end
@@ -60,7 +61,8 @@ module RSpotify
 
       begin
         response = RestClient.send(verb, url, *params)
-      rescue RestClient::Unauthorized
+      rescue RestClient::Unauthorized => e
+        raise e if request_was_user_authenticated?(*params)
         if @client_token
           authenticate(@client_id, @client_secret)
 
@@ -80,6 +82,22 @@ module RSpotify
       RestClient.send(verb, url, *params)
     end
 
+    def request_was_user_authenticated?(*params)
+      users_credentials = if User.class_variable_defined?('@@users_credentials')
+        User.class_variable_get('@@users_credentials')
+      end
+
+      obj = params.find{|x| x.is_a?(Hash) && x['Authorization']}
+      if users_credentials 
+        creds = users_credentials.map{|user_id, creds| "Bearer #{creds['token']}"}
+
+        if creds.include?(obj['Authorization'])
+          return true
+        end
+      end
+      return false
+    end
+
     def auth_header
       authorization = Base64.strict_encode64 "#{@client_id}:#{@client_secret}"
       { 'Authorization' => "Basic #{authorization}" }

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '1.25.0'
+  VERSION = '1.25.1'
 end

data/spec/authentication_helper.rb

@@ -0,0 +1,11 @@
+module AuthenticationHelper
+  CLIENT_SECRET = 'BQBj_AiSFlKCkNIMbCWEYjuJLl6n76QmVsHU6MGDgTUBLZqNiKZ4ALs6Kvm6ulbsW9O81JDdIHyXBndXyhUOxg'
+
+  def authenticate_client
+    client_id = '5ac1cda2ad354aeaa1ad2693d33bb98c'
+    client_secret = '155fc038a85840679b55a1822ef36b9b'
+    VCR.use_cassette('authenticate:client') do
+      RSpotify.authenticate(client_id, client_secret)
+    end
+  end
+end

data/spec/lib/rspotify/album_spec.rb

@@ -92,9 +92,7 @@ describe RSpotify::Album do
     let(:client_secret) { '155fc038a85840679b55a1822ef36b9b' }
 
     before(:each) do
-    VCR.use_cassette('authenticate:client') do
-        RSpotify.authenticate(client_id, client_secret)
-      end
+      authenticate_client
     end
 
     it 'should find the appropriate new releases' do
@@ -126,9 +124,7 @@ describe RSpotify::Album do
     let(:client_secret) { '155fc038a85840679b55a1822ef36b9b' }
 
     before(:each) do
-    VCR.use_cassette('authenticate:client') do
-        RSpotify.authenticate(client_id, client_secret)
-      end
+      authenticate_client
     end
 
     it 'should search for the right albums' do

data/spec/lib/rspotify/audio_features_spec.rb

@@ -4,9 +4,7 @@ describe RSpotify::AudioFeatures do
   let(:client_secret) { '155fc038a85840679b55a1822ef36b9b' }
 
   before do
-    VCR.use_cassette('authenticate:client') do
-      RSpotify.authenticate(client_id, client_secret)
-    end
+    authenticate_client
   end
 
   describe 'AudioFeatures::find' do

data/spec/lib/rspotify/category_spec.rb

@@ -5,9 +5,7 @@ describe RSpotify::Category do
   let(:client_secret) { '155fc038a85840679b55a1822ef36b9b' }
 
   before do
-    VCR.use_cassette('authenticate:client') do
-      RSpotify.authenticate(client_id, client_secret)
-    end
+    authenticate_client
   end
 
   describe 'Category::find' do

data/spec/lib/rspotify/client_token_spec.rb

@@ -0,0 +1,9 @@
+describe RSpotify do
+  describe '.client_token' do
+    it 'should return the client_token' do
+      authenticate_client
+
+      expect(RSpotify.client_token).to eq(AuthenticationHelper::CLIENT_SECRET)
+    end
+  end
+end

data/spec/lib/rspotify/playlist_spec.rb

@@ -10,9 +10,7 @@ describe RSpotify::Playlist do
   end
 
   before do
-    VCR.use_cassette('authenticate:client') do
-      RSpotify.authenticate(client_id, client_secret)
-    end
+    authenticate_client
   end
 
   describe 'Playlist::browse_featured' do

data/spec/lib/rspotify/recommendations_spec.rb

@@ -4,9 +4,7 @@ describe RSpotify::Recommendations do
   let(:client_secret) { '155fc038a85840679b55a1822ef36b9b' }
 
   before do
-    VCR.use_cassette('authenticate:client') do
-      RSpotify.authenticate(client_id, client_secret)
-    end
+    authenticate_client
   end
 
   describe 'Recommendations::available_genre_seeds' do

data/spec/lib/rspotify/track_spec.rb

@@ -141,9 +141,7 @@ describe RSpotify::Track do
     let(:client_secret) { '155fc038a85840679b55a1822ef36b9b' }
 
     before do
-      VCR.use_cassette('authenticate:client') do
-        RSpotify.authenticate(client_id, client_secret)
-      end
+      authenticate_client
     end
 
     let(:track) do

data/spec/lib/rspotify/user_spec.rb

@@ -22,9 +22,7 @@ describe RSpotify::User do
       # Keys generated specifically for the tests. Should be removed in the future
       client_id     = '5ac1cda2ad354aeaa1ad2693d33bb98c'
       client_secret = '155fc038a85840679b55a1822ef36b9b'
-      VCR.use_cassette('authenticate:client') do
-        RSpotify.authenticate(client_id, client_secret)
-      end
+      authenticate_client
 
       playlists = VCR.use_cassette('user:wizzler:playlists:limit:20:offset:0') do
         @user.playlists

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rspotify'
 require 'vcr'
 require 'webmock/rspec'
+require 'authentication_helper'
 
 VCR.configure do |c|
   c.cassette_library_dir = 'spec/vcr_cassettes'
@@ -9,7 +10,7 @@ end
 
 
 RSpec.configure do |config|
-
+  config.include AuthenticationHelper
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.25.1
 platform: ruby
 authors:
 - Guilherme Sad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -153,10 +153,12 @@ files:
 - lib/rspotify/user.rb
 - lib/rspotify/version.rb
 - rspotify.gemspec
+- spec/authentication_helper.rb
 - spec/lib/rspotify/album_spec.rb
 - spec/lib/rspotify/artist_spec.rb
 - spec/lib/rspotify/audio_features_spec.rb
 - spec/lib/rspotify/category_spec.rb
+- spec/lib/rspotify/client_token_spec.rb
 - spec/lib/rspotify/playlist_spec.rb
 - spec/lib/rspotify/recommendations_spec.rb
 - spec/lib/rspotify/track_spec.rb
@@ -258,10 +260,12 @@ signing_key:
 specification_version: 4
 summary: A ruby wrapper for the Spotify Web API
 test_files:
+- spec/authentication_helper.rb
 - spec/lib/rspotify/album_spec.rb
 - spec/lib/rspotify/artist_spec.rb
 - spec/lib/rspotify/audio_features_spec.rb
 - spec/lib/rspotify/category_spec.rb
+- spec/lib/rspotify/client_token_spec.rb
 - spec/lib/rspotify/playlist_spec.rb
 - spec/lib/rspotify/recommendations_spec.rb
 - spec/lib/rspotify/track_spec.rb