diff options
Diffstat (limited to 'actionmailbox/app/controllers/rails')
3 files changed, 47 insertions, 41 deletions
diff --git a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb index 7f7b0e004e..30d6afe0c0 100644 --- a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb +++ b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb @@ -1,29 +1,31 @@ # frozen_string_literal: true -class Rails::Conductor::ActionMailbox::InboundEmailsController < Rails::Conductor::BaseController - def index - @inbound_emails = ActionMailbox::InboundEmail.order(created_at: :desc) - end - - def new - end - - def show - @inbound_email = ActionMailbox::InboundEmail.find(params[:id]) - end +module Rails + class Conductor::ActionMailbox::InboundEmailsController < Rails::Conductor::BaseController + def index + @inbound_emails = ActionMailbox::InboundEmail.order(created_at: :desc) + end - def create - inbound_email = create_inbound_email(new_mail) - redirect_to main_app.rails_conductor_inbound_email_url(inbound_email) - end + def new + end - private - def new_mail - Mail.new params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h + def show + @inbound_email = ActionMailbox::InboundEmail.find(params[:id]) end - def create_inbound_email(mail) - ActionMailbox::InboundEmail.create! raw_email: \ - { io: StringIO.new(mail.to_s), filename: "inbound.eml", content_type: "message/rfc822" } + def create + inbound_email = create_inbound_email(new_mail) + redirect_to main_app.rails_conductor_inbound_email_url(inbound_email) end + + private + def new_mail + Mail.new params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h + end + + def create_inbound_email(mail) + ActionMailbox::InboundEmail.create! raw_email: \ + { io: StringIO.new(mail.to_s), filename: "inbound.eml", content_type: "message/rfc822" } + end + end end diff --git a/actionmailbox/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb b/actionmailbox/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb index c53203049b..05b1ca9a39 100644 --- a/actionmailbox/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb +++ b/actionmailbox/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb @@ -1,17 +1,19 @@ # frozen_string_literal: true -# Rerouting will run routing and processing on an email that has already been, or attempted to be, processed. -class Rails::Conductor::ActionMailbox::ReroutesController < Rails::Conductor::BaseController - def create - inbound_email = ActionMailbox::InboundEmail.find(params[:inbound_email_id]) - reroute inbound_email +module Rails + # Rerouting will run routing and processing on an email that has already been, or attempted to be, processed. + class Conductor::ActionMailbox::ReroutesController < Rails::Conductor::BaseController + def create + inbound_email = ActionMailbox::InboundEmail.find(params[:inbound_email_id]) + reroute inbound_email - redirect_to main_app.rails_conductor_inbound_email_url(inbound_email) - end - - private - def reroute(inbound_email) - inbound_email.pending! - inbound_email.route_later + redirect_to main_app.rails_conductor_inbound_email_url(inbound_email) end + + private + def reroute(inbound_email) + inbound_email.pending! + inbound_email.route_later + end + end end diff --git a/actionmailbox/app/controllers/rails/conductor/base_controller.rb b/actionmailbox/app/controllers/rails/conductor/base_controller.rb index c95a7f3b93..93c4e2a66e 100644 --- a/actionmailbox/app/controllers/rails/conductor/base_controller.rb +++ b/actionmailbox/app/controllers/rails/conductor/base_controller.rb @@ -1,12 +1,14 @@ # frozen_string_literal: true -# TODO: Move this to Rails::Conductor gem -class Rails::Conductor::BaseController < ActionController::Base - layout "rails/conductor" - before_action :ensure_development_env +module Rails + # TODO: Move this to Rails::Conductor gem + class Conductor::BaseController < ActionController::Base + layout "rails/conductor" + before_action :ensure_development_env - private - def ensure_development_env - head :forbidden unless Rails.env.development? - end + private + def ensure_development_env + head :forbidden unless Rails.env.development? + end + end end |