omniauth-deezer 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e5f17c8761b9988e235a45b1191ddea10a6a42
-  data.tar.gz: 298a63833cbacc47c3ad77d847126fdf9ca27599
+  metadata.gz: 78bd9c56fc8572deca41650dc3bdf0594ab3c1f4
+  data.tar.gz: e922ca6821aa67dc99ac22b527cd08957a031450
 SHA512:
-  metadata.gz: 49108151e01bccd8f76574551bd5e030a2d032d51302be2b6bc822634f5d1c1252fdec3254c7eb9242973ede6676461d0361001c4405d68582f7e9af98f8be38
-  data.tar.gz: eacb1ad5f4a8d2025a28389096dd49e766d06c6bf4c2074dd5e59290719759ea35ac037efa7e4ccb89fa58ca22a505a9f1ddb604c19dc135d4f31597e1cf7ef4
+  metadata.gz: 8a8dcfd51e45c8326db6047331627e0473b27bba8c5f122689ba999483a03a2b84f90a12871dd4a3a828948fbda2752ebfd51b2efeaef80269d02bd1feda30c3
+  data.tar.gz: 0536d463fded0b27eea8d3408168c64a5695cea2480e282a064508278f16acfb77f62909660e315abc3e145f1e2505f603df7b0b0a4b5949012a8165dd6daf73

data/lib/omniauth/deezer/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Deezer
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/omniauth/strategies/deezer.rb

@@ -6,7 +6,7 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    class Deezer 
+    class Deezer
       include OmniAuth::Strategy
 
       DEFAULT_PERMS = "basic_access"
@@ -14,7 +14,7 @@ module OmniAuth
       option :name, "deezer"
 
       # request phase
-      
+
       args [:app_id,:app_secret]
 
       option :client_options, {
@@ -27,23 +27,24 @@ module OmniAuth
 
       def request_phase
         options.perms ||= DEFAULT_PERMS
-        redirecting_to = options.client_options.authorize_url+'?app_id='+options.app_id+'&redirect_uri='+CGI::escape(callback_url)+'&perms='+options.perms
-        redirect redirecting_to
+        new_url_to_go = callback_url.split('?')[0]
+
+        redirect "#{options.client_options.authorize_url}?app_id=#{options.app_id}&redirect_uri=#{CGI.escape(new_url_to_go)}&perms=#{options.perms}"
       end
 
       # callback phase
 
       def callback_phase
         begin
-          if request.params['error_reason'] then 
-            raise CredentialsError, request.params['error_reason'] 
+          if request.params['error_reason'] then
+            raise CredentialsError, request.params['error_reason']
           end
 
           # get token from Deezer
-          token_url = options.client_options.token_url
-          token_url = options.client_options.token_url+'?app_id='+options.app_id+'&secret='+options.app_secret+'&code='+request.params['code']
+          token_url = "#{options.client_options.token_url}?app_id=#{options.app_id}&secret=#{options.app_secret}&code=#{request.params['code']}"
+
           connection = nil
-          if options.client_options.ssl && options.client_options.ssl.ca_path then 
+          if options.client_options.ssl && options.client_options.ssl.ca_path then
             connection = Faraday::Connection.new token_url, :ssl => {:ca_path => options.client_options.ssl.ca_path }
           else
             connection = Faraday::Connection.new token_url
@@ -61,7 +62,6 @@ module OmniAuth
           @raw_info = MultiJson.decode(response.body.chomp)
 
           super
-
         rescue ::MultiJson::DecodeError => e
           fail!(:invalid_response, e)
         rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
@@ -70,7 +70,7 @@ module OmniAuth
           fail!(:failed_to_connect, e)
         rescue TypeError => e
           fail!(:invalid_response, e)
-        rescue CredentialsError => e                      
+        rescue CredentialsError => e
           fail!(:invalid_credentials, e)
         end
       end
@@ -78,7 +78,7 @@ module OmniAuth
       uid { @raw_info['id'] }
 
       info do
-        h = 
+        h =
         {
           :name => @raw_info['firstname']+' '+@raw_info['lastname'],
           :nickname => @raw_info['name'],
@@ -116,7 +116,6 @@ module OmniAuth
           self.error = error
         end
       end
-
     end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-deezer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Geoffroy Montel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Deezer strategy for Omniauth 1.0
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Rakefile
 - Readme.md
@@ -63,17 +63,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: omniauth-deezer
-rubygems_version: 2.0.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Deezer strategy for Omniauth 1.0