diff --git a/app/controllers/concerns/authentication.rb b/app/controllers/concerns/authentication.rb index dc3ee7bb7..39a6d293e 100644 --- a/app/controllers/concerns/authentication.rb +++ b/app/controllers/concerns/authentication.rb @@ -48,11 +48,7 @@ module Authentication def request_authentication session[:return_to_after_authenticating] = request.url - if Rails.application.config.x.local_authentication - redirect_to new_session_path - else - redirect_to Launchpad.login_url(account: Current.account), allow_other_host: true - end + redirect_to Launchpad.login_url(account: Current.account), allow_other_host: true end def after_authentication_url diff --git a/app/controllers/signup/base_controller.rb b/app/controllers/signup/base_controller.rb index 40ae83e92..088937b04 100644 --- a/app/controllers/signup/base_controller.rb +++ b/app/controllers/signup/base_controller.rb @@ -1,6 +1,5 @@ class Signup::BaseController < ApplicationController require_untenanted_access - before_action :redirect_if_local_auth # TODO: Remove this auth before launch. http_basic_authenticate_with( @@ -34,8 +33,4 @@ 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 diff --git a/app/models/account/signal_account.rb b/app/models/account/signal_account.rb index 610a4ed9c..861626909 100644 --- a/app/models/account/signal_account.rb +++ b/app/models/account/signal_account.rb @@ -2,10 +2,8 @@ module Account::SignalAccount extend ActiveSupport::Concern included do - 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 + # 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 class_methods do diff --git a/app/models/user/signal_user.rb b/app/models/user/signal_user.rb index 924cfe87d..16bee49bc 100644 --- a/app/models/user/signal_user.rb +++ b/app/models/user/signal_user.rb @@ -2,8 +2,6 @@ module User::SignalUser extend ActiveSupport::Concern included do - unless Rails.application.config.x.local_authentication - belongs_to :signal_user, dependent: :destroy, class_name: "SignalId::User", optional: true - end + belongs_to :signal_user, dependent: :destroy, class_name: "SignalId::User", optional: true end end diff --git a/config/initializers/signal_id.rb b/config/initializers/signal_id.rb index afb6ff60c..b356ef881 100644 --- a/config/initializers/signal_id.rb +++ b/config/initializers/signal_id.rb @@ -1,18 +1,11 @@ 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" 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!