Remove deprecated MAILGUN_INGRESS_API_KEY and mailgun_api_key configurations
This commit is contained in:
parent
4eb25ed6d7
commit
d33c529c7f
|
@ -1,3 +1,12 @@
|
||||||
|
* Removed deprecated environment variable `MAILGUN_INGRESS_API_KEY`.
|
||||||
|
|
||||||
|
*Rafael Mendonça França*
|
||||||
|
|
||||||
|
* Removed deprecated `Rails.application.credentials.action_mailbox.mailgun_api_key`.
|
||||||
|
|
||||||
|
*Rafael Mendonça França*
|
||||||
|
|
||||||
|
|
||||||
## Rails 7.0.0.alpha2 (September 15, 2021) ##
|
## Rails 7.0.0.alpha2 (September 15, 2021) ##
|
||||||
|
|
||||||
* No changes.
|
* No changes.
|
||||||
|
|
|
@ -77,21 +77,7 @@ module ActionMailbox
|
||||||
end
|
end
|
||||||
|
|
||||||
def key
|
def key
|
||||||
if Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key)
|
Rails.application.credentials.dig(:action_mailbox, :mailgun_signing_key) || ENV["MAILGUN_INGRESS_SIGNING_KEY"]
|
||||||
ActiveSupport::Deprecation.warn(<<-MSG.squish)
|
|
||||||
Rails.application.credentials.action_mailbox.api_key is deprecated and will be ignored in Rails 7.0.
|
|
||||||
Use Rails.application.credentials.action_mailbox.signing_key instead.
|
|
||||||
MSG
|
|
||||||
Rails.application.credentials.dig(:action_mailbox, :mailgun_api_key)
|
|
||||||
elsif ENV["MAILGUN_INGRESS_API_KEY"]
|
|
||||||
ActiveSupport::Deprecation.warn(<<-MSG.squish)
|
|
||||||
The MAILGUN_INGRESS_API_KEY environment variable is deprecated and will be ignored in Rails 7.0.
|
|
||||||
Use MAILGUN_INGRESS_SIGNING_KEY instead.
|
|
||||||
MSG
|
|
||||||
ENV["MAILGUN_INGRESS_API_KEY"]
|
|
||||||
else
|
|
||||||
Rails.application.credentials.dig(:action_mailbox, :mailgun_signing_key) || ENV["MAILGUN_INGRESS_SIGNING_KEY"]
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
class Authenticator
|
class Authenticator
|
||||||
|
|
|
@ -153,6 +153,10 @@ Please refer to the [Changelog][action-mailbox] for detailed changes.
|
||||||
|
|
||||||
### Removals
|
### Removals
|
||||||
|
|
||||||
|
* Removed deprecated `Rails.application.credentials.action_mailbox.mailgun_api_key`.
|
||||||
|
|
||||||
|
* Removed deprecated environment variable `MAILGUN_INGRESS_API_KEY`.
|
||||||
|
|
||||||
### Deprecations
|
### Deprecations
|
||||||
|
|
||||||
### Notable changes
|
### Notable changes
|
||||||
|
|
Loading…
Reference in New Issue