shopify_api 10.0.2 → 10.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee0632a9922b5545aa35982111686fe4296040ef7277fd2a94f4cd2b0d355d3
-  data.tar.gz: 616678196beefce5c6ada1cac1d96c06bf4d01beec431c2606a36792c1280154
+  metadata.gz: 81babe6da64bc6c8b0e413213fff00c818778c5bc5cf9bd79b1acb25fd3ea3d1
+  data.tar.gz: b9dda7bb0992365df524d1e22d70ee34fee776a68c5dc9e958b826d49c6c0541
 SHA512:
-  metadata.gz: '0428496927f7d0f77c79e22457385c084f8c7a2aa05839cb0bd2c7e43b85d7e830d78995994af4a843ac9339a2a4ff64132f19054372a600e2af4d22c649b8b3'
-  data.tar.gz: 7d72d4177e0d8abd8a4dd6b1bcf1706e13b2325cf383021e12751a35adb02ecbfdf020e1ccc37ef94f47b753e5c95d71d22b1aab8cb47cf188190bdb23768c08
+  metadata.gz: cb1eeacedfe1a0fdd8f0262e0bb63ea52996aa6a98f1ffee803481a2ce38424f31d8aa0658108f53a376fef29d5a65acf7bb1384d6d87ce21e52eabdc4926da8
+  data.tar.gz: 03c666d05fc413b5da1951a0693818ca97c48064bb2735facb019a4e04a55581525ee061e19dc1c1406e4c67a0949ded89ffec69ef5cab1f1d8866f8d514277f

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## Version 10.0.3
+
+### Fixed
+
+- [#935](https://github.com/Shopify/shopify_api/pull/935) Fix issue [#931](https://github.com/Shopify/shopify_api/pull/931), weight of variant should be float
+- [#944](https://github.com/Shopify/shopify_api/pull/944) Deprecated the `validate_shop` method from the JWT class since we can trust the token payload, since it comes from Shopify.
+
 ## Version 10.0.2
 
 - [#929](https://github.com/Shopify/shopify_api/pull/929) Aligning sorbet dependencies

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify_api (10.0.2)
+    shopify_api (10.0.3)
       concurrent-ruby
       hash_diff
       httparty
@@ -79,11 +79,11 @@ GEM
       rubocop (>= 0.90.0)
     ruby-progressbar (1.11.0)
     securerandom (0.2.0)
-    sorbet (0.5.9874)
-      sorbet-static (= 0.5.9874)
-    sorbet-runtime (0.5.9874)
-    sorbet-static (0.5.9874-universal-darwin-21)
-    sorbet-static (0.5.9874-x86_64-linux)
+    sorbet (0.5.9924)
+      sorbet-static (= 0.5.9924)
+    sorbet-runtime (0.5.9924)
+    sorbet-static (0.5.9924-universal-darwin-21)
+    sorbet-static (0.5.9924-x86_64-linux)
     spoom (1.1.8)
       sorbet (>= 0.5.9204)
       sorbet-runtime (>= 0.5.9204)

data/RELEASING.md

@@ -0,0 +1,18 @@
+# Releasing ShopifyAPI
+
+1. Before releasing, make sure `sorbet` and `sorbet-runtime` are up to date
+1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
+1. Update the version of ShopifyAPI in lib/shopify_api/version.rb
+1. Run `bundle`
+1. Add a CHANGELOG entry for the new release
+1. Commit the changes with a commit message like "Packaging for release X.Y.Z"
+1. Tag the release with the version (Leave REV blank for HEAD or provide a SHA)
+   $ git tag vX.Y.Z REV
+1. Push out the changes
+   $ git push
+1. Push out the tags
+   $ git push --tags
+1. Publish the gem using Shipit
+1. Consider if the dependency in Shopify/shopify needs updated. It's used only by the tests so is a low risk change.
+   Also consider Shopify/shopify_app whose gemspec depends on this.
+   We don't need to do this for every release, but we should try to keep them relatively up to date.

data/Rakefile

@@ -11,7 +11,7 @@ namespace :test do
 
   Rake::TestTask.new(:rest_wrappers) do |t|
     pattern = if ENV.key?("API_VERSION")
-      "test/rest/**/#{ENV["API_VERSION"]}/*.rb"
+      "test/rest/**/#{ENV.fetch("API_VERSION")}/*.rb"
     else
       "test/rest/**/*.rb"
     end

data/lib/shopify_api/auth/jwt_payload.rb

@@ -35,8 +35,6 @@ module ShopifyAPI
 
         raise ShopifyAPI::Errors::InvalidJwtTokenError,
           "Session token had invalid API key" unless @aud == Context.api_key
-        raise ShopifyAPI::Errors::InvalidJwtTokenError,
-          "Session token had invalid shop" unless validate_shop(shop)
       end
 
       sig { returns(String) }
@@ -44,9 +42,14 @@ module ShopifyAPI
         @dest.gsub("https://", "")
       end
 
+      # TODO: Remove before releasing v11
       sig { params(shop: String).returns(T::Boolean) }
       def validate_shop(shop)
-        /\A[a-z0-9]+[a-z0-9\-]*[a-z0-9]+\.myshopify\.(io|com)\z/.match?(shop)
+        Context.logger.warn(
+          "Deprecation notice: ShopifyAPI::Auth::JwtPayload.validate_shop no longer checks the given shop and always " \
+            "returns true. It will be removed in v11."
+        )
+        true
       end
 
       alias_method :eql?, :==

data/lib/shopify_api/rest/resources/2021_07/variant.rb

@@ -36,7 +36,7 @@ module ShopifyAPI
       @taxable = T.let(nil, T.nilable(T::Boolean))
       @title = T.let(nil, T.nilable(String))
       @updated_at = T.let(nil, T.nilable(String))
-      @weight = T.let(nil, T.nilable(Integer))
+      @weight = T.let(nil, T.nilable(Float))
       @weight_unit = T.let(nil, T.nilable(String))
     end
 
@@ -103,7 +103,7 @@ module ShopifyAPI
     attr_reader :title
     sig { returns(T.nilable(String)) }
     attr_reader :updated_at
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(Float)) }
     attr_reader :weight
     sig { returns(T.nilable(String)) }
     attr_reader :weight_unit

data/lib/shopify_api/rest/resources/2021_10/variant.rb

@@ -36,7 +36,7 @@ module ShopifyAPI
       @taxable = T.let(nil, T.nilable(T::Boolean))
       @title = T.let(nil, T.nilable(String))
       @updated_at = T.let(nil, T.nilable(String))
-      @weight = T.let(nil, T.nilable(Integer))
+      @weight = T.let(nil, T.nilable(Float))
       @weight_unit = T.let(nil, T.nilable(String))
     end
 
@@ -103,7 +103,7 @@ module ShopifyAPI
     attr_reader :title
     sig { returns(T.nilable(String)) }
     attr_reader :updated_at
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(Float)) }
     attr_reader :weight
     sig { returns(T.nilable(String)) }
     attr_reader :weight_unit

data/lib/shopify_api/rest/resources/2022_01/variant.rb

@@ -36,7 +36,7 @@ module ShopifyAPI
       @taxable = T.let(nil, T.nilable(T::Boolean))
       @title = T.let(nil, T.nilable(String))
       @updated_at = T.let(nil, T.nilable(String))
-      @weight = T.let(nil, T.nilable(Integer))
+      @weight = T.let(nil, T.nilable(Float))
       @weight_unit = T.let(nil, T.nilable(String))
     end
 
@@ -103,7 +103,7 @@ module ShopifyAPI
     attr_reader :title
     sig { returns(T.nilable(String)) }
     attr_reader :updated_at
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(Float)) }
     attr_reader :weight
     sig { returns(T.nilable(String)) }
     attr_reader :weight_unit

data/lib/shopify_api/rest/resources/2022_04/variant.rb

@@ -36,7 +36,7 @@ module ShopifyAPI
       @taxable = T.let(nil, T.nilable(T::Boolean))
       @title = T.let(nil, T.nilable(String))
       @updated_at = T.let(nil, T.nilable(String))
-      @weight = T.let(nil, T.nilable(Integer))
+      @weight = T.let(nil, T.nilable(Float))
       @weight_unit = T.let(nil, T.nilable(String))
     end
 
@@ -103,7 +103,7 @@ module ShopifyAPI
     attr_reader :title
     sig { returns(T.nilable(String)) }
     attr_reader :updated_at
-    sig { returns(T.nilable(Integer)) }
+    sig { returns(T.nilable(Float)) }
     attr_reader :weight
     sig { returns(T.nilable(String)) }
     attr_reader :weight_unit

data/lib/shopify_api/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module ShopifyAPI
-  VERSION = "10.0.2"
+  VERSION = "10.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 10.0.3
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -257,7 +257,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
-- RELEASING
+- RELEASING.md
 - Rakefile
 - SECURITY.md
 - bin/tapioca

data/RELEASING

@@ -1,17 +0,0 @@
-Releasing ShopifyAPI
-
-1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
-2. Update the version of ShopifyAPI in lib/shopify_api/version.rb
-3. Run `bundle`
-4. Add a CHANGELOG entry for the new release
-5. Commit the changes with a commit message like "Packaging for release X.Y.Z"
-6. Tag the release with the version (Leave REV blank for HEAD or provide a SHA)
-  $ git tag vX.Y.Z REV
-7. Push out the changes
-  $ git push
-8. Push out the tags
-  $ git push --tags
-9. Publish the gem using Shipit
-10. Consider if the dependency in Shopify/shopify needs updated. It's used only by the tests so is a low risk change.
-Also consider Shopify/shopify_app whose gemspec depends on this.
-We don't need to do this for every release, but we should try to keep them relatively up to date.