Merge pull request #633 from basecamp/flavorjones/beta-does-not-use-37id

Make sure the beta env keeps local authentication (for now)

app/controllers/signup/base_controller.rb

@@ -1,5 +1,6 @@
 class Signup::BaseController < ApplicationController
   require_untenanted_access
+  before_action :redirect_if_local_auth
 
   http_basic_authenticate_with(
     name: Rails.application.credentials.dig(:account_signup_http_basic_auth, :name),
@@ -32,4 +33,8 @@ class Signup::BaseController < ApplicationController
       redirect_to account.signal_account.owner.remote_login_url(proceed_to: root_path),
                   allow_other_host: true
     end
+
+    def redirect_if_local_auth
+      render plain: "Unauthorized", status: :unauthorized if Rails.application.config.x.local_authentication
+    end
 end

app/models/account/signal_account.rb

@@ -2,8 +2,10 @@ module Account::SignalAccount
   extend ActiveSupport::Concern
 
   included do
-    # TODO: remove the "optional: true" once we've populated the accounts properly
-    belongs_to :signal_account, class_name: "SignalId::Account", primary_key: :queenbee_id, foreign_key: :queenbee_id, optional: true
+    unless Rails.application.config.x.local_authentication
+      # TODO: remove the "optional: true" once we've populated the accounts properly
+      belongs_to :signal_account, class_name: "SignalId::Account", primary_key: :queenbee_id, foreign_key: :queenbee_id, optional: true
+    end
   end
 
   class_methods do

app/models/user/signal_user.rb

@@ -2,6 +2,8 @@ module User::SignalUser
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :signal_user, dependent: :destroy, class_name: "SignalId::User", optional: true
+    unless Rails.application.config.x.local_authentication
+      belongs_to :signal_user, dependent: :destroy, class_name: "SignalId::User", optional: true
+    end
   end
 end

config/deploy.beta.yml

@@ -13,6 +13,7 @@ proxy:
 env:
   clear:
     RAILS_ENV: beta
+    LOCAL_AUTHENTICATION: t
 
 x-beamer-accessory: &beamer-accessory
   image: basecamp/beamer

config/initializers/signal_id.rb

@@ -1,11 +1,19 @@
 require "signal_id"
 
+Rails.application.config.x.local_authentication = ENV["LOCAL_AUTHENTICATION"].present?
+
 ENV["SIGNAL_ID_SECRET"] = Rails.application.credentials.signal_id_secret
 
 Rails.application.config.to_prepare do
   SignalId.product = "fizzy"
 
-  SignalId::Database.load_configuration SignalId::Database.default_configuration
+  db_config = SignalId::Database.default_configuration
+  if Rails.application.config.x.local_authentication
+    db_config.each do |name, config|
+      config["connect_timeout"] = 1
+    end
+  end
+  SignalId::Database.load_configuration db_config
   SignalId::Database.enable_rw_splitting!
 
   silence_warnings do