* Chore: Ability to configure Mailer sender emails [#339] fixes : #339 fixes : #330 * update the documentation
This commit is contained in:
parent
a8e8416d48
commit
6a2f4e6673
7 changed files with 13 additions and 5 deletions
|
@ -4,7 +4,7 @@ FB_APP_SECRET=
|
||||||
FB_APP_ID=
|
FB_APP_ID=
|
||||||
|
|
||||||
#mail
|
#mail
|
||||||
|
MAILER_SENDER_EMAIL=
|
||||||
SMTP_ADDRESS=
|
SMTP_ADDRESS=
|
||||||
SMTP_USERNAME=
|
SMTP_USERNAME=
|
||||||
SMTP_PASSWORD=
|
SMTP_PASSWORD=
|
||||||
|
|
|
@ -15,6 +15,13 @@ Style/SymbolArray:
|
||||||
Metrics/BlockLength:
|
Metrics/BlockLength:
|
||||||
Exclude:
|
Exclude:
|
||||||
- spec/**/*
|
- spec/**/*
|
||||||
|
- '**/routes.rb'
|
||||||
|
Rails/ApplicationController:
|
||||||
|
Exclude:
|
||||||
|
- 'app/controllers/api/v1/widget/messages_controller.rb'
|
||||||
|
- 'app/controllers/dashboard_controller.rb'
|
||||||
|
- 'app/controllers/widget_tests_controller.rb'
|
||||||
|
- 'app/controllers/widgets_controller.rb'
|
||||||
Style/ClassAndModuleChildren:
|
Style/ClassAndModuleChildren:
|
||||||
EnforcedStyle: compact
|
EnforcedStyle: compact
|
||||||
RSpec/NestedGroups:
|
RSpec/NestedGroups:
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class ApplicationMailer < ActionMailer::Base
|
class ApplicationMailer < ActionMailer::Base
|
||||||
default from: 'accounts@chatwoot.com'
|
default from: ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
|
||||||
layout 'mailer'
|
layout 'mailer'
|
||||||
|
|
||||||
# helpers
|
# helpers
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class AssignmentMailer < ApplicationMailer
|
class AssignmentMailer < ApplicationMailer
|
||||||
default from: 'accounts@chatwoot.com'
|
default from: ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
|
||||||
layout 'mailer'
|
layout 'mailer'
|
||||||
|
|
||||||
def conversation_assigned(conversation, agent)
|
def conversation_assigned(conversation, agent)
|
||||||
|
|
|
@ -12,7 +12,7 @@ Devise.setup do |config|
|
||||||
# Configure the e-mail address which will be shown in Devise::Mailer,
|
# Configure the e-mail address which will be shown in Devise::Mailer,
|
||||||
# note that it will be overwritten if you use your own mailer class
|
# note that it will be overwritten if you use your own mailer class
|
||||||
# with default "from" parameter.
|
# with default "from" parameter.
|
||||||
config.mailer_sender = 'accounts@chatwoot.com'
|
config.mailer_sender = ENV.fetch('MAILER_SENDER_EMAIL', 'accounts@chatwoot.com')
|
||||||
|
|
||||||
# Configure the class responsible to send e-mails.
|
# Configure the class responsible to send e-mails.
|
||||||
# config.mailer = 'Devise::Mailer'
|
# config.mailer = 'Devise::Mailer'
|
||||||
|
|
|
@ -35,6 +35,7 @@ For development, you don't need an email provider. Chatwoot uses [letter-opener]
|
||||||
For production use, use the following variables to set SMTP server.
|
For production use, use the following variables to set SMTP server.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
MAILER_SENDER_EMAIL=
|
||||||
SMTP_ADDRESS=
|
SMTP_ADDRESS=
|
||||||
SMTP_USERNAME=
|
SMTP_USERNAME=
|
||||||
SMTP_PASSWORD=
|
SMTP_PASSWORD=
|
||||||
|
|
|
@ -15,7 +15,7 @@ RSpec.describe 'Confirmation Instructions', type: :mailer do
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'uses the user\'s name' do
|
it 'uses the user\'s name' do
|
||||||
expect(mail.body).to match("Welcome, #{confirmable_user.name}!")
|
expect(mail.body).to match("Welcome, #{CGI.escapeHTML(confirmable_user.name)}!")
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not refer to the inviter and their account' do
|
it 'does not refer to the inviter and their account' do
|
||||||
|
|
Loading…
Reference in a new issue