[ARVADOS] created: 2.1.0-1175-g06c56872e

[Git user]

        at  06c56872ee40bab39d606205239aeb457efda1e8 (commit)


commit 06c56872ee40bab39d606205239aeb457efda1e8
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Aug 10 11:00:02 2021 -0400

    18001: add Users/UserNotifierEmailBcc configuration option, which is the
           e-mail address that will be bcc'd on the new user welcome e-mail.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 8640e7141..b57686295 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -273,6 +273,7 @@ Clusters:
       AdminNotifierEmailFrom: arvados at example.com
       EmailSubjectPrefix: "[ARVADOS] "
       UserNotifierEmailFrom: arvados at example.com
+      UserNotifierEmailBcc: ""
       NewUserNotificationRecipients: {}
       NewInactiveUserNotificationRecipients: {}
 
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 55e8ba8f3..4549c7395 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -279,6 +279,7 @@ Clusters:
       AdminNotifierEmailFrom: arvados at example.com
       EmailSubjectPrefix: "[ARVADOS] "
       UserNotifierEmailFrom: arvados at example.com
+      UserNotifierEmailBcc: ""
       NewUserNotificationRecipients: {}
       NewInactiveUserNotificationRecipients: {}
 
diff --git a/services/api/app/mailers/user_notifier.rb b/services/api/app/mailers/user_notifier.rb
index ad887d035..c8c9a7f07 100644
--- a/services/api/app/mailers/user_notifier.rb
+++ b/services/api/app/mailers/user_notifier.rb
@@ -5,7 +5,8 @@
 class UserNotifier < ActionMailer::Base
   include AbstractController::Callbacks
 
-  default from: Rails.configuration.Users.UserNotifierEmailFrom
+  default from: Rails.configuration.Users.UserNotifierEmailFrom,
+          bcc: Rails.configuration.Users.UserNotifierEmailBcc
 
   def account_is_setup(user)
     @user = user
diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index 1b3c96a8a..ec7eca97a 100644
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -96,6 +96,7 @@ arvcfg.declare_config "Users.UserProfileNotificationAddress", String, :user_prof
 arvcfg.declare_config "Users.AdminNotifierEmailFrom", String, :admin_notifier_email_from
 arvcfg.declare_config "Users.EmailSubjectPrefix", String, :email_subject_prefix
 arvcfg.declare_config "Users.UserNotifierEmailFrom", String, :user_notifier_email_from
+arvcfg.declare_config "Users.UserNotifierEmailBcc", String, :user_notifier_email_bcc
 arvcfg.declare_config "Users.NewUserNotificationRecipients", Hash, :new_user_notification_recipients, ->(cfg, k, v) { arrayToHash cfg, "Users.NewUserNotificationRecipients", v }
 arvcfg.declare_config "Users.NewInactiveUserNotificationRecipients", Hash, :new_inactive_user_notification_recipients, method(:arrayToHash)
 arvcfg.declare_config "Login.LoginCluster", String
diff --git a/services/api/test/unit/user_test.rb b/services/api/test/unit/user_test.rb
index f973c6ba1..ae1adb612 100644
--- a/services/api/test/unit/user_test.rb
+++ b/services/api/test/unit/user_test.rb
@@ -652,6 +652,7 @@ class UserTest < ActiveSupport::TestCase
     if not new_user_recipients.empty? then
       assert_not_nil new_user_email, 'Expected new user email after setup'
       assert_equal Rails.configuration.Users.UserNotifierEmailFrom, new_user_email.from[0]
+      assert_equal Rails.configuration.Users.UserNotifierEmailBcc, new_user_email.bcc[0]
       assert_equal new_user_recipients.stringify_keys.keys.first, new_user_email.to[0]
       assert_equal new_user_email_subject, new_user_email.subject
     else

-----------------------------------------------------------------------


hooks/post-receive
--