same_site_cookie_fix 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a413baf7674d3f16b4ee58b1880ac5efc1ea1c926cfc60c18ae5a9907049b915
-  data.tar.gz: 0adc0973d57676ba51cbeeb505e20663dbbed79c88b015b7d8d96010c9a0c789
+  metadata.gz: be012039c123a6c9e3c941345a1d7fa923c6de19df187aa3fff0ccc065b1fefd
+  data.tar.gz: 02a876f0e92a5b06d7cddfe1156f116dd1304751214cd6db75d7046cfd02e063
 SHA512:
-  metadata.gz: 5dfc95e764d22d592b7b2e95a6e44a9b577936bfa1296d868c1aeb33358b637c12f39454a8781f1a90f718e40cdec13e2b86bfc94bc5f63b919b1491676d58ee
-  data.tar.gz: 2c9ca628c56ca58d36c593c23c9838695f31dd2caf213d3266676d964520e570ac7ac83da5deac91f177e44ce6faafce0323b36a28c4fdf84921cc9b088509de
+  metadata.gz: ae106227703478774276db58fe5d23d46445aafc99d635a3d1ed3670f8d6c3f7fbbf0c75cf6a398365bb9ad627e4787f56a557c92a719c5b3c30422277f18344
+  data.tar.gz: 2bdaef832c38b39714a99382ae5c0cca2762cac5f8696fded23f5a7fc0f99820371aa80275c59765bfb8eb826be19046b8b53fbd958c7d3f190e23b1cb615039

data/lib/same_site_cookie_fix/helpers.rb

@@ -0,0 +1,23 @@
+module SameSiteCookieFix
+  class Helpers
+
+    SHOPIFY_APP_VERSION_WITH_SAMESITE_FIX = '11.6.0'.freeze
+
+    def self.should_load_railtie?
+      rails_is_defined? && !(shopify_app_is_defined? && shopify_app_has_samesite_fix?)
+    end
+
+    def self.rails_is_defined?
+      defined?(Rails)
+    end
+
+    def self.shopify_app_is_defined?
+      defined?(ShopifyApp)
+    end
+
+    def self.shopify_app_has_samesite_fix?
+      Gem::Version.new(ShopifyApp::VERSION) >= Gem::Version.new(SHOPIFY_APP_VERSION_WITH_SAMESITE_FIX)
+    end
+
+  end
+end

data/lib/same_site_cookie_fix/middleware.rb

@@ -1,3 +1,5 @@
+require 'browser_sniffer'
+
 module SameSiteCookieFix
   class Middleware
     def initialize(app)
@@ -14,7 +16,7 @@ module SameSiteCookieFix
 
         cookies.each do |cookie|
           unless cookie.include?("; SameSite")
-            headers['Set-Cookie'] = headers['Set-Cookie'].gsub("#{cookie}", "#{cookie}; secure; SameSite=None\n")
+            headers['Set-Cookie'] = headers['Set-Cookie'].gsub("#{cookie}", "#{cookie}; secure; SameSite=None")
           end
         end
       end

data/lib/same_site_cookie_fix/railtie.rb

@@ -1,7 +1,7 @@
 module SameSiteCookieFix
   class Railtie < Rails::Railtie
     initializer "same_site_cookie_fix.railtie.configure_rails_initialization" do |app|
-      app.middleware.use SameSiteCookieFix::Middleware
+      app.middleware.insert_before(ActionDispatch::Cookies, SameSiteCookieFix::Middleware)
     end
   end
 end

data/lib/same_site_cookie_fix/version.rb

@@ -1,5 +1,5 @@
 module SameSiteCookieFix
 
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.1.0'.freeze
 
 end

data/lib/same_site_cookie_fix.rb

@@ -1,5 +1,7 @@
 require 'same_site_cookie_fix/version'
-require 'same_site_cookie_fix/railtie' if defined?(Rails)
+require 'same_site_cookie_fix/middleware'
+require 'same_site_cookie_fix/helpers'
+require 'same_site_cookie_fix/railtie' if SameSiteCookieFix::Helpers.should_load_railtie?
 
 module SameSiteCookieFix
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: same_site_cookie_fix
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Gavin Ballard
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/same_site_cookie_fix.rb
+- lib/same_site_cookie_fix/helpers.rb
 - lib/same_site_cookie_fix/middleware.rb
 - lib/same_site_cookie_fix/railtie.rb
 - lib/same_site_cookie_fix/version.rb