brainzlab 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c7573fc851c73fe6b684611c10fb6799369c4817cc48b2fa7b18c6e84ac2188
-  data.tar.gz: 792060817bb43eafa993a0a34206d7fd53b30d94ebb861205b02775243f9292d
+  metadata.gz: 2c27f671d247f5b7274905767ed060ec3bfc90c7e2389b8fe117fb300c09a59b
+  data.tar.gz: 3af6ac68bd7042f00aa16defa1c68d170653a9b053fe98cb375760b6f72bc14a
 SHA512:
-  metadata.gz: a16f37708f020bdfa8f3aaf3131ef7cbb572b086cea2ec1567eb56e2d810042ed90b2ff8f17c1d84401b50bbe1a66f1fb221b1ad8948c2df8d28b44aecf1f605
-  data.tar.gz: 3dd6909b4dc67fa7cb47767f6ca001e7df4547ebe5c1a99f08efe12f8d0285da58f62ef99f9ad9a9884b7526a12cd7a6018be45993b0dee131dda696fa37fb47
+  metadata.gz: 571ec070d0ff6d1f3503245a6c0e201d4d81903fda8a0d6ddf316ae7148c4bee6deb93299b76e5fc22839747d9f827cbf68da46dc04cb7d01abf2685580fb647
+  data.tar.gz: 9af9570ce725917a5093a9efbc46f81b13c454bb044549057eb49e43fa717e2750d28d580db055171bcb7e9d4c2cc2173e283bb47e7154510a16f1c82ac2ee3e

data/lib/brainzlab/rails/railtie.rb

@@ -30,8 +30,12 @@ module BrainzLab
           end
         end
 
-        # Add request context middleware (runs early)
-        app.middleware.insert_after ActionDispatch::RequestId, BrainzLab::Rails::Middleware
+        # Add request context middleware. Gated on `enabled` so the kill switch
+        # (BRAINZLAB_SDK_ENABLED=false) fully removes it — it previously loaded
+        # unconditionally, so disabling didn't stop its session interference.
+        if BrainzLab.configuration.enabled
+          app.middleware.insert_after ActionDispatch::RequestId, BrainzLab::Rails::Middleware
+        end
 
         # Add DevTools middlewares if enabled
         if BrainzLab.configuration.devtools_enabled
@@ -220,16 +224,10 @@ module BrainzLab
         # Store request_id in thread local for log subscriber
         Thread.current[:brainzlab_request_id] = request_id
 
-        # Capture session_id - access session to ensure it's loaded
-        if request.session.respond_to?(:id)
-          # Force session load by accessing it
-          session_id = begin
-            request.session.id
-          rescue StandardError
-            nil
-          end
-          context.session_id = session_id.to_s if session_id.present?
-        end
+        # NOTE: session_id is captured AFTER @app.call (see below), never here.
+        # Forcing a session load on the way in — before the app's session
+        # middleware and any reset_session (login) — drops the session on
+        # cookie/active_record_store apps, causing login loops.
 
         # Capture full request info for Reflex
         context.request_method = request.request_method
@@ -276,6 +274,19 @@ module BrainzLab
 
         status, headers, response = @app.call(env)
 
+        # Capture session_id now that the app (and its session middleware) has
+        # run. Read it only if the session was already loaded — never force a
+        # load — so we never disturb the session lifecycle / Set-Cookie.
+        begin
+          rack_session = env['rack.session']
+          if rack_session && (!rack_session.respond_to?(:loaded?) || rack_session.loaded?)
+            sid = rack_session.respond_to?(:id) ? rack_session.id : nil
+            context.session_id = sid.to_s if sid && !sid.to_s.empty?
+          end
+        rescue StandardError
+          nil
+        end
+
         # Add breadcrumb for response
         BrainzLab::Reflex.add_breadcrumb(
           "Response #{status}",

data/lib/brainzlab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrainzLab
-  VERSION = '0.1.31'
+  VERSION = '0.1.32'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainzlab
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - BrainzLab