zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 21:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'registry-918' into registry-922

Browse source
This commit is contained in:
Maciej Szlosarczyk 2018-08-07 14:54:16 +03:00
commit e3807f694d
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/v1/registrant/auth_controller.rb
View file

@ -21,7 +21,7 @@ module Api
if token if token
render json: token render json: token
else else
render json: { error: 'Cannot create generate session token' } render json: { errors: [{ base: ['Cannot create generate session token'] }] }
end end
end end
@ -46,7 +46,7 @@ module Api
allowed_ips = ENV['registrant_api_auth_allowed_ips'].to_s.split(',').map(&:strip) allowed_ips = ENV['registrant_api_auth_allowed_ips'].to_s.split(',').map(&:strip)
return if allowed_ips.include?(request.ip) || Rails.env.development? return if allowed_ips.include?(request.ip) || Rails.env.development?
render json: { errors: ['Not authorized'] }, status: :unauthorized render json: { errors: [{ base: ['Not authorized'] }] }, status: :unauthorized
end end
end end
end end

2
app/controllers/api/v1/registrant/base_controller.rb
View file

@ -29,7 +29,7 @@ module Api
if decryptor.valid? if decryptor.valid?
sign_in decryptor.user sign_in decryptor.user
else else
render json: { errors: ['Not authorized'] }, status: :unauthorized render json: { errors: [{base: ['Not authorized']}] }, status: :unauthorized
end end
end end
end end

2
test/integration/api/registrant/registrant_api_authentication_test.rb
View file

@ -42,7 +42,7 @@ class RegistrantApiAuthenticationTest < ActionDispatch::IntegrationTest
assert_equal(401, response.status) assert_equal(401, response.status)
json_body = JSON.parse(response.body, symbolize_names: true) json_body = JSON.parse(response.body, symbolize_names: true)
assert_equal({ errors: ['Not authorized'] }, json_body) assert_equal({ errors: [base: ['Not authorized']] }, json_body)
ENV['registrant_api_auth_allowed_ips'] = @original_whitelist_ip ENV['registrant_api_auth_allowed_ips'] = @original_whitelist_ip
end end

2
test/integration/api/registrant/registrant_api_domains_test.rb
View file

@ -81,7 +81,7 @@ class RegistrantApiDomainsTest < ActionDispatch::IntegrationTest
assert_equal(401, response.status) assert_equal(401, response.status)
json_body = JSON.parse(response.body, symbolize_names: true) json_body = JSON.parse(response.body, symbolize_names: true)
assert_equal({ errors: ['Not authorized'] }, json_body) assert_equal({ errors: [base: ['Not authorized']] }, json_body)
end end
def test_details_returns_401_without_authorization def test_details_returns_401_without_authorization