feat: default_url_options apply to entire app

marsz · marsz · commit f4951f110377 · 2017-11-17T17:42:14.000+08:00
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -7,10 +7,6 @@ class ApplicationController < ActionController::Base
   before_action :http_auth_for_staging
   before_action :set_paper_trail_whodunnit
 
-  def default_url_options
-    { protocol: Setting.default_protocol }
-  end
-
   private
 
   def http_auth_for_staging
diff --git a/app/controllers/devise_base_controller.rb b/app/controllers/devise_base_controller.rb
@@ -3,8 +3,6 @@ class DeviseBaseController < ApplicationController
 
   layout :layout_by_resource
 
-  force_ssl
-
   private
 
   def flash_if_has_error
diff --git a/config/initializers/application_controller_defaults.rb b/config/initializers/application_controller_defaults.rb
@@ -0,0 +1,19 @@
+# Be sure to restart your server when you modify this file.
+
+ActiveSupport::Reloader.to_prepare do
+  ApplicationController.renderer.defaults.merge!(
+    http_host: Setting.host,
+    https: Setting.default_protocol.to_s.downcase == 'https'
+  )
+
+  ApplicationController.default_url_options.merge!(
+    protocol: Setting.default_protocol,
+    host: Setting.host
+  )
+
+  Rails.application.routes.default_url_options.merge!(
+    protocol: Setting.default_protocol,
+    host: Setting.host
+  )
+end
+
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
