shopify_app 13.2.0 → 20.2.0

data/lib/shopify_app/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ShopifyApp
-  VERSION = '13.2.0'
+  VERSION = "20.2.0"
 end

data/lib/shopify_app.rb

@@ -1,59 +1,82 @@
 # frozen_string_literal: true
-require 'shopify_app/version'
+
+require "shopify_app/version"
 
 # deps
-require 'shopify_api'
-require 'omniauth-shopify-oauth2'
-require 'redirect_safely'
+require "shopify_api"
+require "redirect_safely"
 
 module ShopifyApp
   def self.rails6?
     Rails::VERSION::MAJOR >= 6
   end
 
+  def self.rails7?
+    Rails::VERSION::MAJOR >= 7
+  end
+
+  def self.use_importmap?
+    rails7? && File.exist?("config/importmap.rb")
+  end
+
   def self.use_webpacker?
     rails6? &&
-      defined?(Webpacker) == 'constant' &&
+      defined?(Webpacker) == "constant" &&
       !configuration.disable_webpacker
   end
 
   # config
-  require 'shopify_app/configuration'
+  require "shopify_app/configuration"
 
   # engine
-  require 'shopify_app/engine'
+  require "shopify_app/engine"
 
   # utils
-  require 'shopify_app/utils'
+  require "shopify_app/utils"
+
+  # errors
+  require "shopify_app/errors"
 
   # controller concerns
-  require 'shopify_app/controller_concerns/localization'
-  require 'shopify_app/controller_concerns/itp'
-  require 'shopify_app/controller_concerns/login_protection'
-  require 'shopify_app/controller_concerns/embedded_app'
-  require 'shopify_app/controller_concerns/webhook_verification'
-  require 'shopify_app/controller_concerns/app_proxy_verification'
+  require "shopify_app/controller_concerns/csrf_protection"
+  require "shopify_app/controller_concerns/localization"
+  require "shopify_app/controller_concerns/frame_ancestors"
+  require "shopify_app/controller_concerns/itp"
+  require "shopify_app/controller_concerns/sanitized_params"
+  require "shopify_app/controller_concerns/redirect_for_embedded"
+  require "shopify_app/controller_concerns/login_protection"
+  require "shopify_app/controller_concerns/ensure_billing"
+  require "shopify_app/controller_concerns/embedded_app"
+  require "shopify_app/controller_concerns/payload_verification"
+  require "shopify_app/controller_concerns/app_proxy_verification"
+  require "shopify_app/controller_concerns/webhook_verification"
 
   # jobs
-  require 'shopify_app/jobs/webhooks_manager_job'
-  require 'shopify_app/jobs/scripttags_manager_job'
+  require "shopify_app/jobs/webhooks_manager_job"
+  require "shopify_app/jobs/scripttags_manager_job"
 
   # managers
-  require 'shopify_app/managers/webhooks_manager'
-  require 'shopify_app/managers/scripttags_manager'
+  require "shopify_app/managers/webhooks_manager"
+  require "shopify_app/managers/scripttags_manager"
 
   # middleware
-  require 'shopify_app/middleware/jwt_middleware'
-  require 'shopify_app/middleware/same_site_cookie_middleware'
+  require "shopify_app/middleware/jwt_middleware"
 
   # session
-  require 'shopify_app/session/in_memory_session_store'
-  require 'shopify_app/session/in_memory_shop_session_store'
-  require 'shopify_app/session/in_memory_user_session_store'
-  require 'shopify_app/session/jwt'
-  require 'shopify_app/session/null_user_session_store'
-  require 'shopify_app/session/session_repository'
-  require 'shopify_app/session/session_storage'
-  require 'shopify_app/session/shop_session_storage'
-  require 'shopify_app/session/user_session_storage'
+  require "shopify_app/session/in_memory_session_store"
+  require "shopify_app/session/in_memory_shop_session_store"
+  require "shopify_app/session/in_memory_user_session_store"
+  require "shopify_app/session/jwt"
+  require "shopify_app/session/null_user_session_store"
+  require "shopify_app/session/session_repository"
+  require "shopify_app/session/session_storage"
+  require "shopify_app/session/shop_session_storage"
+  require "shopify_app/session/shop_session_storage_with_scopes"
+  require "shopify_app/session/user_session_storage"
+  require "shopify_app/session/user_session_storage_with_scopes"
+
+  # access scopes strategies
+  require "shopify_app/access_scopes/shop_strategy"
+  require "shopify_app/access_scopes/user_strategy"
+  require "shopify_app/access_scopes/noop_strategy"
 end

data/package.json

@@ -1,26 +1,25 @@
 {
   "name": "shopify_app",
-  "version": "13.2.0",
+  "version": "20.2.0",
   "repository": "git@github.com:Shopify/shopify_app.git",
   "author": "Shopify",
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
     "babel-loader": "^8.0.6",
-    "babel-preset-shopify": "^20.0.0",
+    "babel-preset-shopify": "^21.0.0",
     "chai": "^4.1.2",
-    "karma": "^4.0.1",
+    "karma": "^5.2.1",
     "karma-chai-sinon": "^0.1.5",
     "karma-chrome-launcher": "^3.1.0",
     "karma-cli": "^2.0.0",
-    "karma-mocha": "^1.3.0",
+    "karma-mocha": "^2.0.1",
     "karma-mocha-clean-reporter": "^0.0.1",
-    "karma-mocha-debug": "^0.1.2",
     "karma-webpack": "^4.0.2",
-    "mocha-debug": "^0.0.1",
-    "sinon": "^7.4.2",
+    "mocha": "^8.1.3",
+    "sinon": "^9.0.3",
     "sinon-chai": "^3.2.0",
-    "webpack": "^4.41.3"
+    "webpack": "^4.44.1"
   },
   "scripts": {
     "test": "./node_modules/.bin/karma start --browsers ChromeHeadless --single-run"

data/service.yml

@@ -1,7 +1,3 @@
 audience: partner
-classification: library
-org_line: App & Partner Platform
-owners:
-  - Shopify/platform-dev-tools-education
 slack_channels:
-  - dev-tools-education
+- shopify_app_gem

data/shopify_app.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.push(File.expand_path('../lib', __FILE__))
+
+$LOAD_PATH.push(File.expand_path("../lib", __FILE__))
 require "shopify_app/version"
 
 Gem::Specification.new do |s|
@@ -7,29 +8,30 @@ Gem::Specification.new do |s|
   s.version     = ShopifyApp::VERSION
   s.platform    = Gem::Platform::RUBY
   s.author      = "Shopify"
-  s.summary     = 'This gem is used to get quickly started with the Shopify API'
+  s.summary     = "This gem is used to get quickly started with the Shopify API"
 
-  s.required_ruby_version = ">= 2.4"
+  s.required_ruby_version = ">= 2.7"
 
-  s.metadata['allowed_push_host'] = 'https://rubygems.org'
+  s.metadata["allowed_push_host"] = "https://rubygems.org"
 
-  s.add_runtime_dependency('browser_sniffer', '~> 1.2.2')
-  s.add_runtime_dependency('rails', '> 5.2.1')
-  s.add_runtime_dependency('shopify_api', '~> 9.1.0')
-  s.add_runtime_dependency('omniauth-shopify-oauth2', '~> 2.2.2')
-  s.add_runtime_dependency('jwt', '~> 2.2.1')
-  s.add_runtime_dependency('redirect_safely', '~> 1.0')
+  s.add_runtime_dependency("activeresource") # TODO: Remove this once all active resource dependencies are removed
+  s.add_runtime_dependency("browser_sniffer", "~> 2.0")
+  s.add_runtime_dependency("jwt", ">= 2.2.3")
+  s.add_runtime_dependency("rails", "> 5.2.1")
+  s.add_runtime_dependency("redirect_safely", "~> 1.0")
+  s.add_runtime_dependency("shopify_api", "~> 11.1")
+  s.add_runtime_dependency("sprockets-rails", ">= 2.0.0")
 
-  s.add_development_dependency('rake')
-  s.add_development_dependency('byebug')
-  s.add_development_dependency('pry')
-  s.add_development_dependency('pry-nav')
-  s.add_development_dependency('pry-stack_explorer')
-  s.add_development_dependency('rb-readline')
-  s.add_development_dependency('sqlite3', '~> 1.4')
-  s.add_development_dependency('minitest')
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('webmock')
+  s.add_development_dependency("byebug")
+  s.add_development_dependency("minitest")
+  s.add_development_dependency("mocha")
+  s.add_development_dependency("pry")
+  s.add_development_dependency("pry-nav")
+  s.add_development_dependency("pry-stack_explorer")
+  s.add_development_dependency("rake")
+  s.add_development_dependency("rb-readline")
+  s.add_development_dependency("sqlite3", "~> 1.4")
+  s.add_development_dependency("webmock")
 
   s.files         = %x(git ls-files).split("\n").reject { |f| f.match(%r{^(test|example)/}) }
   s.test_files    = %x(git ls-files -- {test}/*).split("\n")

data/translation.yml

@@ -1,5 +1,5 @@
 source_language: en
-target_languages: [cs, da, de, es, fi, fr, hi, it, ja, ko, ms, nb, nl, pl, pt-BR, pt-PT, sv, th, tr, zh-CN, zh-TW]
+target_languages: [cs, da, de, es, fi, fr, it, ja, ko, nb, nl, pl, pt-BR, pt-PT, sv, th, tr, vi, zh-CN, zh-TW]
 components:
   - name: 'merchant'
     paths: