ruby_native 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eddde0de797e27e33325a23bffdcbb2e12c0488f4560cfaa0178026ffa0dfcea
-  data.tar.gz: ec4ac586194bddccedc3cc73093a79a450370d3587ce8f28eff4ecfcf81ec0ec
+  metadata.gz: d9b49c97d0f100aa8dc0964d9701187edaa62441f0a1c8d0049233ce8b5fa3c2
+  data.tar.gz: b5cce869ec41fda99a9ec98f8b7e930a3b410fadc0103dba4392a75e339ae51b
 SHA512:
-  metadata.gz: 45c5cc73aa71badca636536a6442b92c9c06657a039dfd846f960c91b52e9be5ca29c43625b3e245fd0e179780bc0964fe743c4a55088b6debc1a6e76a62d288
-  data.tar.gz: 27146b84641d802cdb506a44a965f5d4d1274501b25a5611d3ab6af6e950b5ac2ffffd5ad0549d4013f356301280c8a085e37a4c4424eb4c97226f0fee0161cf
+  metadata.gz: bd3606567a7f826d197e947c5f059fe25ecd31be3a90f0b04f97c9c694bba417fac707419a7bbc20fe2c40a73d648ef4c35052b834c1ac31c927edcb86f7e996
+  data.tar.gz: 6c349b9fa7c260c6b49f2e0af984b7ef8ee1c2bcedf4fb9ce87f1634d7f1fdb0dbc948e698c909a1bdc812603979732b34e760ff470a0e6ac2adfbad67d8c7ca

data/lib/ruby_native/oauth_middleware.rb

@@ -8,14 +8,18 @@ module RubyNative
 
     def call(env)
       request = ActionDispatch::Request.new(env)
-      started_oauth = oauth_start_request?(request)
-      callback_scheme = request.params["callback_scheme"] if started_oauth
+      on_oauth_path = oauth_path?(request)
+      started_native_oauth = on_oauth_path && request.params["ruby_native"] == "1"
+      callback_scheme = request.params["callback_scheme"] if started_native_oauth
 
       status, headers, body = @app.call(env)
 
-      if started_oauth && callback_scheme.present? && redirect?(status)
-        Rails.logger.debug { "[RubyNative] OAuth started for #{request.path}, setting tracking cookie" }
+      if on_oauth_path && redirect?(status)
         relax_cookie_samesite!(headers)
+      end
+
+      if started_native_oauth && callback_scheme.present? && redirect?(status)
+        Rails.logger.debug { "[RubyNative] OAuth started for #{request.path}, setting tracking cookie" }
         set_cookie(headers, callback_scheme)
       end
 
@@ -66,9 +70,8 @@ module RubyNative
 
     private
 
-    def oauth_start_request?(request)
-      return false unless oauth_paths.any? { |p| request.path == p }
-      request.params["ruby_native"] == "1"
+    def oauth_path?(request)
+      oauth_paths.any? { |p| request.path == p }
     end
 
     def set_cookie(headers, callback_scheme)

data/lib/ruby_native/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_native
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Joe Masilotti