Merge pull request #278 from alphagov/2534-remove-notify-integration

Remove Notify integration

Author: davidgisbey

Gemfile

@@ -29,7 +29,6 @@ gem "hashie"
 gem "inline_svg"
 gem "kaminari"
 gem "kramdown"
-gem "mail-notify"
 gem "nokogiri"
 gem "openapi3_parser"
 gem "opensearch-ruby"

Gemfile.lock

@@ -362,13 +362,6 @@ GEM
       net-imap
       net-pop
       net-smtp
-    mail-notify (2.1.0)
-      actionmailer (>= 5.2.8.1)
-      actionpack (>= 5.2.8.1)
-      actionview (>= 5.2.8.1)
-      activesupport (>= 5.2.8.1)
-      notifications-ruby-client (~> 6.0)
-      rack (>= 2.1.4.1)
     marcel (1.0.4)
     matrix (0.4.2)
     method_source (1.1.0)
@@ -411,8 +404,6 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
-    notifications-ruby-client (6.2.0)
-      jwt (>= 1.5, < 3)
     null_logger (0.0.1)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -955,7 +946,6 @@ DEPENDENCIES
   inline_svg
   kaminari
   kramdown
-  mail-notify
   nokogiri
   openapi3_parser
   opensearch-ruby
@@ -1097,7 +1087,6 @@ CHECKSUMS
   logstasher (2.1.5) sha256=095e9208d9a72b9da521909b3947cf3776c70517e933acbf071228617dcd0d02
   loofah (2.24.1) sha256=655a30842b70ec476410b347ab1cd2a5b92da46a19044357bbd9f401b009a337
   mail (2.8.1) sha256=ec3b9fadcf2b3755c78785cb17bc9a0ca9ee9857108a64b6f5cfc9c0b5bfc9ad
-  mail-notify (2.1.0) sha256=a981d6dd9a2922ad8449a6625467519848856b7ded2049060665acc68d3e5a79
   marcel (1.0.4) sha256=0d5649feb64b8f19f3d3468b96c680bae9746335d02194270287868a661516a4
   matrix (0.4.2) sha256=71083ccbd67a14a43bfa78d3e4dc0f4b503b9cc18e5b4b1d686dc0f9ef7c4cc0
   method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
@@ -1124,7 +1113,6 @@ CHECKSUMS
   nokogiri (1.18.8-arm64-darwin) sha256=483b5b9fb33653f6f05cbe00d09ea315f268f0e707cfc809aa39b62993008212
   nokogiri (1.18.8-x86_64-darwin) sha256=024cdfe7d9ae3466bba6c06f348fb2a8395d9426b66a3c82f1961b907945cc0c
   nokogiri (1.18.8-x86_64-linux-gnu) sha256=4a747875db873d18a2985ee2c320a6070c4a414ad629da625fbc58d1a20e5ecc
-  notifications-ruby-client (6.2.0) sha256=da4ba515cef3105d7ed46d17c644a3ea437f07cbc02c6cf095cf1984a656cf72
   null_logger (0.0.1) sha256=5039c505a2e00f50111f266db62b8c9c5b57e9c8f28380944d79a55ec8a9f5a1
   oauth2 (2.0.9) sha256=b21f9defcf52dc1610e0dfab4c868342173dcd707fd15c777d9f4f04e153f7fb
   omniauth (2.1.3) sha256=8d24e2e55c41926c96e4a93fd566bc026dfd6f2c850408748e89945a565956c2

app.json

@@ -31,9 +31,6 @@
     "AVAILABLE_WITHOUT_EARLY_ACCESS_AUTHENTICATION": {
       "value": "true"
     },
-    "DISABLE_MAIL_DELIVERY": {
-      "value": "true"
-    },
     "OPENAI_ACCESS_TOKEN": {
       "required": true
     },

app/mailers/application_mailer.rb

@@ -7,7 +7,7 @@
 require "active_record/railtie"
 # require "active_storage/engine"
 require "action_controller/railtie"
-require "action_mailer/railtie"
+# require "action_mailer/railtie"
 # require "action_mailbox/engine"
 # require "action_text/engine"
 require "action_view/railtie"

config/application.rb

@@ -31,19 +31,6 @@
   # Change to :null_store to avoid any caching.
   config.cache_store = :memory_store
 
-  config.action_mailer.default_url_options = { host: Plek.find("govuk-chat") }
-
-  # Make template changes take effect immediately.
-  config.action_mailer.perform_caching = false
-
-  ## use these 2 lines to output to the console
-  config.action_mailer.delivery_method = :test
-  config.action_mailer.logger = Logger.new($stdout)
-
-  ## use these 2 lines to send for real via Notify
-  # config.action_mailer.delivery_method = :notify
-  # config.action_mailer.notify_settings = { api_key: ENV["GOVUK_NOTIFY_API_KEY"] }
-
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 

config/environments/development.rb

@@ -68,7 +68,7 @@
 
   # Disable caching for Action Mailer templates even if Action Controller
   # caching is enabled.
-  config.action_mailer.perform_caching = false
+  # config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -92,11 +92,4 @@
 
   # Skip DNS rebinding protection for the default health check endpoint.
   # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
-
-  config.action_mailer.default_url_options = { host: Plek.website_root }
-  config.action_mailer.delivery_method = :notify
-  config.action_mailer.notify_settings = {
-    api_key: ENV["GOVUK_NOTIFY_API_KEY"],
-  }
-  config.action_mailer.perform_deliveries = ENV["DISABLE_MAIL_DELIVERY"].blank?
 end

config/environments/production.rb

@@ -32,10 +32,10 @@
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+  # config.action_mailer.delivery_method = :test
 
   # Set host to be used by links generated in mailer templates.
-  config.action_mailer.default_url_options = { host: "example.com" }
+  # config.action_mailer.default_url_options = { host: "example.com" }
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr