ruby_shopify_app 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f1c0b9278c1d143d0872ca501b2259cae0998c2cba5d7c6ebac4b58428a81b1
-  data.tar.gz: 7f9c04c736700f0e35d65af04949f8f56bcbc56611f2ddd61e796586808e4ab5
+  metadata.gz: 168effe34bcce65dfa9479f8e54da222422df9eb1076d6bc85df5316a9bc7206
+  data.tar.gz: 29be70f5e1573aedc5b92e4bd28c2ef93cfb5157818d5643c003cd0c286a3520
 SHA512:
-  metadata.gz: 3ca8751b1d52328e68c609cba8184ae0ea035b74a0f27ab5c97a15cc01207cce6846ab5ae71db8510165e8651eb4abe16572c76642a5487cec1234276976f0e6
-  data.tar.gz: 13f1848f49f793540f6f3b670466be3b7f4d6e728499810e080088514c8244aa25053e24cc459a27be3e937a39da3f3122d371997c4d24fdd451774e813ea46b
+  metadata.gz: b1d451fd0ba155fc4c873faacf0b81b9c4906d327aa8ed864fdc3d51a875a22c8e78ee069f5e0634d999ad0ef08664e48fbc04471a25e6b08825b45807cb9d85
+  data.tar.gz: aa5947fe71372462ed7dc5714fcc8fb3ecddfec39fd6b5c6ee8044ae9bc1e96894cf2cffec767b977e9f22073d002d9a2e55c3eb70914fc1bad983bd4103ca38

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+1.3.3
+-----
+
+* Fix a auth issue happens on safari 8
+
+1.3.2
+-----
+
+* better helper to determine if JS requested action
+
 1.3.1
 -----
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_shopify_app (1.2.0)
+    ruby_shopify_app (1.3.3)
       browser_sniffer (~> 2.0)
       jwt (>= 2.2.3)
       omniauth-rails_csrf_protection
@@ -108,7 +108,7 @@ GEM
       net-http
     globalid (1.2.1)
       activesupport (>= 6.1)
-    graphql (2.3.2)
+    graphql (2.3.4)
       base64
     graphql-client (0.22.0)
       activesupport (>= 3.0)
@@ -142,7 +142,7 @@ GEM
       bigdecimal (~> 3.1)
     net-http (0.4.1)
       uri
-    net-imap (0.4.10)
+    net-imap (0.4.12)
       date
       net-protocol
     net-pop (0.1.2)
@@ -151,7 +151,7 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.1)
+    nio4r (2.7.3)
     nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -166,7 +166,7 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-shopify-app (1.0.0)
@@ -251,9 +251,9 @@ GEM
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     sqlite3 (1.7.3)
       mini_portile2 (~> 2.8.0)
@@ -271,7 +271,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby

data/lib/ruby_shopify_app/controller_concerns/login_protection.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'browser_sniffer'
+require "browser_sniffer"
 
 module ShopifyApp
   module LoginProtection
@@ -16,7 +16,7 @@ module ShopifyApp
       rescue_from ActiveResource::UnauthorizedAccess, with: :close_session
     end
 
-    ACCESS_TOKEN_REQUIRED_HEADER = 'X-Shopify-API-Request-Failure-Unauthorized'
+    ACCESS_TOKEN_REQUIRED_HEADER = "X-Shopify-API-Request-Failure-Unauthorized"
 
     def activate_shopify_session
       if user_session_expected? && user_session.blank?
@@ -37,9 +37,7 @@ module ShopifyApp
     end
 
     def current_shopify_session
-      @current_shopify_session ||= begin
-        user_session || shop_session
-      end
+      @current_shopify_session ||= user_session || shop_session
     end
 
     def user_session
@@ -49,12 +47,14 @@ module ShopifyApp
     def user_session_by_jwt
       return unless ShopifyApp.configuration.allow_jwt_authentication
       return unless jwt_shopify_user_id
+
       ShopifyApp::SessionRepository.retrieve_user_session_by_shopify_user_id(jwt_shopify_user_id)
     end
 
     def user_session_by_cookie
       return unless ShopifyApp.configuration.allow_cookie_authentication
       return unless session[:user_id].present?
+
       ShopifyApp::SessionRepository.retrieve_user_session(session[:user_id])
     end
 
@@ -65,12 +65,14 @@ module ShopifyApp
     def shop_session_by_jwt
       return unless ShopifyApp.configuration.allow_jwt_authentication
       return unless jwt_shopify_domain
+
       ShopifyApp::SessionRepository.retrieve_shop_session_by_shopify_domain(jwt_shopify_domain)
     end
 
     def shop_session_by_cookie
       return unless ShopifyApp.configuration.allow_cookie_authentication
       return unless session[:shop_id].present?
+
       ShopifyApp::SessionRepository.retrieve_shop_session(session[:shop_id])
     end
 
@@ -80,8 +82,8 @@ module ShopifyApp
       end
 
       if current_shopify_session &&
-        params[:shop] && params[:shop].is_a?(String) &&
-        (current_shopify_session.domain != params[:shop])
+          params[:shop] && params[:shop].is_a?(String) &&
+          (current_shopify_session.domain != params[:shop])
         clear_session = true
       end
 
@@ -96,19 +98,20 @@ module ShopifyApp
     end
 
     def jwt_expire_at
-      expire_at = request.env['jwt.expire_at']
+      expire_at = request.env["jwt.expire_at"]
       return unless expire_at
+
       expire_at - 5.seconds # 5s gap to start fetching new token in advance
     end
 
     protected
 
     def jwt_shopify_domain
-      request.env['jwt.shopify_domain']
+      request.env["jwt.shopify_domain"]
     end
 
     def jwt_shopify_user_id
-      request.env['jwt.shopify_user_id']
+      request.env["jwt.shopify_user_id"]
     end
 
     def host
@@ -116,7 +119,7 @@ module ShopifyApp
     end
 
     def redirect_to_login
-      if request.xhr?
+      if requested_by_javascript?
         head(:unauthorized)
       else
         if request.get?
@@ -179,14 +182,17 @@ module ShopifyApp
     end
 
     def return_to_param_required?
-      native_params = %i[shop hmac timestamp locale protocol return_to]
-      request.path != '/' || sanitized_params.except(*native_params).any?
+      native_params = [:shop, :hmac, :timestamp, :locale, :protocol, :return_to]
+      request.path != "/" || sanitized_params.except(*native_params).any?
     end
 
     def fullpage_redirect_to(url)
       if ShopifyApp.configuration.embedded_app?
-        render('shopify_app/shared/redirect', layout: false,
-               locals: { url: url, current_shopify_domain: current_shopify_domain })
+        render(
+          "shopify_app/shared/redirect",
+          layout: false,
+          locals: { url: url, current_shopify_domain: current_shopify_domain },
+        )
       else
         redirect_to(url)
       end
@@ -219,6 +225,7 @@ module ShopifyApp
 
     def sanitize_shop_param(params)
       return unless params[:shop].present?
+
       ShopifyApp::Utils.sanitize_shop_domain(params[:shop])
     end
 
@@ -255,5 +262,11 @@ module ShopifyApp
     def user_session_expected?
       !ShopifyApp.configuration.user_session_repository.blank? && ShopifyApp::SessionRepository.user_storage.present?
     end
+
+    def requested_by_javascript?
+      request.xhr? ||
+        request.media_type == "text/javascript" ||
+        request.media_type == "application/javascript"
+    end
   end
 end

data/lib/ruby_shopify_app/omniauth/omniauth_configuration.rb

@@ -21,6 +21,7 @@ module ShopifyApp
 
     def request_online_tokens?
       return @per_user_permissions unless @per_user_permissions.nil?
+
       default_request_online_tokens?
     end
 
@@ -41,8 +42,9 @@ module ShopifyApp
     end
 
     def default_client_options_site
-      return '' unless shop_domain.present?
-      "https://#{shopify_auth_params[:shop]}"
+      return "" unless shop_domain.present?
+
+      "https://#{shop_domain}"
     end
 
     def default_request_online_tokens?
@@ -54,11 +56,11 @@ module ShopifyApp
     end
 
     def shop_domain
-      request.params['shop'] || (shopify_auth_params && shopify_auth_params['shop'])
+      request.params["shop"] || (shopify_auth_params && shopify_auth_params["shop"])
     end
 
     def shopify_auth_params
-      strategy.session['shopify.omniauth_params']&.with_indifferent_access
+      strategy.session["shopify.omniauth_params"]&.with_indifferent_access
     end
   end
 end

data/lib/ruby_shopify_app/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_shopify_app
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Hopper Gee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browser_sniffer