kaui 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4208468a561fd0c2e15a06de685932b20eb28933
-  data.tar.gz: 32231b5c4acd5c8ed70e425c185e28cd2efd658d
+  metadata.gz: 03876ed3f2f539ca41f5d6ae33378309a842c6ba
+  data.tar.gz: 94fc7dd36b710fdaf45c27668b5791d64524914c
 SHA512:
-  metadata.gz: 3be5d4c9eb3f8c88cd3938403be9d22f36e61655e398a034dfd02b744a4ad309c6361858f70c5552cb781d3d5eede2cb333ad3f318d1ce1e553e0ceb806017c8
-  data.tar.gz: 50a33a56415bbde528bf403040b76695d0abe9c7e375920f658c60078015e173b8b6fa6f06a673012b2bf7f2438a0e44e1cc5b7d1e2bf1dad2c21480c91f9402
+  metadata.gz: 8117303c14d31d75080506897654684d52fb44b1d85e4153b626df24b9b89d16ce8cb787329d68c7cff89e65f2e7bb731e785b23e7cfe82707286a45e832a464
+  data.tar.gz: 4b895ba401fb46e454206d26381dbfbcf648520af5e5bcdbdabce0da6cbfbb30386823c557f06edf0eb88e278899ce195cb92af0f060206c82cd55e889afc240

data/Gemfile

@@ -2,5 +2,5 @@ source 'http://rubygems.org'
 
 gemspec
 
-#gem 'killbill-client', :path => '../killbill-client-ruby'
+gem 'killbill-client', :path => '../killbill-client-ruby'
 #gem 'killbill-client', :git => 'https://github.com/killbill/killbill-client-ruby.git'

data/README.md

@@ -100,6 +100,10 @@ Alternatively, you can run the `kaui` script under `bin` by setting your loadpat
 
     ruby -Ilib bin/kaui /path/to/rails/app --path=$PWD --skip-bundle
     
+Releases
+========
+
+The releases are done using Jruby and require the following property `export JRUBY_OPTS='--2.0 -J-Xmx1024m'`
 
 Multi-Tenancy
 =============

data/app/assets/stylesheets/kaui/datatable.less

@@ -87,3 +87,7 @@ table.dataTable.table-condensed thead > tr > th {
         border-right: 0;
     }
 }
+
+.dataTables_paginate.paging_full_numbers {
+    padding-top: 30px;
+}

data/app/controllers/kaui/accounts_controller.rb

@@ -3,6 +3,16 @@ class Kaui::AccountsController < Kaui::EngineController
   def index
     @search_query = params[:q]
 
+    if params[:fast] == '1' && !@search_query.blank?
+      account = Kaui::Account.list_or_search(@search_query, -1, 1, options_for_klient).first
+      if account.nil?
+        flash[:error] = "No account matches \"#{@search_query}\""
+        redirect_to kaui_engine.home_path and return
+      else
+        redirect_to kaui_engine.account_path(account.account_id) and return
+      end
+    end
+
     @limit = 50
     if @search_query.blank?
       max_nb_records = Kaui::Account.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records
@@ -120,7 +130,7 @@ class Kaui::AccountsController < Kaui::EngineController
     @account.is_migrated = @account.is_migrated == '1'
     @account.is_notified_for_invoices = @account.is_notified_for_invoices == '1'
 
-    @account.update(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    @account.update(true, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
 
     redirect_to account_path(@account.account_id), :notice => 'Account successfully updated'
   rescue => e

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -8,18 +8,22 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
 
   def new
     @allowed_user = Kaui::AllowedUser.new
+    @roles = []
   end
 
   def create
-    new_user = Kaui::AllowedUser.new(allowed_user_params)
+    @allowed_user = Kaui::AllowedUser.new(allowed_user_params)
 
-    existing_user = Kaui::AllowedUser.find_by_kb_username(new_user.kb_username)
+    existing_user = Kaui::AllowedUser.find_by_kb_username(@allowed_user.kb_username)
     if existing_user
-      flash[:error] = "User with name #{new_user.kb_username} already exists!"
-      redirect_to admin_allowed_users_path
+      flash[:error] = "User with name #{@allowed_user.kb_username} already exists!"
+      render :new and return
     else
-      new_user.save!
-      redirect_to admin_allowed_user_path(new_user.id), :notice => 'User was successfully configured'
+      roles = params[:roles].split(',')
+
+      # Create locally and in KB
+      @allowed_user.create_in_kb!(params.require(:password), roles, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      redirect_to kaui_engine.admin_allowed_user_path(@allowed_user.id), :notice => 'User was successfully configured'
     end
   end
 
@@ -27,10 +31,46 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
     @allowed_user = Kaui::AllowedUser.find(params.require(:id))
     raise ActiveRecord::RecordNotFound.new("Could not find user #{@allowed_user.id}") unless (current_user.root? || @allowed_user.kb_username == current_user.kb_username)
 
+    @roles = Kaui::UserRole.find_roles_by_username(@allowed_user.kb_username, options_for_klient).map(&:presence).compact || []
+
     tenants_for_current_user = retrieve_tenants_for_current_user
     @tenants = Kaui::Tenant.all.select { |tenant| tenants_for_current_user.include?(tenant.kb_tenant_id) }
   end
 
+  def edit
+    @allowed_user = Kaui::AllowedUser.find(params.require(:id))
+
+    @roles = Kaui::UserRole.find_roles_by_username(@allowed_user.kb_username, options_for_klient).map(&:presence).compact || []
+  end
+
+  def update
+    @allowed_user = Kaui::AllowedUser.find(params.require(:id))
+
+    @allowed_user.description = params[:allowed_user][:description].presence
+
+    @allowed_user.update_in_kb!(params[:password].presence,
+                                params[:roles].presence.split(','),
+                                current_user.kb_username,
+                                params[:reason],
+                                params[:comment],
+                                options_for_klient)
+
+    redirect_to kaui_engine.admin_allowed_user_path(@allowed_user.id), :notice => 'User was successfully updated'
+  end
+
+  def destroy
+    allowed_user = Kaui::AllowedUser.find(params.require(:id))
+
+    if allowed_user
+      # Delete locally and in KB
+      allowed_user.destroy_in_kb!(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      redirect_to kaui_engine.admin_allowed_users_path, :notice => 'User was successfully deleted'
+    else
+      flash[:error] = "User #{params.require(:id)} not found"
+      redirect_to kaui_engine.admin_allowed_users_path
+    end
+  end
+
   def add_tenant
     allowed_user = Kaui::AllowedUser.find(params.require(:allowed_user).require(:id))
 

data/app/controllers/kaui/home_controller.rb

@@ -13,7 +13,7 @@ class Kaui::HomeController < Kaui::EngineController
     elsif search_type == 'transaction'
       redirect_to transaction_path(:id => search_query)
     else
-      redirect_to accounts_path(:q => search_query)
+      redirect_to accounts_path(:q => search_query, :fast => params[:fast])
     end
   end
 

data/app/controllers/kaui/payments_controller.rb

@@ -26,7 +26,6 @@ class Kaui::PaymentsController < Kaui::EngineController
                           '_' + search_key
                         end
         payments = Kaui::Payment.list_or_search(payment_state, offset, limit, options_for_klient)
-        payments.reject! { |payment| payment.transactions[-1].status != search_key }
       else
         account = Kaui::Account::find_by_id_or_key(search_key, false, false, options_for_klient) rescue nil
         if account.nil?
@@ -55,7 +54,8 @@ class Kaui::PaymentsController < Kaui::EngineController
           payment.payment_number.to_i,
           payment.payment_date,
           payment.paid_amount_to_money,
-          payment.returned_amount_to_money
+          payment.returned_amount_to_money,
+          payment.transactions.empty? ? nil : payment.transactions[-1].status
       ][column]
     end
 
@@ -64,7 +64,8 @@ class Kaui::PaymentsController < Kaui::EngineController
           view_context.link_to(payment.payment_number, view_context.url_for(:controller => :payments, :action => :show, :account_id => payment.account_id, :id => payment.payment_id)),
           view_context.format_date(payment.payment_date),
           view_context.humanized_money_with_symbol(payment.paid_amount_to_money),
-          view_context.humanized_money_with_symbol(payment.returned_amount_to_money)
+          view_context.humanized_money_with_symbol(payment.returned_amount_to_money),
+          payment.transactions.empty? ? nil : view_context.colored_transaction_status(payment.transactions[-1].status)
       ]
     end
 

data/app/controllers/kaui/role_definitions_controller.rb

@@ -0,0 +1,20 @@
+class Kaui::RoleDefinitionsController < Kaui::EngineController
+
+  def new
+    @role_definition = Kaui::RoleDefinition.new
+  end
+
+  def create
+    # Sanity is done on the server side
+    @role_definition = Kaui::RoleDefinition.new(params.require(:role_definition))
+    @role_definition.permissions = @role_definition.permissions.split(',')
+
+    begin
+      @role_definition = @role_definition.create(current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+      redirect_to admin_allowed_users_path, :notice => 'Role was successfully created'
+    rescue => e
+      flash.now[:error] = "Error while creating role: #{as_string(e)}"
+      render :action => :new
+    end
+  end
+end

data/app/helpers/kaui/payment_helper.rb

@@ -5,5 +5,16 @@ module Kaui
       Kaui::Payment::TRANSACTION_STATUSES
     end
 
+    def colored_transaction_status(transaction_status)
+      data = "<span class='alert-"
+      if transaction_status != 'SUCCESS'
+        data += "danger'>"
+      else
+        data += "success'>"
+      end
+      data += transaction_status
+      data += '</span>'
+      data.html_safe
+    end
   end
 end

data/app/models/kaui/allowed_user.rb

@@ -10,16 +10,57 @@ module Kaui
              :through => :kaui_allowed_user_tenants,
              :source => :kaui_tenant
 
+    # Create the user locally and in Kill Bill (if needed)
     def create_in_kb!(password, roles = [], user = nil, reason = nil, comment = nil, options = {})
       # Create in Kill Bill
       kb_user = KillBillClient::Model::UserRoles.new
       kb_user.username = kb_username
       kb_user.password = password
       kb_user.roles = roles
-      kb_user.create(user, reason, comment, options)
+
+      begin
+        kb_user.create(user, reason, comment, options)
+      rescue KillBillClient::API::BadRequest => e
+        error_code = JSON.parse(e.response.body)['code'] rescue nil
+        raise e unless error_code == 40002 # SECURITY_USER_ALREADY_EXISTS
+      end
 
       # Save locally
       save!
     end
+
+    # Update the user locally and in Kill Bill (if needed)
+    def update_in_kb!(password, roles, user = nil, reason = nil, comment = nil, options = {})
+      user_role = KillBillClient::Model::UserRoles.new
+      user_role.username = kb_username
+
+      # We have two different APIs to update password and roles
+      unless password.nil?
+        user_role.password = password
+        user_role.update(user, reason, comment, options)
+        user_role.password = nil
+      end
+      unless roles.nil?
+        user_role.roles = roles
+        user_role.update(user, reason, comment, options)
+      end
+
+      save!
+    end
+
+    # Delete the user locally and in Kill Bill (if needed)
+    def destroy_in_kb!(user = nil, reason = nil, comment = nil, options = {})
+      user_role = KillBillClient::Model::UserRoles.new
+      user_role.username = kb_username
+
+      begin
+        user_role.destroy(user, reason, comment, options)
+      rescue KillBillClient::API::BadRequest => e
+        # User already deactivated in Kill Bill
+      end
+
+      # Destroy locally
+      destroy!
+    end
   end
 end

data/app/models/kaui/role_definition.rb

@@ -0,0 +1,2 @@
+class Kaui::RoleDefinition < KillBillClient::Model::RoleDefinition
+end

data/app/models/kaui/user_role.rb

@@ -0,0 +1,8 @@
+class Kaui::UserRole < KillBillClient::Model::UserRoles
+
+  def self.find_roles_by_username(username, options = {})
+    user_role = Kaui::UserRole.new
+    user_role.username = username
+    user_role.list(options).roles
+  end
+end

data/app/views/kaui/account_timelines/show.html.erb

@@ -129,11 +129,7 @@
                           (<%= transaction.currency %>)
                         </li>
                         <li>
-                    <span
-                    <% if transaction.status != 'SUCCESS' %>class="alert-danger"
-                    <% else %>class="alert-success" <% end %>>
-                      <%= transaction.status %>
-                    </span>
+                          <%= colored_transaction_status(transaction.status) %>
                         </li>
                         <li><%= 'Payment #' %>&nbsp;<%= link_to payment.payment_number, account_payment_path(payment.account_id, payment.payment_id) %></li>
                         <% unless invoice.nil? %>

data/app/views/kaui/accounts/_form.html.erb

@@ -19,6 +19,8 @@
             <%= f.text_field :external_key, :class => 'form-control' %>
           </div>
         </div>
+    <% else %>
+        <%= f.hidden_field :external_key %>
     <% end %>
     <div class="form-group">
       <%= f.label :email, 'Email', :class => 'col-sm-3 control-label' %>
@@ -45,6 +47,10 @@
             <%= f.collection_select :time_zone, ActiveSupport::TimeZone.all, :formatted_offset, :to_s, {:selected => Time.zone.formatted_offset}, :class => 'form-control' %>
           </div>
         </div>
+    <% else %>
+        <%= f.hidden_field :bill_cycle_day_local %>
+        <%= f.hidden_field :currency %>
+        <%= f.hidden_field :time_zone %>
     <% end %>
     <div class="form-group">
         <%= f.label :locale, 'Locale', :class => 'col-sm-3 control-label' %>
@@ -116,6 +122,8 @@
             </div>
           </div>
         </div>
+    <% else %>
+        <%= f.hidden_field :is_migrated %>
     <% end %>
     <div class="form-group">
       <div class="col-sm-offset-3 col-sm-9">

data/app/views/kaui/admin_allowed_users/_form.html.erb

@@ -1,8 +1,15 @@
-<%= form_for @allowed_user, :url => admin_allowed_users_path, :html => {:class => 'form-horizontal'} do |f| %>
+<% # Unclear why this url/method hack is needed %>
+<%= form_for @allowed_user, :url => @allowed_user.persisted? ? admin_allowed_user_path(@allowed_user.id) : admin_allowed_users_path, :method => @allowed_user.persisted? ? :put : :post, :html => {:class => 'form-horizontal'} do |f| %>
     <div class="form-group">
       <%= f.label :kb_username, 'Name', :class => 'col-sm-2 control-label' %>
       <div class="col-sm-10">
-        <%= f.text_field :kb_username, :class => 'form-control', :required => true %>
+        <%= f.text_field :kb_username, :class => 'form-control', :required => true, :disabled => @allowed_user.persisted?, :readonly => @allowed_user.persisted? %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label_tag :password, 'Password', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.password_field_tag :password, '', :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
@@ -11,6 +18,14 @@
         <%= f.text_field :description, :class => 'form-control' %>
       </div>
     </div>
+    <div class="form-group">
+      <%= label_tag :roles, 'Roles', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_field_tag :roles, @roles.join(','), :class => 'form-control' %>
+        <p class="help-block">Comma separated, e.g. customer_support,finance.</p>
+        <p class="help-block">Create a new role <%= link_to 'here', new_role_definition_path %>.</p>
+      </div>
+    </div>
     <div class="form-group">
       <div class="col-sm-offset-2 col-sm-10">
         <%= f.submit 'Save', :class => 'btn btn-default' %>

data/app/views/kaui/admin_allowed_users/edit.html.erb

@@ -0,0 +1,10 @@
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Update user</h1>
+      <%= render 'form' %>
+    </div>
+
+  </div>
+</div>

data/app/views/kaui/admin_allowed_users/show.html.erb

@@ -1,10 +1,21 @@
 <div class="column-block">
 
-  <h1>User details</h1>
+  <h1>User details
+    <%= link_to 'Edit',
+                kaui_engine.edit_admin_allowed_user_path(@allowed_user.id),
+                :class => 'btn btn-xs' %>
+    &nbsp;
+    <%= link_to '<i class="fa fa-times"></i>'.html_safe,
+                kaui_engine.admin_allowed_user_path(@allowed_user.id),
+                :method => :delete,
+                data: {:confirm => 'Are you sure?'} -%>
+  </h1>
 
   <b>Name:</b> <%= @allowed_user.kb_username %>
   <br/>
   <b>Description:</b> <%= @allowed_user.description %>
+  <br/>
+  <b>Roles:</b> <%= @roles.join(',') %>
 
 </div>
 

data/app/views/kaui/admin_tenants/_useful_links.html.erb

@@ -9,7 +9,7 @@
       <li><%= link_to 'AUTO_INVOICING_OFF accounts', kaui_engine.tags_path(:q => 'AUTO_INVOICING_OFF') %></li>
       <li><%= link_to 'AUTO_PAY_OFF accounts', kaui_engine.tags_path(:q => 'AUTO_PAY_OFF') %></li>
       <li><%= link_to 'PENDING payments', kaui_engine.payments_path(:q => 'PENDING') %></li>
-      <li><%= link_to 'UNKNOWN payments', kaui_engine.payments_path(:q => 'UNKNOWN') %></li>
+      <li><%= link_to 'UNKNOWN and PLUGIN_FAILURE payments', kaui_engine.payments_path(:q => 'UNKNOWN') %></li>
       <li><%= link_to 'Queues', kaui_engine.queues_path %></li>
     </ul>
 

data/app/views/kaui/home/index.html.erb

@@ -5,6 +5,11 @@
       <%= form_tag search_path, :id => 'home_searchform', :method => 'get' do %>
           <%= text_field_tag :q, @search_query, :id => 'search', :placeholder => 'What are you looking for?' %>
           <%= submit_tag 'Search' %>
+          <div class="checkbox">
+            <%= label_tag :fast do %>
+                <%= check_box_tag :fast %>Fast search (find first exact match)
+            <% end %>
+          </div>
       <% end %>
 
     </div>

data/app/views/kaui/invoices/index.html.erb

@@ -27,7 +27,7 @@
 <%= javascript_tag do %>
 $(document).ready(function() {
   $('#invoices-table').dataTable({
-    <% if @search_query.blank? %>
+    <% if @account.account_id.blank? %>
         "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
         "pagingType": "full_numbers",
         "pageLength": <%= @limit %>,

data/app/views/kaui/payments/_payment_table.html.erb

@@ -96,7 +96,7 @@
             <td>
               <ul style="list-style: none; padding-left: 0">
                 <li>
-                  <span <% if transaction.status != 'SUCCESS' %>class='alert-danger'<% else %>class='alert-success' <% end %>><%= transaction.status %></span>
+                  <%= colored_transaction_status(transaction.status) %>
                   <% if current_user.root? %>
                       <%= link_to '&nbsp;<i class="fa fa-eraser"></i>'.html_safe, kaui_engine.new_account_transaction_path(payment.account_id,
                                                                                                                            :payment_id => payment.payment_id,

data/app/views/kaui/payments/index.html.erb

@@ -11,6 +11,7 @@
         <th>Date</th>
         <th>Amount</th>
         <th>Refund amount</th>
+        <th>Last transaction status</th>
       </tr>
       </thead>
       <tbody>
@@ -27,7 +28,7 @@
 <%= javascript_tag do %>
 $(document).ready(function() {
   $('#payments-table').dataTable({
-    <% if @search_query.blank? %>
+    <% if @account.account_id.blank? %>
         "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
         "pagingType": "full_numbers",
         "pageLength": <%= @limit %>,

data/app/views/kaui/role_definitions/_form.html.erb

@@ -0,0 +1,20 @@
+<%= form_for @role_definition, :html => {:class => 'form-horizontal'} do |f| %>
+    <div class="form-group">
+      <%= f.label :role, 'Role name', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= f.text_field :role, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label :permissions, 'Permissions', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= f.text_field :permissions, :class => 'form-control' %>
+        <p class="help-block">Comma separated, e.g. account:create,entitlement:change_plan,invoice:credit</p>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-3 col-sm-9">
+        <%= submit_tag 'Save', :class => 'btn btn-default' %>
+      </div>
+    </div>
+<% end %>

data/app/views/kaui/role_definitions/new.html.erb

@@ -0,0 +1,10 @@
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Add new role definition</h1>
+      <%= render 'form' %>
+    </div>
+
+  </div>
+</div>

data/config/routes.rb

@@ -153,8 +153,10 @@ Kaui::Engine.routes.draw do
     match '/remove_allowed_user' => 'admin_tenants#remove_allowed_user', :via => :delete, :as => 'remove_allowed_user'
   end
 
-  resources :admin_allowed_users, :only => [ :index, :new, :create, :show ]
+  resources :admin_allowed_users
   scope '/admin_allowed_users' do
     match '/add_tenant' => 'admin_allowed_users#add_tenant', :via => :post, :as => 'add_tenant'
   end
+
+  resources :role_definitions, :only => [ :new, :create ]
 end

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
 end

data/test/functional/kaui/accounts_controller_test.rb

@@ -77,12 +77,13 @@ class Kaui::AccountsControllerTest < Kaui::FunctionalTestHelper
     assert_response 200
     assert_not_nil assigns(:account)
 
+    latest_account_attributes = assigns(:account).to_hash
     put :update,
         :account_id => @account.account_id,
-        :account => {
+        :account => latest_account_attributes.merge({
             :name => SecureRandom.uuid.to_s,
             :email => SecureRandom.uuid.to_s + '@example.com'
-        }
+        })
     assert_redirected_to account_path(assigns(:account).account_id)
     assert_equal 'Account successfully updated', flash[:notice]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -474,6 +474,7 @@ files:
 - app/controllers/kaui/queues_controller.rb
 - app/controllers/kaui/refunds_controller.rb
 - app/controllers/kaui/registrations_controller.rb
+- app/controllers/kaui/role_definitions_controller.rb
 - app/controllers/kaui/sessions_controller.rb
 - app/controllers/kaui/subscriptions_controller.rb
 - app/controllers/kaui/tag_definitions_controller.rb
@@ -516,6 +517,7 @@ files:
 - app/models/kaui/payment_state.rb
 - app/models/kaui/rails_methods.rb
 - app/models/kaui/refund.rb
+- app/models/kaui/role_definition.rb
 - app/models/kaui/simple_plan.rb
 - app/models/kaui/subscription.rb
 - app/models/kaui/tag.rb
@@ -523,6 +525,7 @@ files:
 - app/models/kaui/tenant.rb
 - app/models/kaui/transaction.rb
 - app/models/kaui/user.rb
+- app/models/kaui/user_role.rb
 - app/views/kaui/account_emails/_account_emails_table.html.erb
 - app/views/kaui/account_emails/_form.html.erb
 - app/views/kaui/account_emails/new.html.erb
@@ -541,6 +544,7 @@ files:
 - app/views/kaui/admin/index.html.erb
 - app/views/kaui/admin/index.js.erb
 - app/views/kaui/admin_allowed_users/_form.html.erb
+- app/views/kaui/admin_allowed_users/edit.html.erb
 - app/views/kaui/admin_allowed_users/index.html.erb
 - app/views/kaui/admin_allowed_users/new.html.erb
 - app/views/kaui/admin_allowed_users/show.html.erb
@@ -603,6 +607,8 @@ files:
 - app/views/kaui/refunds/new.html.erb
 - app/views/kaui/registrations/_form.html.erb
 - app/views/kaui/registrations/new.html.erb
+- app/views/kaui/role_definitions/_form.html.erb
+- app/views/kaui/role_definitions/new.html.erb
 - app/views/kaui/sessions/_form.html.erb
 - app/views/kaui/sessions/new.html.erb
 - app/views/kaui/subscriptions/_edit_form.html.erb