kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2022-10-22 03:09:18 +00:00
parent 51d09c5698
commit 6c84e07376
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/api/invitations.rb
View File

@ -21,8 +21,8 @@ module API
end
params do
requires :access_level, type: Integer, values: Gitlab::Access.all_values, desc: 'A valid access level (defaults: `30`, developer access level)'
optional :email, types: [String, Array[String]], email_or_email_list: true, desc: 'The email address to invite, or multiple emails separated by comma'
optional :user_id, types: [Integer, String], desc: 'The user ID of the new member or multiple IDs separated by commas.'
optional :email, type: Array[String], email_or_email_list: true, coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, desc: 'The email address to invite, or multiple emails separated by comma'
optional :user_id, type: Array[String], coerce_with: ::API::Validations::Types::CommaSeparatedToArray.coerce, desc: 'The user ID of the new member or multiple IDs separated by commas.'
optional :expires_at, type: DateTime, desc: 'Date string in the format YEAR-MONTH-DAY'
optional :invite_source, type: String, desc: 'Source that triggered the member creation process', default: 'invitations-api'
optional :tasks_to_be_done, type: Array[String], coerce_with: Validations::Types::CommaSeparatedToArray.coerce, desc: 'Tasks the inviter wants the member to do'

7
lib/api/validations/validators/email_or_email_list.rb
View File

@ -9,7 +9,12 @@ module API
return unless value
return if value.split(',').map { |v| ValidateEmail.valid?(v) }.all?
case value
when String
return if value.split(',').map { |v| ValidateEmail.valid?(v) }.all?
when Array
return if value.map { |v| ValidateEmail.valid?(v) }.all?
end
raise Grape::Exceptions::Validation.new(
params: [@scope.full_name(attr_name)],

2
spec/lib/api/validations/validators/email_or_email_list_spec.rb
View File

@ -14,6 +14,7 @@ RSpec.describe API::Validations::Validators::EmailOrEmailList do
expect_no_validation_error('test' => 'test@example.org')
expect_no_validation_error('test' => 'test1@example.com,test2@example.org')
expect_no_validation_error('test' => 'test1@example.com,test2@example.org,test3@example.co.uk')
expect_no_validation_error('test' => %w[test1@example.com test2@example.org test3@example.co.uk])
end
end
@ -23,6 +24,7 @@ RSpec.describe API::Validations::Validators::EmailOrEmailList do
expect_validation_error('test' => '@example.com')
expect_validation_error('test' => 'test1@example.com,asdf')
expect_validation_error('test' => 'asdf,testa1@example.com,asdf')
expect_validation_error('test' => %w[asdf testa1@example.com asdf])
end
end
end

8
spec/requests/api/invitations_spec.rb
View File

@ -347,6 +347,14 @@ RSpec.describe API::Invitations do
end
it 'returns 400 when the email list is not a valid format' do
post invitations_url(source, maintainer),
params: { email: %w[email1@example.com not-an-email], access_level: Member::MAINTAINER }
expect(response).to have_gitlab_http_status(:bad_request)
expect(json_response['error']).to eq('email contains an invalid email address')
end
it 'returns 400 when the comma-separated email list is not a valid format' do
post invitations_url(source, maintainer),
params: { email: 'email1@example.com,not-an-email', access_level: Member::MAINTAINER }