shopify_app 18.1.3 → 19.0.0

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  version: 18.1.3
+  version: 19.0.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activeresource
+  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'
 - !ruby/object:Gem::Dependency
   name: browser_sniffer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: omniauth-rails_csrf_protection
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -53,63 +67,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.1
 - !ruby/object:Gem::Dependency
-  name: shopify_api
+  name: redirect_safely
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-shopify-oauth2
+  name: shopify_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: redirect_safely
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-readline
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,21 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: minitest
+  name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,19 +221,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -367,14 +367,11 @@ files:
 - lib/generators/shopify_app/install/templates/_flash_messages.html.erb
 - lib/generators/shopify_app/install/templates/embedded_app.html.erb
 - lib/generators/shopify_app/install/templates/flash_messages.js
-- lib/generators/shopify_app/install/templates/omniauth.rb
 - lib/generators/shopify_app/install/templates/session_store.rb
 - lib/generators/shopify_app/install/templates/shopify_app.js
 - lib/generators/shopify_app/install/templates/shopify_app.rb.tt
 - lib/generators/shopify_app/install/templates/shopify_app_importmap.js
 - lib/generators/shopify_app/install/templates/shopify_app_index.js
-- lib/generators/shopify_app/install/templates/shopify_provider.rb.tt
-- lib/generators/shopify_app/install/templates/user_agent.rb
 - lib/generators/shopify_app/products_controller/products_controller_generator.rb
 - lib/generators/shopify_app/products_controller/templates/products_controller.rb
 - lib/generators/shopify_app/rotate_shopify_token_job/rotate_shopify_token_job_generator.rb
@@ -413,8 +410,6 @@ files:
 - lib/shopify_app/managers/scripttags_manager.rb
 - lib/shopify_app/managers/webhooks_manager.rb
 - lib/shopify_app/middleware/jwt_middleware.rb
-- lib/shopify_app/middleware/same_site_cookie_middleware.rb
-- lib/shopify_app/omniauth/omniauth_configuration.rb
 - lib/shopify_app/session/in_memory_session_store.rb
 - lib/shopify_app/session/in_memory_shop_session_store.rb
 - lib/shopify_app/session/in_memory_user_session_store.rb

data/lib/generators/shopify_app/install/templates/omniauth.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-Rails.application.config.middleware.use(OmniAuth::Builder) do
-end

data/lib/generators/shopify_app/install/templates/shopify_provider.rb.tt

@@ -1,8 +0,0 @@
-  provider :shopify,
-      ShopifyApp.configuration.api_key,
-      ShopifyApp.configuration.secret,
-      scope: ShopifyApp.configuration.scope,
-      setup: lambda { |env|
-        configuration = ShopifyApp::OmniAuthConfiguration.new(env['omniauth.strategy'], Rack::Request.new(env))
-        configuration.build_options
-      }

data/lib/generators/shopify_app/install/templates/user_agent.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-module ShopifyAPI
-  class Base < ActiveResource::Base
-    headers['User-Agent'] << " | ShopifyApp/#{ShopifyApp::VERSION}"
-  end
-end

data/lib/shopify_app/middleware/same_site_cookie_middleware.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-module ShopifyApp
-  class SameSiteCookieMiddleware
-    COOKIE_SEPARATOR = "\n"
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      status, headers, body = @app.call(env)
-      user_agent = env['HTTP_USER_AGENT']
-
-      if headers && headers['Set-Cookie'] &&
-          BrowserSniffer.new(user_agent).same_site_none_compatible? &&
-          ShopifyApp.configuration.enable_same_site_none &&
-          Rack::Request.new(env).ssl?
-
-        set_cookies = headers['Set-Cookie']
-          .split(COOKIE_SEPARATOR)
-          .compact
-          .map do |cookie|
-            cookie << '; Secure' unless cookie =~ /;\s*secure/i
-            cookie << '; SameSite=None' if ShopifyApp.configuration.embedded_app?
-            cookie
-          end
-
-        headers['Set-Cookie'] = set_cookies.join(COOKIE_SEPARATOR)
-      end
-
-      [status, headers, body]
-    end
-  end
-end

data/lib/shopify_app/omniauth/omniauth_configuration.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-module ShopifyApp
-  class OmniAuthConfiguration
-    attr_reader :strategy, :request
-    attr_writer :client_options_site, :scopes, :per_user_permissions
-
-    def initialize(strategy, request)
-      @strategy = strategy
-      @request = request
-    end
-
-    def build_options
-      strategy.options[:client_options][:site] = client_options_site
-      strategy.options[:scope] = scopes
-      strategy.options[:old_client_secret] = ShopifyApp.configuration.old_secret
-      strategy.options[:per_user_permissions] = request_online_tokens?
-    end
-
-    private
-
-    def request_online_tokens?
-      return @per_user_permissions unless @per_user_permissions.nil?
-      default_request_online_tokens?
-    end
-
-    def scopes
-      @scopes || default_scopes
-    end
-
-    def client_options_site
-      @client_options_site || default_client_options_site
-    end
-
-    def default_scopes
-      if request_online_tokens?
-        ShopifyApp.configuration.user_access_scopes
-      else
-        ShopifyApp.configuration.shop_access_scopes
-      end
-    end
-
-    def default_client_options_site
-      return '' unless shop_domain.present?
-      "https://#{shopify_auth_params[:shop]}"
-    end
-
-    def default_request_online_tokens?
-      strategy.session[:user_tokens] && !update_shop_scopes?
-    end
-
-    def update_shop_scopes?
-      ShopifyApp.configuration.shop_access_scopes_strategy.update_access_scopes?(shop_domain)
-    end
-
-    def shop_domain
-      request.params['shop'] || (shopify_auth_params && shopify_auth_params['shop'])
-    end
-
-    def shopify_auth_params
-      strategy.session['shopify.omniauth_params']&.with_indifferent_access
-    end
-  end
-end