omniauth-shopify-oauth2 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ac8b79643ac902aa6d573980e4e9256a6ce87dfa464549960592cc30ac0a680
-  data.tar.gz: da71a89cc375e080513dc05b8fc7d8bebf0e6066fc38222e330f5385b4461e94
+  metadata.gz: 8ce833c2725777b3827b0ab489eade910d3ef1998cd9b9bc16d9ec1f2492f3dd
+  data.tar.gz: cd0bb274266046f948c6ad3838394fc6392efac50567d488d0e1532e3fc165a1
 SHA512:
-  metadata.gz: 2f35605d913503c727412e4897de24a9a8f5cb38e6f34715b74491e2a55cf6c1fbc32c7723506dff64a48d5f141b735e96371a973dfba9ba9173ba04e33a1f85
-  data.tar.gz: c1f81b9573ad924ceee5ccf03b5c74a4d447c46f8809497fac98c5e33b0533364c1ce0e2176e55e802c4e28d75cd75fd8548b61992a721dfa5b5aa5904e839f8
+  metadata.gz: 7f5223c3153f3bf188054fa647362575774abe5637bdeee8b8a6512bad3a33f5fa2d8ea4489b1f9174377a525483fbb7b47c2d39d6779c01b30fbe70a3b9b426
+  data.tar.gz: 844a9b2d387ba187117c2ef9aa7f06e624eb2ff1b4d0a35aa49e94a5d384fdfc86e40343b2ddca49847543b05dd341ce86c06da18b4f973a7d711693080b3de7

data/lib/omniauth/shopify/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Shopify
-    VERSION = "2.2.0"
+    VERSION = "2.2.1"
   end
 end

data/lib/omniauth/strategies/shopify.rb

@@ -86,7 +86,7 @@ module OmniAuth
         params = params.dup
         params.delete('hmac')
         params.delete('signature') # deprecated signature
-        params.map{|k,v| "#{URI.escape(k.to_s, '&=%')}=#{URI.escape(v.to_s, '&%')}"}.sort.join('&')
+        Rack::Utils.build_query(params.sort)
       end
 
       def self.hmac_sign(encoded_params, secret)
@@ -127,6 +127,8 @@ module OmniAuth
         end
 
         super
+      rescue ::OAuth2::Error => e
+        fail!(:invalid_credentials, e)
       end
 
       def build_access_token

data/test/integration_test.rb

@@ -86,7 +86,7 @@ class IntegrationTest < Minitest::Test
 
     now = Time.now.to_i
     params = { shop: 'snowdevil.myshopify.com', code: code, timestamp: now, next: '/products?page=2&q=red%20shirt', state: opts["rack.session"]["omniauth.state"] }
-    encoded_params = "code=#{code}&next=/products?page=2%26q=red%2520shirt&shop=snowdevil.myshopify.com&state=#{opts["rack.session"]["omniauth.state"]}&timestamp=#{now}"
+    encoded_params = "code=#{code}&next=%2Fproducts%3Fpage%3D2%26q%3Dred%2520shirt&shop=snowdevil.myshopify.com&state=#{opts["rack.session"]["omniauth.state"]}&timestamp=#{now}"
     params[:hmac] = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, @secret, encoded_params)
 
     response = callback(params)
@@ -335,6 +335,28 @@ class IntegrationTest < Minitest::Test
     assert_callback_success(response, access_token, code)
   end
 
+  def test_callback_when_creds_are_invalid
+    build_app scope: OmniAuth::Strategies::Shopify::DEFAULT_SCOPE
+
+    FakeWeb.register_uri(
+      :post,
+      "https://snowdevil.myshopify.com/admin/oauth/access_token",
+      status: [ "401", "Invalid token" ],
+      body: "Token is invalid or has already been requested"
+    )
+
+    signed_params = sign_with_new_secret(
+      shop: 'snowdevil.myshopify.com',
+      code: SecureRandom.hex(16),
+      state: opts["rack.session"]["omniauth.state"]
+    )
+
+    response = callback(signed_params)
+
+    assert_equal 302, response.status
+    assert_equal '/auth/failure?message=invalid_credentials&strategy=shopify', response.location
+  end
+
   private
 
   def sign_with_old_secret(params)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-shopify-oauth2
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Denis Odorcic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2