jro_apps/redmine Commit - r11292:b25d496c2467

Mail handler: adds --default-group option to add created user to one or more groups (#13340)....

Jean-Philippe Lang -

r11292:b25d496c2467

parent child

Context file:

r11292:b25d496c2467

Collapse all files

app/models/group.rb +1 0

               before_destroy :remove_references_before_destroy
               scope :sorted, lambda { order("#{table_name}.lastname ASC") }
+              scope :named, lambda {|arg| where("LOWER(#{table_name}.lastname) = LOWER(?)", arg.to_s.strip)}
               safe_attributes 'name',
                 'user_ids',

app/models/mail_handler.rb +14 0

                       if logger && logger.info
                         logger.info "MailHandler: [#{@user.login}] account created"
                       end
+                      add_user_to_group(@@handler_options[:default_group])
                       Mailer.account_information(@user, @user.password).deliver
                     else
                       if logger && logger.error
                 end
               end
+            	# Adds the newly created user to default group
+              def add_user_to_group(default_group)
+                if default_group.present?
+                  default_group.split(',').each do |group_name|
+                    if group = Group.named(group_name).first
+                      group.users << @user
+                    elsif logger
+                      logger.warn "MailHandler: could not add user to [#{group_name}], group not found"
+                    end
+                  end
+                end
+              end
               # Removes the email body of text after the truncation configurations.
               def cleanup_body(body)
                 delimiters = Setting.mail_handler_body_delimiters.to_s.split(/[\r\n]+/).reject(&:blank?).map {|s| Regexp.escape(s)}

extra/mail_handler/rdm-mailhandler.rb +12 -7

             end
             class RedmineMailHandler
-              VERSION = '0.2.1'
+              VERSION = '0.2.2'
-              attr_accessor :verbose, :issue_attributes, :allow_override, :unknown_user, :no_permission_check, :url, :key, :no_check_certificate
+              attr_accessor :verbose, :issue_attributes, :allow_override, :unknown_user, :default_group, :no_permission_check, :url, :key, :no_check_certificate
               def initialize
                 self.issue_attributes = {}
                   opts.on("-k", "--key KEY",              "Redmine API key") {|v| self.key = v}
                   opts.separator("")
                   opts.separator("General options:")
-                  opts.on("--unknown-user ACTION",        "how to handle emails from an unknown user",
-                                                          "ACTION can be one of the following values:",
-                                                          "* ignore: email is ignored (default)",
-                                                          "* accept: accept as anonymous user",
-                                                          "* create: create a user account") {|v| self.unknown_user = v}
                   opts.on("--no-permission-check",        "disable permission checking when receiving",
                                                           "the email") {self.no_permission_check = '1'}
                   opts.on("--key-file FILE",              "path to a file that contains the Redmine",
                   opts.on("-v", "--verbose",              "show extra information") {self.verbose = true}
                   opts.on("-V", "--version",              "show version information and exit") {puts VERSION; exit}
                   opts.separator("")
+                  opts.separator("User creation options:")
+                  opts.on("--unknown-user ACTION",        "how to handle emails from an unknown user",
+                                                          "ACTION can be one of the following values:",
+                                                          "* ignore: email is ignored (default)",
+                                                          "* accept: accept as anonymous user",
+                                                          "* create: create a user account") {|v| self.unknown_user = v}
+                  opts.on("--default-group GROUP",        "add created user to GROUP (none by default)",
+                                                          "GROUP can be a comma separated list of groups") { |v| self.default_group = v}
+                  opts.separator("")
                   opts.separator("Issue attributes control options:")
                   opts.on("-p", "--project PROJECT",      "identifier of the target project") {|v| self.issue_attributes['project'] = v}
                   opts.on("-s", "--status STATUS",        "name of the target status") {|v| self.issue_attributes['status'] = v}
                 data = { 'key' => key, 'email' => email,
                                        'allow_override' => allow_override,
                                        'unknown_user' => unknown_user,
+                                       'default_group' => default_group,
                                        'no_permission_check' => no_permission_check}
                 issue_attributes.each { |attr, value| data["issue[#{attr}]"] = value }

test/unit/mail_handler_test.rb +16 0

@@ -304,6 +304,22 class MailHandlerTest < ActiveSupport::TestCase
304	end	304	end
305	end	305	end
306		306
		307	def test_created_user_should_be_added_to_groups
		308	group1 = Group.generate!
		309	group2 = Group.generate!
		310
		311	assert_difference 'User.count' do
		312	submit_email(
		313	'ticket_by_unknown_user.eml',
		314	:issue => {:project => 'ecookbook'},
		315	:unknown_user => 'create',
		316	:default_group => "#{group1.name},#{group2.name}"
		317	)
		318	end
		319	user = User.order('id DESC').first
		320	assert_same_elements [group1, group2], user.groups
		321	end
		322
307	def test_add_issue_without_from_header	323	def test_add_issue_without_from_header
308	Role.anonymous.add_permission!(:add_issues)	324	Role.anonymous.add_permission!(:add_issues)
309	assert_equal false, submit_email('ticket_without_from_header.eml')	325	assert_equal false, submit_email('ticket_without_from_header.eml')

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages