Fixes #142 with dynamic ActionMailer url options
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
class ApplicationController < ActionController::Base
|
||||
before_filter :authenticated, :has_info, :create_analytic
|
||||
before_filter :authenticated, :has_info, :create_analytic, :mailer_options
|
||||
helper_method :current_user, :is_admin?, :sanitize_font
|
||||
|
||||
# Our security guy keep talking about sea-surfing, cool story bro.
|
||||
@@ -7,6 +7,11 @@ class ApplicationController < ActionController::Base
|
||||
|
||||
private
|
||||
|
||||
def mailer_options
|
||||
ActionMailer::Base.default_url_options[:protocol] = request.protocol
|
||||
ActionMailer::Base.default_url_options[:host] = request.host_with_port
|
||||
end
|
||||
|
||||
def current_user
|
||||
@current_user ||= (
|
||||
User.find_by_auth_token(cookies[:auth_token].to_s) ||
|
||||
|
||||
@@ -41,7 +41,6 @@ Railsgoat::Application.configure do
|
||||
# ActionMailer settings for email support
|
||||
config.action_mailer.delivery_method = :smtp
|
||||
config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
|
||||
config.action_mailer.default_url_options = { :host => "localhost:3000" }
|
||||
|
||||
config.middleware.insert_before(
|
||||
Rack::Lock, Rack::LiveReload,
|
||||
|
||||
Reference in New Issue
Block a user