shopify_app 21.6.0 → 21.8.0

data/lib/shopify_app/controller_concerns/ensure_billing.rb

@@ -136,6 +136,7 @@ module ShopifyApp
             },
           },
           returnUrl: return_url,
+          trialDays: ShopifyApp.configuration.billing.trial_days,
           test: ShopifyApp.configuration.billing.test,
         },
       )
@@ -208,12 +209,14 @@ module ShopifyApp
         $name: String!
         $lineItems: [AppSubscriptionLineItemInput!]!
         $returnUrl: URL!
+        $trialDays: Int
         $test: Boolean
       ) {
         appSubscriptionCreate(
           name: $name
           lineItems: $lineItems
           returnUrl: $returnUrl
+          trialDays: $trialDays
           test: $test
         ) {
           confirmationUrl

data/lib/shopify_app/controller_concerns/localization.rb

@@ -5,20 +5,23 @@ module ShopifyApp
     extend ActiveSupport::Concern
 
     included do
-      before_action :set_locale
+      around_action :set_locale
     end
 
     private
 
-    def set_locale
-      if params[:locale]
-        session[:locale] = params[:locale]
-      else
-        session[:locale] ||= I18n.default_locale
+    def set_locale(&action)
+      locale = params[:locale] || I18n.default_locale
+
+      # Fallback to the 2 letter language code if the requested locale unavailable
+      unless I18n.available_locales.include?(locale.to_sym)
+        locale = locale.split("-").first
       end
-      I18n.locale = session[:locale]
+
+      session[:locale] = locale
+      I18n.with_locale(session[:locale], &action)
     rescue I18n::InvalidLocale
-      I18n.locale = I18n.default_locale
+      I18n.with_locale(I18n.default_locale, &action)
     end
   end
 end

data/lib/shopify_app/managers/webhooks_manager.rb

@@ -26,6 +26,7 @@ module ShopifyApp
 
         ShopifyApp::Logger.debug("Recreating webhooks")
         add_registrations
+        create_webhooks(session: session)
       end
 
       def destroy_webhooks(session:)
@@ -43,12 +44,13 @@ module ShopifyApp
         ShopifyApp::Logger.debug("Adding registrations to webhooks")
         ShopifyApp.configuration.webhooks.each do |attributes|
           webhook_path = path(attributes)
+          delivery_method = attributes[:delivery_method] || :http
 
           ShopifyAPI::Webhooks::Registry.add_registration(
             topic: attributes[:topic],
-            delivery_method: attributes[:delivery_method] || :http,
+            delivery_method: delivery_method,
             path: webhook_path,
-            handler: webhook_job_klass(webhook_path),
+            handler: delivery_method == :http ? webhook_job_klass(webhook_path) : nil,
             fields: attributes[:fields],
           )
         end

data/lib/shopify_app/session/in_memory_user_session_store.rb

@@ -5,7 +5,7 @@ module ShopifyApp
     class << self
       def store(session, user)
         id = super
-        repo[user.shopify_user_id] = session
+        repo[user.id.to_s] = session
         id
       end
 

data/lib/shopify_app/session/session_repository.rb

@@ -34,7 +34,8 @@ module ShopifyApp
       def shop_storage
         load_shop_storage || raise(
           ::ShopifyApp::ConfigurationError,
-          "ShopifySessionRepository.shop_storage is not configured!",
+          "ShopifyApp::Configuration.shop_session_repository is not configured!\n
+          See docs here: https://github.com/Shopify/shopify_app/blob/main/docs/shopify_app/sessions.md#sessions",
         )
       end
 
@@ -92,13 +93,46 @@ module ShopifyApp
       def load_shop_storage
         return unless @shop_storage
 
-        @shop_storage.respond_to?(:safe_constantize) ? @shop_storage.safe_constantize : @shop_storage
+        shop_storage_class =
+          @shop_storage.respond_to?(:safe_constantize) ? @shop_storage.safe_constantize : @shop_storage
+
+        [
+          :store,
+          :retrieve,
+          :retrieve_by_shopify_domain,
+        ].each do |method|
+          raise(
+            ::ShopifyApp::ConfigurationError,
+            missing_method_message("shop", method.to_s),
+          ) unless shop_storage_class.respond_to?(method)
+        end
+
+        shop_storage_class
       end
 
       def load_user_storage
         return NullUserSessionStore unless @user_storage
 
-        @user_storage.respond_to?(:safe_constantize) ? @user_storage.safe_constantize : @user_storage
+        user_storage_class =
+          @user_storage.respond_to?(:safe_constantize) ? @user_storage.safe_constantize : @user_storage
+
+        [
+          :store,
+          :retrieve,
+          :retrieve_by_shopify_user_id,
+        ].each do |method|
+          raise(
+            ::ShopifyApp::ConfigurationError,
+            missing_method_message("user", method.to_s),
+          ) unless user_storage_class.respond_to?(method)
+        end
+
+        user_storage_class
+      end
+
+      def missing_method_message(type, method)
+        "Missing method - '#{method}' implementation for #{type}_storage_repository\n
+        See docs here: https://github.com/Shopify/shopify_app/blob/main/docs/shopify_app/sessions.md#sessions"
       end
     end
   end

data/lib/shopify_app/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ShopifyApp
-  VERSION = "21.6.0"
+  VERSION = "21.8.0"
 end

data/package.json

@@ -1,25 +1,24 @@
 {
   "name": "shopify_app",
-  "version": "21.6.0",
+  "version": "21.8.0",
   "repository": "git@github.com:Shopify/shopify_app.git",
   "author": "Shopify",
   "license": "MIT",
-  "dependencies": {},
   "devDependencies": {
     "babel-loader": "^8.0.6",
     "babel-preset-shopify": "^21.0.0",
     "chai": "^4.1.2",
-    "karma": "^5.2.1",
+    "karma": "^6.4.2",
     "karma-chai-sinon": "^0.1.5",
     "karma-chrome-launcher": "^3.1.0",
     "karma-cli": "^2.0.0",
     "karma-mocha": "^2.0.1",
     "karma-mocha-clean-reporter": "^0.0.1",
-    "karma-webpack": "^4.0.2",
-    "mocha": "^8.1.3",
+    "karma-webpack": "^5.0.0",
+    "mocha": "^10.2.0",
     "sinon": "^9.0.3",
     "sinon-chai": "^3.2.0",
-    "webpack": "^4.44.1"
+    "webpack": "^5.89.0"
   },
   "scripts": {
     "test": "./node_modules/.bin/karma start --browsers ChromeHeadless --single-run"

data/shopify_app.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   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", "~> 13.1")
+  s.add_runtime_dependency("shopify_api", "~> 13.3")
   s.add_runtime_dependency("sprockets-rails", ">= 2.0.0")
 
   s.add_development_dependency("byebug")