Merge branch 'master' into registry-790

app/models/ability.rb

@@ -31,8 +31,6 @@ class Ability
   end
 
   def epp # Registrar/api_user dynamic role
-    can :view, :registrar_dashboard
-
     if @user.registrar.api_ip_white?(@ip)
       can :manage, :poll
       can :manage, Depp::Contact
@@ -71,7 +69,6 @@ class Ability
   end
 
   def billing # Registrar/api_user dynamic role
-    can :view, :registrar_dashboard
     can(:manage, Invoice) { |i| i.buyer_id == @user.registrar_id }
     can :manage, :deposit
     can :read, AccountActivity

app/models/admin_user.rb

@@ -9,7 +9,8 @@ class AdminUser < User
 
   ROLES = %w(user customer_service admin) # should not match to api_users roles
 
-  devise :database_authenticatable, :rememberable, :trackable, :validatable, :lockable
+  devise :database_authenticatable, :trackable, :validatable, :timeoutable,
+         authentication_keys: [:username]
 
   def self.min_password_length
     Devise.password_length.min

app/models/api_user.rb

@@ -2,11 +2,12 @@ require 'open3'
 
 class ApiUser < User
   include EppErrors
+  devise :database_authenticatable, :trackable, :timeoutable, authentication_keys: [:username]
 
   def epp_code_map
     {
       '2306' => [ # Parameter policy error
-        [:password, :blank]
+        %i[plain_text_password blank]
       ]
     }
   end
@@ -19,8 +20,8 @@ class ApiUser < User
   belongs_to :registrar
   has_many :certificates
 
-  validates :username, :password, :registrar, :roles, presence: true
-  validates :password, length: { minimum: min_password_length }
+  validates :username, :plain_text_password, :registrar, :roles, presence: true
+  validates :plain_text_password, length: { minimum: min_password_length }
   validates :username, uniqueness: true
 
   delegate :code, :name, to: :registrar, prefix: true
@@ -30,6 +31,7 @@ class ApiUser < User
 
   SUPER = 'super'
   EPP = 'epp'
+  BILLING = 'billing'
 
   ROLES = %w(super epp billing) # should not match to admin roles
 

app/models/registrant_user.rb

@@ -2,6 +2,8 @@ class RegistrantUser < User
   ACCEPTED_ISSUER = 'AS Sertifitseerimiskeskus'
   attr_accessor :idc_data
 
+  devise :database_authenticatable, :trackable, :timeoutable
+
   def ability
     @ability ||= Ability.new(self)
   end

app/models/user.rb

@@ -1,6 +1,5 @@
 class User < ActiveRecord::Base
   include Versions # version/user_version.rb
-  devise :trackable, :timeoutable
 
   attr_accessor :phone