ruby_native 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa4462855e62841b90cda69ebd6fd10e6286d61d6432f1bf4faf601a6a691daf
-  data.tar.gz: 3420d0c6584aa8da8e71c96918576cfbf9a298cbb7de9b3e666114674eba5137
+  metadata.gz: eddde0de797e27e33325a23bffdcbb2e12c0488f4560cfaa0178026ffa0dfcea
+  data.tar.gz: ec4ac586194bddccedc3cc73093a79a450370d3587ce8f28eff4ecfcf81ec0ec
 SHA512:
-  metadata.gz: 2388cb1e1a48d7980cefa1e5d59647c655c04b17d957fc3d47bd2c6d80a79c63d012290e2649d7f3c7e738caaa7755391b2d6ad9c7303051544e566e25609d04
-  data.tar.gz: d63ea8c05fb937ea8b2f28d874467824a68609006bca637ab7a05ebb7e72a5cb2130e98613972cf3af330ae8947ba7c14d08687a47172f90ced7c06fa006beef
+  metadata.gz: 45c5cc73aa71badca636536a6442b92c9c06657a039dfd846f960c91b52e9be5ca29c43625b3e245fd0e179780bc0964fe743c4a55088b6debc1a6e76a62d288
+  data.tar.gz: 27146b84641d802cdb506a44a965f5d4d1274501b25a5611d3ab6af6e950b5ac2ffffd5ad0549d4013f356301280c8a085e37a4c4424eb4c97226f0fee0161cf

data/lib/ruby_native/native_version.rb

@@ -0,0 +1,8 @@
+module RubyNative
+  class NativeVersion < Gem::Version
+    def <=>(other)
+      other = self.class.new(other) if other.is_a?(String)
+      super
+    end
+  end
+end

data/lib/ruby_native/oauth_middleware.rb

@@ -15,6 +15,7 @@ module RubyNative
 
       if started_oauth && callback_scheme.present? && redirect?(status)
         Rails.logger.debug { "[RubyNative] OAuth started for #{request.path}, setting tracking cookie" }
+        relax_cookie_samesite!(headers)
         set_cookie(headers, callback_scheme)
       end
 
@@ -76,8 +77,8 @@ module RubyNative
         value: signed,
         path: "/",
         httponly: true,
-        secure: Rails.env.production?,
-        same_site: :lax,
+        secure: true,
+        same_site: :none,
         max_age: 300
       })
     end
@@ -102,6 +103,23 @@ module RubyNative
       )
     end
 
+    # Apple Sign In uses form_post (a cross-origin POST callback).
+    # SameSite=Lax cookies are not sent on cross-origin POSTs, which
+    # breaks OmniAuth's state verification. Relax existing cookies
+    # to SameSite=None so the session cookie survives Apple's callback.
+    def relax_cookie_samesite!(headers)
+      raw = headers["set-cookie"]
+      return unless raw
+
+      cookies = raw.is_a?(Array) ? raw : raw.split("\n")
+      headers["set-cookie"] = cookies.map { |cookie|
+        next cookie unless cookie.match?(/SameSite=Lax/i)
+        cookie.gsub(/SameSite=Lax/i, "SameSite=None").then { |c|
+          c.include?("Secure") ? c : "#{c}; Secure"
+        }
+      }.join("\n")
+    end
+
     def redirect?(status)
       (300..399).cover?(status)
     end

data/lib/ruby_native/version.rb

@@ -1,3 +1,3 @@
 module RubyNative
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_native
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Joe Masilotti
@@ -74,6 +74,7 @@ files:
 - lib/ruby_native/engine.rb
 - lib/ruby_native/helper.rb
 - lib/ruby_native/native_detection.rb
+- lib/ruby_native/native_version.rb
 - lib/ruby_native/oauth_middleware.rb
 - lib/ruby_native/version.rb
 homepage: https://github.com/Ruby-Native/gem