diff --git a/Gemfile b/Gemfile index 8943e018c..deffe99db 100644 --- a/Gemfile +++ b/Gemfile @@ -78,7 +78,7 @@ gem 'wicked_pdf' gem 'zip-zip' # will load compatibility for old rubyzip API. gem 'aws-sdk-lambda' -gem 'aws-sdk-rails' +gem 'aws-sdk-rails', '~> 4' gem 'aws-sdk-s3' gem 'delayed_job_active_record' gem 'image_processing' diff --git a/Gemfile.lock b/Gemfile.lock index 07911f921..c50ccaa49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,14 +146,14 @@ GEM awesome_print (1.9.2) aws-eventstream (1.2.0) aws-partitions (1.780.0) - aws-record (2.11.0) + aws-record (2.13.2) aws-sdk-dynamodb (~> 1, >= 1.85.0) aws-sdk-core (3.175.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-dynamodb (1.87.0) + aws-sdk-dynamodb (1.88.0) aws-sdk-core (~> 3, >= 3.174.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.67.0) @@ -162,14 +162,17 @@ GEM aws-sdk-lambda (1.99.0) aws-sdk-core (~> 3, >= 3.174.0) aws-sigv4 (~> 1.1) - aws-sdk-rails (3.8.0) + aws-sdk-rails (4.1.0) + actionmailbox (>= 7.0.0) aws-record (~> 2) + aws-sdk-s3 (~> 1, >= 1.123.0) aws-sdk-ses (~> 1, >= 1.50.0) aws-sdk-sesv2 (~> 1, >= 1.34.0) + aws-sdk-sns (~> 1, >= 1.61.0) aws-sdk-sqs (~> 1, >= 1.56.0) aws-sessionstore-dynamodb (~> 2) - concurrent-ruby (~> 1) - railties (>= 5.2.0) + concurrent-ruby (~> 1.3, >= 1.3.1) + railties (>= 7.0.0) aws-sdk-s3 (1.125.0) aws-sdk-core (~> 3, >= 3.174.0) aws-sdk-kms (~> 1) @@ -180,12 +183,16 @@ GEM aws-sdk-sesv2 (1.35.0) aws-sdk-core (~> 3, >= 3.174.0) aws-sigv4 (~> 1.1) + aws-sdk-sns (1.62.0) + aws-sdk-core (~> 3, >= 3.174.0) + aws-sigv4 (~> 1.1) aws-sdk-sqs (1.58.0) aws-sdk-core (~> 3, >= 3.174.0) aws-sigv4 (~> 1.1) - aws-sessionstore-dynamodb (2.1.0) + aws-sessionstore-dynamodb (2.2.0) aws-sdk-dynamodb (~> 1, >= 1.85.0) - rack (~> 2) + rack (>= 2, < 4) + rack-session (>= 1, < 3) aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) base62 (1.0.0) @@ -559,6 +566,8 @@ GEM rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) + rack-session (1.0.2) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) rails (7.0.8.5) @@ -783,7 +792,7 @@ DEPENDENCIES auto_strip_attributes (~> 2.1) awesome_print aws-sdk-lambda - aws-sdk-rails + aws-sdk-rails (~> 4) aws-sdk-s3 base62 bcrypt (~> 3.1.10) diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb new file mode 100644 index 000000000..329f75265 --- /dev/null +++ b/config/initializers/action_mailer.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +if ENV['SMTP_USE_AWS_SES'] == 'true' + options = {} + options[:region] = ENV['AWS_SES_REGION'] if ENV['AWS_SES_REGION'].present? + ActionMailer::Base.add_delivery_method :ses, Aws::Rails::SesMailer, **options +end