Merge branch 'master' into registry-790

# Conflicts:
#	test/integration/epp/domain/domain_delete_test.rb
#	test/integration/epp/domain/domain_update_test.rb
#	test/integration/epp/domain/transfer/request_test.rb
#	test/system/admin_area/domains_test.rb
This commit is contained in:
Artur Beljajev 2018-08-09 15:01:23 +03:00
commit 1d79f6548d
61 changed files with 731 additions and 84 deletions

View file

@ -96,6 +96,8 @@ arireg_host: 'http://demo-ariregxml.rik.ee:81/'
sk_digi_doc_service_endpoint: 'https://tsp.demo.sk.ee'
sk_digi_doc_service_name: 'Testimine'
# Registrant API
registrant_api_auth_allowed_ips: '127.0.0.1, 0.0.0.0' #ips, separated with commas
#
# MISC

View file

@ -36,7 +36,7 @@ module DomainNameRegistry
config.i18n.default_locale = :en
config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb')
config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')]
# config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')]
# Autoload all model subdirs
config.autoload_paths += Dir[Rails.root.join('app', 'models', '**/')]

View file

@ -18,6 +18,16 @@ Rails.application.routes.draw do
mount Repp::API => '/'
namespace :api do
namespace :v1 do
namespace :registrant do
post 'auth/eid', to: 'auth#eid'
resources :domains, only: [:index, :show], param: :uuid
end
end
end
# REGISTRAR ROUTES
namespace :registrar do
resource :dashboard