Merge pull request #1878 from basecamp/flavorjones/console1984-v2

Bump fizzy-saas to enable console auditing

Author: flavorjones

Gemfile.saas

@@ -3,15 +3,17 @@ eval_gemfile "Gemfile"
 
 git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
 
-
+# SaaS-only functionality
 gem "activeresource", require: "active_resource"
 gem "queenbee", bc: "queenbee-plugin"
 gem "fizzy-saas", bc: "fizzy-saas"
+gem "console1984", bc: "console1984"
+gem "audits1984", bc: "audits1984"
+
+# Telemetry
 gem "rails_structured_logging", bc: "rails-structured-logging"
 gem "sentry-ruby"
 gem "sentry-rails"
-
-# Telemetry
 gem "yabeda"
 gem "yabeda-actioncable"
 gem "yabeda-activejob", github: "basecamp/yabeda-activejob", branch: "bulk-and-scheduled-jobs"

Gemfile.saas.lock

@@ -1,8 +1,31 @@
+GIT
+  remote: https://github.com/basecamp/audits1984
+  revision: c790eaec0716c8df56b3d0ab5bf5d75e3e1b0ed0
+  specs:
+    audits1984 (0.1.7)
+      console1984
+      importmap-rails (>= 1.2.1)
+      rinku
+      rouge
+      turbo-rails
+
+GIT
+  remote: https://github.com/basecamp/console1984
+  revision: 02b1b9ee7fd7050174b6a98c2b43057553621dc4
+  specs:
+    console1984 (0.2.2)
+      irb (~> 1.13)
+      parser
+      rails (>= 7.0)
+      rainbow
+
 GIT
   remote: https://github.com/basecamp/fizzy-saas
-  revision: f516ae03f981e080e5b4e55a8a2d8afb28de6f1d
+  revision: 97d126e0a6084905aceaadf4facaa2a48b44e124
   specs:
     fizzy-saas (0.1.0)
+      audits1984
+      console1984
       prometheus-client-mmap (~> 1.4.0)
       queenbee
       rails (>= 8.1.0.beta1)
@@ -440,6 +463,7 @@ GEM
     reline (0.6.3)
       io-console (~> 0.5)
     rexml (3.4.4)
+    rinku (2.0.6)
     rouge (4.6.1)
     rqrcode (3.1.0)
       chunky_png (~> 1.0)
@@ -610,6 +634,7 @@ PLATFORMS
 
 DEPENDENCIES
   activeresource
+  audits1984!
   autotuner
   aws-sdk-s3
   bcrypt (~> 3.1.7)
@@ -618,6 +643,7 @@ DEPENDENCIES
   brakeman
   bundler-audit
   capybara
+  console1984!
   debug
   faker
   fizzy-saas!

app/helpers/login_helper.rb

@@ -1,10 +1,12 @@
 module LoginHelper
   def login_url
-    new_session_path(script_name: nil)
+    # Use main_app because this helper may be invoked from an engine controller
+    # that inherits from AdminController.
+    main_app.new_session_path(script_name: nil)
   end
 
   def logout_url
-    new_session_path
+    main_app.new_session_path
   end
 
   def redirect_to_login_url