mirror of
https://github.com/internetee/registry.git
synced 2025-07-24 11:38:30 +02:00
Use inflector rule to acronym Api to API
This commit is contained in:
parent
42004f933f
commit
06f5eb10d4
25 changed files with 44 additions and 43 deletions
|
@ -4,7 +4,7 @@ module Repp
|
|||
prefix :repp
|
||||
|
||||
http_basic do |username, password|
|
||||
@current_user ||= ApiUser.find_by(username: username, password: password)
|
||||
@current_user ||= APIUser.find_by(username: username, password: password)
|
||||
if @current_user
|
||||
true
|
||||
else
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
module Admin
|
||||
class ApiUsersController < BaseController
|
||||
class APIUsersController < BaseController
|
||||
load_and_authorize_resource
|
||||
before_action :set_api_user, only: [:show, :edit, :update, :destroy]
|
||||
|
||||
def index
|
||||
@q = ApiUser.includes(:registrar).search(params[:q])
|
||||
@q = APIUser.includes(:registrar).search(params[:q])
|
||||
@api_users = @q.result.page(params[:page])
|
||||
end
|
||||
|
||||
def new
|
||||
@registrar = Registrar.find_by(id: params[:registrar_id])
|
||||
@api_user = ApiUser.new(registrar: @registrar)
|
||||
@api_user = APIUser.new(registrar: @registrar)
|
||||
end
|
||||
|
||||
def create
|
||||
@api_user = ApiUser.new(api_user_params)
|
||||
@api_user = APIUser.new(api_user_params)
|
||||
|
||||
if @api_user.save
|
||||
flash[:notice] = I18n.t('record_created')
|
||||
|
@ -55,7 +55,7 @@ module Admin
|
|||
private
|
||||
|
||||
def set_api_user
|
||||
@api_user = ApiUser.find(params[:id])
|
||||
@api_user = APIUser.find(params[:id])
|
||||
end
|
||||
|
||||
def api_user_params
|
||||
|
|
|
@ -7,12 +7,12 @@ module Admin
|
|||
end
|
||||
|
||||
def new
|
||||
@api_user = ApiUser.find(params[:api_user_id])
|
||||
@api_user = APIUser.find(params[:api_user_id])
|
||||
@certificate = Certificate.new(api_user: @api_user)
|
||||
end
|
||||
|
||||
def create
|
||||
@api_user = ApiUser.find(params[:api_user_id])
|
||||
@api_user = APIUser.find(params[:api_user_id])
|
||||
|
||||
crt = certificate_params[:crt].open.read if certificate_params[:crt]
|
||||
csr = certificate_params[:csr].open.read if certificate_params[:csr]
|
||||
|
@ -73,7 +73,7 @@ module Admin
|
|||
end
|
||||
|
||||
def set_api_user
|
||||
@api_user = ApiUser.find(params[:api_user_id])
|
||||
@api_user = APIUser.find(params[:api_user_id])
|
||||
end
|
||||
|
||||
def certificate_params
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'rails5_api_controller_backport'
|
||||
require 'auth_token/auth_token_creator'
|
||||
|
||||
module Api
|
||||
module API
|
||||
module V1
|
||||
module Registrant
|
||||
class AuthController < ActionController::API
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'rails5_api_controller_backport'
|
||||
require 'auth_token/auth_token_decryptor'
|
||||
|
||||
module Api
|
||||
module API
|
||||
module V1
|
||||
module Registrant
|
||||
class BaseController < ActionController::API
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require 'rails5_api_controller_backport'
|
||||
require 'auth_token/auth_token_decryptor'
|
||||
|
||||
module Api
|
||||
module API
|
||||
module V1
|
||||
module Registrant
|
||||
class DomainsController < BaseController
|
||||
|
|
|
@ -7,7 +7,7 @@ class Epp::SessionsController < EppController
|
|||
|
||||
def login
|
||||
success = true
|
||||
@api_user = ApiUser.find_by(login_params)
|
||||
@api_user = APIUser.find_by(login_params)
|
||||
|
||||
webclient_request = ENV['webclient_ips'].split(',').map(&:strip).include?(request.ip)
|
||||
if webclient_request && !Rails.env.test? && !Rails.env.development?
|
||||
|
|
|
@ -95,6 +95,6 @@ class Registrant::SessionsController < Devise::SessionsController
|
|||
|
||||
def find_user_by_idc(idc)
|
||||
return User.new unless idc
|
||||
ApiUser.find_by(identity_code: idc) || User.new
|
||||
APIUser.find_by(identity_code: idc) || User.new
|
||||
end
|
||||
end
|
||||
|
|
|
@ -12,7 +12,7 @@ class Registrar
|
|||
private
|
||||
|
||||
def new_user
|
||||
@new_user ||= ApiUser.find(params[:new_user_id])
|
||||
@new_user ||= APIUser.find(params[:new_user_id])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -26,7 +26,7 @@ class Registrar
|
|||
@depp_user.errors.add(:base, :webserver_client_cert_directive_should_be_required)
|
||||
end
|
||||
|
||||
@api_user = ApiUser.find_by(username: params[:depp_user][:tag], password: params[:depp_user][:password])
|
||||
@api_user = APIUser.find_by(username: params[:depp_user][:tag], password: params[:depp_user][:password])
|
||||
|
||||
unless @api_user
|
||||
@depp_user.errors.add(:base, t(:no_such_user))
|
||||
|
@ -53,7 +53,7 @@ class Registrar
|
|||
end
|
||||
|
||||
def id
|
||||
@user = ApiUser.find_by_idc_data_and_allowed(request.env['SSL_CLIENT_S_DN'], request.ip)
|
||||
@user = APIUser.find_by_idc_data_and_allowed(request.env['SSL_CLIENT_S_DN'], request.ip)
|
||||
|
||||
if @user
|
||||
sign_in(@user, event: :authentication)
|
||||
|
@ -150,12 +150,12 @@ class Registrar
|
|||
|
||||
def find_user_by_idc(idc)
|
||||
return User.new unless idc
|
||||
ApiUser.find_by(identity_code: idc) || User.new
|
||||
APIUser.find_by(identity_code: idc) || User.new
|
||||
end
|
||||
|
||||
def find_user_by_idc_and_allowed(idc)
|
||||
return User.new unless idc
|
||||
possible_users = ApiUser.where(identity_code: idc) || User.new
|
||||
possible_users = APIUser.where(identity_code: idc) || User.new
|
||||
possible_users.each do |selected_user|
|
||||
if selected_user.registrar.white_ips.registrar_area.include_ip?(request.ip)
|
||||
return selected_user
|
||||
|
|
|
@ -10,7 +10,7 @@ class Ability
|
|||
case @user.class.to_s
|
||||
when 'AdminUser'
|
||||
@user.roles&.each { |role| send(role) }
|
||||
when 'ApiUser'
|
||||
when 'APIUser'
|
||||
@user.roles&.each { |role| send(role) }
|
||||
when 'RegistrantUser'
|
||||
static_registrant
|
||||
|
@ -94,7 +94,7 @@ class Ability
|
|||
can :manage, ContactVersion
|
||||
can :manage, Billing::Price
|
||||
can :manage, User
|
||||
can :manage, ApiUser
|
||||
can :manage, APIUser
|
||||
can :manage, AdminUser
|
||||
can :manage, Certificate
|
||||
can :manage, Keyrelay
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require 'open3'
|
||||
|
||||
class ApiUser < User
|
||||
class APIUser < User
|
||||
include EppErrors
|
||||
|
||||
def epp_code_map
|
||||
|
|
|
@ -34,7 +34,7 @@ module Versions
|
|||
end
|
||||
|
||||
def user_from_id_role_username(str)
|
||||
user = ApiUser.find_by(id: $1) if str =~ /^(\d+)-(ApiUser:|api-)/
|
||||
user = APIUser.find_by(id: $1) if str =~ /^(\d+)-(APIUser:|api-)/
|
||||
unless user.present?
|
||||
user = AdminUser.find_by(id: $1) if str =~ /^(\d+)-AdminUser:/
|
||||
unless user.present?
|
||||
|
|
|
@ -490,7 +490,7 @@ class Epp::Domain < Domain
|
|||
|
||||
def apply_pending_update!
|
||||
preclean_pendings
|
||||
user = ApiUser.find(pending_json['current_user_id'])
|
||||
user = APIUser.find(pending_json['current_user_id'])
|
||||
frame = Nokogiri::XML(pending_json['frame'])
|
||||
|
||||
self.statuses.delete(DomainStatus::PENDING_UPDATE)
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
= f.label :role, nil, class: 'required'
|
||||
.col-md-7
|
||||
= select_tag 'api_user[roles][]',
|
||||
options_for_select(ApiUser::ROLES.map {|x| [x, x] }, @api_user.roles.try(:first)),
|
||||
options_for_select(APIUser::ROLES.map {|x| [x, x] }, @api_user.roles.try(:first)),
|
||||
class: 'form-control selectize'
|
||||
.checkbox
|
||||
%label{for: 'api_user_active'}
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
<table class="table table-hover table-bordered table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="col-xs-6"><%= ApiUser.human_attribute_name :username %></th>
|
||||
<th class="col-xs-6"><%= ApiUser.human_attribute_name :active %></th>
|
||||
<th class="col-xs-6"><%= APIUser.human_attribute_name :username %></th>
|
||||
<th class="col-xs-6"><%= APIUser.human_attribute_name :active %></th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue