From e7dcefb25b22656de29c1b33112bc9a3f36ed717 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike@37signals.com>
Date: Thu, 11 Sep 2025 14:31:40 -0400
Subject: [PATCH] Extract SignalUser and SignalAccount, and QB routes

---
 app/models/account.rb                                       | 2 +-
 app/models/user.rb                                          | 2 +-
 config/routes.rb                                            | 4 ----
 .../fizzy-saas/app}/models/account/signal_account.rb        | 0
 {app => gems/fizzy-saas/app}/models/user/signal_user.rb     | 0
 gems/fizzy-saas/config/routes.rb                            | 1 +
 gems/fizzy-saas/lib/fizzy/saas/engine.rb                    | 6 ++++++
 7 files changed, 9 insertions(+), 6 deletions(-)
 rename {app => gems/fizzy-saas/app}/models/account/signal_account.rb (100%)
 rename {app => gems/fizzy-saas/app}/models/user/signal_user.rb (100%)

diff --git a/app/models/account.rb b/app/models/account.rb
index 5b193a27b..3b84832b3 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,5 +1,5 @@
 class Account < ApplicationRecord
-  include Entropic, Joinable, SignalAccount
+  include Entropic, Joinable
 
   has_many_attached :uploads
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 1cc1b7a44..30af5b9f8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,6 @@
 class User < ApplicationRecord
   include Accessor, AiQuota, Assignee, Attachable, Configurable, Conversational, Highlights,
-    Mentionable, Named, Notifiable, Role, Searcher, SignalUser, Staff, Transferable
+    Mentionable, Named, Notifiable, Role, Searcher, Staff, Transferable
   include Timelined # Depends on Accessor
 
   has_one_attached :avatar
diff --git a/config/routes.rb b/config/routes.rb
index 1a462f9ed..0fc197ba2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -190,10 +190,6 @@ Rails.application.routes.draw do
 
   root "events#index"
 
-  unless Rails.application.config.x.local_authentication
-    Queenbee.routes(self)
-  end
-
   namespace :admin do
     mount MissionControl::Jobs::Engine, at: "/jobs"
   end
diff --git a/app/models/account/signal_account.rb b/gems/fizzy-saas/app/models/account/signal_account.rb
similarity index 100%
rename from app/models/account/signal_account.rb
rename to gems/fizzy-saas/app/models/account/signal_account.rb
diff --git a/app/models/user/signal_user.rb b/gems/fizzy-saas/app/models/user/signal_user.rb
similarity index 100%
rename from app/models/user/signal_user.rb
rename to gems/fizzy-saas/app/models/user/signal_user.rb
diff --git a/gems/fizzy-saas/config/routes.rb b/gems/fizzy-saas/config/routes.rb
index 675eba816..f54b557a8 100644
--- a/gems/fizzy-saas/config/routes.rb
+++ b/gems/fizzy-saas/config/routes.rb
@@ -1,2 +1,3 @@
 Fizzy::Saas::Engine.routes.draw do
+  ::Queenbee.routes(self)
 end
diff --git a/gems/fizzy-saas/lib/fizzy/saas/engine.rb b/gems/fizzy-saas/lib/fizzy/saas/engine.rb
index 837f1bf0c..9c3f4e7fa 100644
--- a/gems/fizzy-saas/lib/fizzy/saas/engine.rb
+++ b/gems/fizzy-saas/lib/fizzy/saas/engine.rb
@@ -5,6 +5,12 @@ module Fizzy
     class Engine < ::Rails::Engine
       isolate_namespace Fizzy::Saas
 
+      # extend application models
+      config.to_prepare do
+        User.include User::SignalUser
+        Account.include Account::SignalAccount
+      end
+
       # moved from config/initializers/queenbee.rb
       Queenbee.host_app = Fizzy