shopify_api 12.0.0 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6e4e09aa88812707194b0ec0726f1e61f448647a01a9d0709201808c05ad99c
-  data.tar.gz: ac3fcdb640bb6d1c1614e82d5faf9cd2fce496117187d2daca803a5d96ef8036
+  metadata.gz: f3c03360ffab3820b674ee42ec8cc8de1028aa852f07b9b09a1ffb111c81cf5b
+  data.tar.gz: 727487abd59263c77bdf81dd0e3af9f23914260b54d7fb132d834d5943939202
 SHA512:
-  metadata.gz: c05d906a83000f3a2134875532798224afac9cf270787fadd493b2cc3d820771eac5e3b609766ff9c3d08138a774d8e681d3d93d3c13079d4b655d7a857dddf3
-  data.tar.gz: 1b4088cd2457c8d39ec04b466a5dcf492ac62df751c44f359a12a1176ed4b30f4289ae2d8dc0a400c491b377ffc522d71e86b33f898b8ce086b39cec0729495e
+  metadata.gz: a4a7e438b3e0b16e5357c3dbb9f981dcb56bed718a3ea57fab5451b699427dcb651d12ac2a9f40393f6d85fcf0bf2eb737d789cd72540f38faeaed7e0fc3f0aa
+  data.tar.gz: b67a4fc69202ee4da880052bfc5e6e76c69611b099a555ce5318763c0e691484dab4c09b6b309c90c5475605a1d16a8867ba060ec2e01526b97d25eee86acaeb

data/.github/workflows/stale.yml

@@ -14,6 +14,7 @@ jobs:
         with:
           days-before-issue-stale: 90
           days-before-issue-close: 14
+          operations-per-run: 1000
           stale-issue-label: "Stale"
           stale-issue-message: >
             This issue is stale because it has been open for 90 days with no activity. It will be closed if no further action occurs in 14 days. 

data/CHANGELOG.md

@@ -4,10 +4,13 @@ Note: For changes to the API, see https://shopify.dev/changelog?filter=api
 
 ## Unreleased
 
+## Version 12.1.0
+
+- [#1017](https://github.com/Shopify/shopify-api-ruby/pull/1017) Add support for `http` with localhost development without using a TLS tunnel
+
 ## Version 12.0.0
 
 - [#1027](https://github.com/Shopify/shopify-api-ruby/pull/1027) ⚠️ [Breaking] Remove support for deprecated API version `2021-10` and added support for version `2022-10`
-
 - [#1008](https://github.com/Shopify/shopify-api-ruby/pull/1008) Increase session token JWT validation leeway from 5s to 10s
 
 ## Version 11.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify_api (12.0.0)
+    shopify_api (12.1.0)
       concurrent-ruby
       hash_diff
       httparty

data/README.md

@@ -25,8 +25,7 @@ To follow these usage guides, you will need to:
 - have a Shopify Partner account and development store
 - _OR_ have a test store where you can create a private app
 - have an app already set up in your test store or partner account
-- use [ngrok](https://ngrok.com/download) to create a secure tunnel to your app running on your localhost
-- add the `ngrok` URL and the appropriate redirect for your OAuth callback route to your app settings
+- add the URL and the appropriate redirect for your OAuth callback route to your app settings
 
 ## Installation
 

data/lib/shopify_api/auth/oauth.rb

@@ -31,7 +31,7 @@ module ShopifyAPI
           query = {
             client_id: ShopifyAPI::Context.api_key,
             scope: ShopifyAPI::Context.scope.to_s,
-            redirect_uri: "https://#{ShopifyAPI::Context.host_name}#{redirect_path}",
+            redirect_uri: "#{ShopifyAPI::Context.host}#{redirect_path}",
             state: state,
             "grant_options[]": is_online ? "per-user" : "",
           }

data/lib/shopify_api/context.rb

@@ -36,6 +36,7 @@ module ShopifyAPI
           is_embedded: T::Boolean,
           session_storage: ShopifyAPI::Auth::SessionStorage,
           logger: Logger,
+          host: T.nilable(String),
           private_shop: T.nilable(String),
           user_agent_prefix: T.nilable(String),
           old_api_secret_key: T.nilable(String),
@@ -51,19 +52,21 @@ module ShopifyAPI
         is_embedded:,
         session_storage:,
         logger: Logger.new($stdout),
+        host: ENV["HOST"] || "https://#{host_name}",
         private_shop: nil,
         user_agent_prefix: nil,
         old_api_secret_key: nil
       )
         unless ShopifyAPI::AdminVersions::SUPPORTED_ADMIN_VERSIONS.include?(api_version)
           raise Errors::UnsupportedVersionError,
-            "Invalid vession #{api_version}, supported versions: #{ShopifyAPI::AdminVersions::SUPPORTED_ADMIN_VERSIONS}"
+            "Invalid version #{api_version}, supported versions: #{ShopifyAPI::AdminVersions::SUPPORTED_ADMIN_VERSIONS}"
         end
 
         @api_key = api_key
         @api_secret_key = api_secret_key
         @api_version = api_version
         @host_name = host_name
+        @host = T.let(host, T.nilable(String))
         @is_private = is_private
         @scope = Auth::AuthScopes.new(scope)
         @is_embedded = is_embedded
@@ -122,7 +125,7 @@ module ShopifyAPI
       end
 
       sig { returns(T.nilable(String)) }
-      attr_reader :private_shop, :user_agent_prefix, :old_api_secret_key
+      attr_reader :private_shop, :user_agent_prefix, :old_api_secret_key, :host
 
       sig { returns(T::Boolean) }
       def embedded?
@@ -131,7 +134,7 @@ module ShopifyAPI
 
       sig { returns(T::Boolean) }
       def setup?
-        !(api_key.empty? || api_secret_key.empty? || host_name.empty?)
+        [api_key, api_secret_key, host_name, T.must(host)].none?(&:empty?)
       end
 
       sig { returns(T.nilable(Auth::Session)) }
@@ -150,6 +153,11 @@ module ShopifyAPI
       def deactivate_session
         @active_session.value = nil
       end
+
+      sig { returns(String) }
+      def host_scheme
+        T.must(URI.parse(T.must(host)).scheme)
+      end
     end
   end
 end

data/lib/shopify_api/version.rb

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

data/lib/shopify_api/webhooks/registrations/http.rb

@@ -9,12 +9,12 @@ module ShopifyAPI
 
         sig { override.returns(String) }
         def callback_address
-          if @path.match?(%r{^https://})
+          if @path.match?(%r{^https?://})
             @path
           elsif @path.match?(/^#{Context.host_name}/)
-            "https://#{@path}"
+            "#{Context.host_scheme}://#{@path}"
           else
-            "https://#{Context.host_name}/#{@path}"
+            "#{Context.host}/#{@path}"
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.1.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby