ruby_native 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eddde0de797e27e33325a23bffdcbb2e12c0488f4560cfaa0178026ffa0dfcea
-  data.tar.gz: ec4ac586194bddccedc3cc73093a79a450370d3587ce8f28eff4ecfcf81ec0ec
+  metadata.gz: 3c52e3d0cb2543e347993b2c283255755f368172641e92f51b4efa6c6f378e0d
+  data.tar.gz: 156a6454239c6a44bd3cb9ec8a02a1eef790633fb22621ab5ef258c18273ca1c
 SHA512:
-  metadata.gz: 45c5cc73aa71badca636536a6442b92c9c06657a039dfd846f960c91b52e9be5ca29c43625b3e245fd0e179780bc0964fe743c4a55088b6debc1a6e76a62d288
-  data.tar.gz: 27146b84641d802cdb506a44a965f5d4d1274501b25a5611d3ab6af6e950b5ac2ffffd5ad0549d4013f356301280c8a085e37a4c4424eb4c97226f0fee0161cf
+  metadata.gz: 1e19461f236c94227b11a68c0762bbfbb839e7e1ee08b4b71c397a522afd8b5992f86c1da81e143e7c66e2637844c8c71938722239a6d5c2016831cb42c5cc3e
+  data.tar.gz: ebdfe0f93a44a2d9efe1de997767648946cfa9d93306ebdb613e953ec5c25981c727dc4943857725a2e6806b4b032682cef503365182cd474df9b85d826b3c9d

data/app/controllers/ruby_native/auth/sessions_controller.rb

@@ -14,12 +14,14 @@ module RubyNative
         # session cookie, which would overwrite the authenticated one.
         request.session_options[:skip] = true
 
-        if data[:cookies].present?
-          response.headers["set-cookie"] = data[:cookies].join("\n")
+        cookies = data[:cookies] || []
+
+        if cookies.present?
+          response.headers["set-cookie"] = cookies.join("\n")
         end
 
         Rails.logger.debug { "[RubyNative] OAuth token exchanged, redirecting to #{data[:redirect_url]}" }
-        render json: {redirect_url: data[:redirect_url]}
+        redirect_to data[:redirect_url], allow_other_host: true
       end
     end
   end

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.9"
 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.9
 platform: ruby
 authors:
 - Joe Masilotti