Merge branch '15430-fts-operator-removal' into main. Closes #15430

[arvados.git] / services / api / app / mailers / user_notifier.rb

diff --git a/services/api/app/mailers/user_notifier.rb b/services/api/app/mailers/user_notifier.rb
index 759325a68b3292154c7e626886a667a22f32b04e..03000a37308ad287a2b5f75538dd25ab4054a3be 100644 (file)
--- a/services/api/app/mailers/user_notifier.rb
+++ b/services/api/app/mailers/user_notifier.rb
@@ -1,8 +1,20 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class UserNotifier < ActionMailer::Base
-  default from: Rails.configuration.user_notifier_email_from
+  include AbstractController::Callbacks
+
+  default from: Rails.configuration.Users.UserNotifierEmailFrom
 
   def account_is_setup(user)
     @user = user
-    mail(to: user.email, subject: 'Welcome to Curoverse')
+    if not Rails.configuration.Users.UserNotifierEmailBcc.empty? then
+      @bcc = Rails.configuration.Users.UserNotifierEmailBcc.keys
+      mail(to: user.email, subject: 'Welcome to Arvados - account enabled', bcc: @bcc)
+    else
+      mail(to: user.email, subject: 'Welcome to Arvados - account enabled')
+    end
   end
+
 end