kaui 0.7.2 → 0.8.0

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

@@ -0,0 +1,25 @@
+<% if can? :view, Kaui::AdminTenant %>
+    <% unless @tenants.empty? %>
+        <table id="tenants-table" class="table table-condensed">
+          <thead>
+          <tr>
+            <th>Name</th>
+            <th>Tenant Id</th>
+            <th>Api Key</th>
+          </tr>
+          </thead>
+          <tbody>
+          <% @tenants.each do |t| %>
+              <tr>
+                <td><%= link_to t.name, admin_tenant_path(t.id) %></td>
+                <td><%= t.kb_tenant_id %></td>
+                <td><%= t.api_key %></td>
+              </tr>
+          <% end %>
+          </tbody>
+        </table>
+    <% end %>
+<% end %>
+<% if can? :create, Kaui::AdminTenant %>
+    <h3><%= link_to 'Configure a New Tenant', new_admin_tenant_path %></h3>
+<% end %>

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

@@ -0,0 +1,32 @@
+<% if can? :create, Kaui::AdminTenant %>
+    <%= form_for @tenant, url: admin_tenants_path, :html => {:class => 'form-horizontal'} do |f| %>
+        <fieldset>
+
+          <div class="control-group">
+            <%= f.label :name, 'Name', :class => 'control-label' %>
+            <div class="controls">
+              <%= f.text_field :name, :class => 'input-small', :required => true %>
+            </div>
+          </div>
+
+
+          <div class="control-group">
+            <%= f.label :api_key, 'API Key', :class => 'control-label' %>
+            <div class="controls">
+              <%= f.text_field :api_key, :class => 'input-small', :required => true %>
+            </div>
+          </div>
+
+          <div class="control-group">
+            <%= f.label :api_secret, 'API Secret', :class => 'control-label' %>
+            <div class="controls">
+              <%= f.password_field :api_secret, :class => 'input-small', :required => true %>
+            </div>
+          </div>
+
+          <div class="form-actions">
+            <%= button_tag 'Configure a new Tenant', :class => 'btn btn-primary' %>
+          </div>
+        </fieldset>
+    <% end %>
+<% end %>

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

@@ -0,0 +1,68 @@
+<% if can? :view, Kaui::AdminTenant %>
+    <dl class="dl-horizontal">
+      <dt>Name:</dt>
+      <dd><%= @tenant.name %>&nbsp;</dd>
+      <dt>Tenant ID:</dt>
+      <dd><%= @tenant.kb_tenant_id %>&nbsp;</dd>
+      <dt>API Key:</dt>
+      <dd><%= @tenant.api_key %>&nbsp;</dd>
+    </dl>
+
+    <% unless @tenant.kaui_allowed_users.empty? %>
+        <h3>Allowed Users:</h3>
+        <table id="allowed-users-for-tenant-table" class="table table-condensed">
+          <thead>
+          <tr>
+            <th>Name</th>
+            <th>Description</th>
+          </tr>
+          </thead>
+          <tbody>
+          <% @tenant.kaui_allowed_users.each do |u| %>
+              <tr>
+                <td><%= link_to u.kb_username, admin_allowed_user_path(u.id) %></td>
+                <td><%= u.description %></td>
+                <td>
+                  <button type="button" class="btn btn-default btn-sm" id="<%= "allowed-user-remove-#{u.id}" %>">
+                  <span class="icon-remove"></span>
+                  </button>
+                </td>
+              </tr>
+          <% end %>
+          </tbody>
+        </table>
+    <% end %>
+<% end %>
+<% if can? :config_upload, Kaui::AdminTenant %>
+    <%= form_tag({action: :upload_catalog}, method: 'post', multipart: true) do %>
+
+        <%= hidden_field_tag(:id, @tenant.id) %>
+
+        <div class="control-group">
+          <%= label_tag :catalog, 'Tenant Catalog XML', :class => 'control-label' %>
+          <div class="controls">
+            <%= file_field_tag 'catalog' %>
+          </div>
+        </div>
+        <div class="actions">
+          <%= submit_tag 'Upload' %>
+        </div>
+    <% end %>
+    <div class="form-actions">
+      <%= link_to 'Back', :back, :class => 'btn' %>
+    </div>
+<% end %>
+
+<%= javascript_tag do %>
+    $(document).ready(function() {
+    $('[id^=allowed-user-remove-]').click(function() {
+        var allowedUser = $(this);
+        $.ajax({ type: "DELETE",
+                 url: "<%= remove_allowed_user_path :format => :json %>",
+                 data: { allowed_user: { id: this['id'].split('-')[3] }, id: <%= @tenant.id %>},
+                 success: function(data) {  allowedUser.parent().parent().hide(); return false; },
+                 error: function(request, textStatus, errorThrown) { console.log("AJAX FAILED!!!! request.status " + request.status + ", textStatus = " + textStatus); return false; }
+        });
+      });
+    });
+<% end %>

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

@@ -57,7 +57,7 @@
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.description %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.start_date.html_safe if item.start_date %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.end_date.html_safe if item.end_date %></td>
-          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= format_date(sub.charged_through_date, @account.timezone).html_safe if sub.present? %></td>
+          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= format_date(sub.charged_through_date, @account.time_zone).html_safe if sub.present? %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= sub.price_list.downcase.capitalize if sub.present? and sub.price_list.present? %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= humanized_money_with_symbol Kaui::InvoiceItem.amount_to_money(item) %> (<%= item.currency %>)</td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.audit_logs.map {|log| log.comments}.compact.join('<br/>') if item.audit_logs.present? %></td>

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

@@ -0,0 +1,17 @@
+<% unless @tenants.empty? %>
+    <%= form_for(@tenants, :url => {:action => :select_tenant}, :html => {:method => :post, :class => "form-horizontal"}) do |f| %>
+        <fieldset>
+          <div class="control-group">
+            <%= label_tag :tenant_name, "Available Tenants:", :class => "control-label" %>
+            <div class="controls">
+              <%= select_tag :kb_tenant_id, options_for_select(@tenants.map { |t| [t.name, t.kb_tenant_id] }) %>
+            </div>
+          </div>
+          <div class="form-actions">
+            <%= f.submit 'Chose Tenant', :class => 'btn btn-primary' %>
+            <%= link_to 'Back', :back, :class => 'btn' %>
+          </div>
+
+        </fieldset>
+    <% end %>
+<% end %>

data/config/initializers/killbill_authenticatable.rb

@@ -5,18 +5,16 @@ module Devise
     class KillbillAuthenticatable < Authenticatable
       # Invoked by warden to execute the strategy
       def authenticate!
+
         creds = params[:user] || {}
         kb_username = creds[:kb_username]
         kb_password = password
-        api_key = creds[:api_key] || KillBillClient.api_key
-        api_secret = creds[:api_password] || KillBillClient.api_secret
-
         # Find the associated user object
-        resource = valid_password? && mapping.to.find_for_killbill_authentication(kb_username, kb_password, api_key, api_secret)
+        resource = valid_password? && mapping.to.find_for_killbill_authentication(kb_username)
         return fail(:not_found_in_database) unless resource
 
         # Validate the credentials
-        if validate(resource){ resource.valid_killbill_password?(kb_username, kb_password, api_key, api_secret) }
+        if validate(resource){ resource.valid_killbill_password?(kb_username, kb_password) }
           # Create the user if needed
           resource.after_killbill_authentication
           # Tell warden to halt the strategy and set the user in the appropriate scope

data/config/locales/en.bootstrap.yml

@@ -0,0 +1,18 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  helpers:
+    actions: "Actions"
+    links:
+      back: "Back"
+      cancel: "Cancel"
+      confirm: "Are you sure?"
+      destroy: "Delete"
+      new: "New"
+      edit: "Edit"
+    titles:
+      edit: "Edit %{model}"
+      save: "Save %{model}"
+      new: "New %{model}"
+      delete: "Delete %{model}"

data/config/routes.rb

@@ -1,8 +1,9 @@
 Kaui::Engine.routes.draw do
+
   devise_for :users,
              :class_name => 'Kaui::User',
              :module => :devise,
-             :controllers => { :sessions => 'kaui/sessions' }
+             :controllers => { :sessions => 'kaui/sessions'}
 
   resources :tag_definitions
 
@@ -103,5 +104,30 @@ Kaui::Engine.routes.draw do
   scope "/custom_fields" do
     match "/pagination" => "custom_fields#pagination", :via => :get, :as => "custom_fields_pagination"
   end
+
+  scope "/tenants" do
+    match "/" => "tenants#index", :via => :get, :as => "tenants"
+    match "/select_tenant" => "tenants#select_tenant", :via => :post, :as => "select_tenant"
+  end
+
+  scope "/login_proxy" do
+    match "/check_login" => "login_proxy#check_login", :via => :get, :as => "check_login"
+  end
+
+  scope "/home" do
+    match "/" => "home#index", :via => :get, :as => "home"
+  end
+
+  resources :admin_tenants, :only => [ :index, :new, :create, :show ]
+  scope "/admin_tenants" do
+    match "/upload_catalog" => "admin_tenants#upload_catalog", :via => :post, :as => "admin_tenant_upload_catalog"
+    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 ]
+  scope "/admin_allowed_users" do
+    match "/add_tenant" => "admin_allowed_users#add_tenant", :via => :post, :as => "add_tenant"
+  end
+
   resources :custom_fields, :only => [ :create, :new, :index, :show ]
 end

data/config/symmetric-encryption.yml

@@ -0,0 +1,135 @@
+#
+# Symmetric Encryption for Ruby
+#
+---
+# For the development and test environments the test symmetric encryption keys
+# can be placed directly in the source code.
+# And therefore no RSA private key is required
+development:   &development_defaults
+  key:         1234567890ABCDEF1234567890ABCDEF
+  iv:          1234567890ABCDEF
+  cipher_name: aes-128-cbc
+  encoding:    :base64strict
+  private_rsa_key: |
+    -----BEGIN RSA PRIVATE KEY-----
+    MIIEpAIBAAKCAQEAxfbNAn6fc+poM/5mZwpDqO/fD064jcb5HNnCMm0AgXE75nU4
+    J2zrDbLj9bmKTHNdhYiwTCPsnZ9Ngtz4VmBRHkmirA6cclMesWXUHlqfHyCvvEYj
+    bhVMwOu/t07wPzFH7/f2HQLEX4IlwyNvJyq+AMLHVRCbMMfYCUDIEhUlsGxKQryq
+    yk+ga24EMPBLdSf1g1oas9dy7qDtK+91Bh1k7Oo7CrkisRQ70t1Cz+paQSJVZXxv
+    MBP6B8eXReB9YLOaIdsKoqEZ6Z0SEFr3xxudiB4ReYB9qqKeTDV0/VLf2m6TmnUr
+    ZImLJbi/bAxbcU3h9J4sq5Ma+l1t0gsmO0mlbQIDAQABAoIBAAU5AqWbM5e6Sm98
+    ubTkN27AjVD5EbNj2XSiZhYwe//uPddRpl6b6AOfgZYdBAIKVSBNv+DyXa624jOe
+    osqcledHqAwEAqqdeMTTW+pFF8eZdClybELeOv0n+xHZ+kqggTZag1q2lPm0FEz2
+    pVsSLJsWiG29F2sNCq0L0XtwpWLnHJO0U0dUjVtspDpAnQkl+l8WiTJkY0uf+L8z
+    iY6VDtNhf+Cc2TyOnB51nArHQfVt6pSahn8UB7gnjoPBjEPSlSj68XwjNLViFj94
+    NeXdrOQ/kjlsJcuX06jfUulHOlFP+uOft3m/q+8OC0uQm4EmcJ9p+m8E6z5ypUDp
+    kHi7swECgYEA74mktO2725fON43HpHG/fNglTPqlDUdoqUlDg7ovaDiaL+FlnhOb
+    7vUBfJ5FjWkeO6Teg0ElOA03sOAq29ql91kaweSEbSkRb5HLVGo7m3FTKfi8rTpe
+    QufQDjt8kvnAtNSlXQexG3BJpondbMF4hYZSTtGPjkM0MQOqkByUZC0CgYEA05G5
+    M/NnZXpXvpZNCHlDht98bHUAZfKLRe7FTAqLBWAEWG70x8aBhzFn6kOD0jhsVcnt
+    3EwiUD1MIuiWYvyGmwBoRCQGVxW2LuxbBYRSpPgTPKPM9juc3GYs36KTSbA3+44y
+    2Fys8/gQusYQ3YwomxU4ygL5lyxxY14sQ3UAzkECgYEAhjRJ8YyYicmdogZvajTI
+    oju/ekebnbr6ao4/o1f3I59C07ym4FAAN3tRn+5U7YuNgsE2YbdoEOVm5FRT7uWr
+    ws9LbIKJp1cxC59VmjACwW5Wt9dCbpObKEUUjkTJ4NbJHwdctqiOk97vhL0NL9ed
+    nMHK75n9oikI3sU9FIzOnukCgYEAz9FpgZ1K6EQ3om9S9crfyMEIICUBoiKQKb5z
+    sND+Y+Y//nnnGcFkhF7EezmcZ8eiqtYyPl3OqtC7U+LxrgPtWJ4azSwxyiL6lLb4
+    Zb/nykIf60Xe09QUre3zkCzKzuw44XF5gkvuW6tFC6H4+RZu4H8FDHHFp3gxXPEp
+    O43Xn8ECgYBzM7yEM0SUE6DI0WGATtuhVRXL3hjgPqf3TzmsQFMEal2Bu14d/d9f
+    zLks8POWjtQcgn2PGvrHS+aJZYR0okue4Ny5bfk+AohClXDtqZnz45wabYrRq6Xg
+    dTi8xJJHVkoRfcQleui6oqRB3i4iGlu5k8T1+djLLiN9eo0PY1VciQ==
+    -----END RSA PRIVATE KEY-----
+
+test:
+  <<: *development_defaults
+
+release:
+  # Since the key to encrypt and decrypt with must NOT be stored along with the
+  # source code, we only hold a RSA key that is used to unlock the file
+  # containing the actual symmetric encryption key
+  private_rsa_key: |
+    -----BEGIN RSA PRIVATE KEY-----
+    MIIEpAIBAAKCAQEAxfbNAn6fc+poM/5mZwpDqO/fD064jcb5HNnCMm0AgXE75nU4
+    J2zrDbLj9bmKTHNdhYiwTCPsnZ9Ngtz4VmBRHkmirA6cclMesWXUHlqfHyCvvEYj
+    bhVMwOu/t07wPzFH7/f2HQLEX4IlwyNvJyq+AMLHVRCbMMfYCUDIEhUlsGxKQryq
+    yk+ga24EMPBLdSf1g1oas9dy7qDtK+91Bh1k7Oo7CrkisRQ70t1Cz+paQSJVZXxv
+    MBP6B8eXReB9YLOaIdsKoqEZ6Z0SEFr3xxudiB4ReYB9qqKeTDV0/VLf2m6TmnUr
+    ZImLJbi/bAxbcU3h9J4sq5Ma+l1t0gsmO0mlbQIDAQABAoIBAAU5AqWbM5e6Sm98
+    ubTkN27AjVD5EbNj2XSiZhYwe//uPddRpl6b6AOfgZYdBAIKVSBNv+DyXa624jOe
+    osqcledHqAwEAqqdeMTTW+pFF8eZdClybELeOv0n+xHZ+kqggTZag1q2lPm0FEz2
+    pVsSLJsWiG29F2sNCq0L0XtwpWLnHJO0U0dUjVtspDpAnQkl+l8WiTJkY0uf+L8z
+    iY6VDtNhf+Cc2TyOnB51nArHQfVt6pSahn8UB7gnjoPBjEPSlSj68XwjNLViFj94
+    NeXdrOQ/kjlsJcuX06jfUulHOlFP+uOft3m/q+8OC0uQm4EmcJ9p+m8E6z5ypUDp
+    kHi7swECgYEA74mktO2725fON43HpHG/fNglTPqlDUdoqUlDg7ovaDiaL+FlnhOb
+    7vUBfJ5FjWkeO6Teg0ElOA03sOAq29ql91kaweSEbSkRb5HLVGo7m3FTKfi8rTpe
+    QufQDjt8kvnAtNSlXQexG3BJpondbMF4hYZSTtGPjkM0MQOqkByUZC0CgYEA05G5
+    M/NnZXpXvpZNCHlDht98bHUAZfKLRe7FTAqLBWAEWG70x8aBhzFn6kOD0jhsVcnt
+    3EwiUD1MIuiWYvyGmwBoRCQGVxW2LuxbBYRSpPgTPKPM9juc3GYs36KTSbA3+44y
+    2Fys8/gQusYQ3YwomxU4ygL5lyxxY14sQ3UAzkECgYEAhjRJ8YyYicmdogZvajTI
+    oju/ekebnbr6ao4/o1f3I59C07ym4FAAN3tRn+5U7YuNgsE2YbdoEOVm5FRT7uWr
+    ws9LbIKJp1cxC59VmjACwW5Wt9dCbpObKEUUjkTJ4NbJHwdctqiOk97vhL0NL9ed
+    nMHK75n9oikI3sU9FIzOnukCgYEAz9FpgZ1K6EQ3om9S9crfyMEIICUBoiKQKb5z
+    sND+Y+Y//nnnGcFkhF7EezmcZ8eiqtYyPl3OqtC7U+LxrgPtWJ4azSwxyiL6lLb4
+    Zb/nykIf60Xe09QUre3zkCzKzuw44XF5gkvuW6tFC6H4+RZu4H8FDHHFp3gxXPEp
+    O43Xn8ECgYBzM7yEM0SUE6DI0WGATtuhVRXL3hjgPqf3TzmsQFMEal2Bu14d/d9f
+    zLks8POWjtQcgn2PGvrHS+aJZYR0okue4Ny5bfk+AohClXDtqZnz45wabYrRq6Xg
+    dTi8xJJHVkoRfcQleui6oqRB3i4iGlu5k8T1+djLLiN9eo0PY1VciQ==
+    -----END RSA PRIVATE KEY-----
+
+
+  # List Symmetric Key files in the order of current / latest first
+  ciphers:
+    -
+      # Filename containing Symmetric Encryption Key encrypted using the
+      # RSA public key derived from the private key above
+      key_filename: config/keys/dummy_release.key
+      iv_filename:  config/keys/dummy_release.iv
+      cipher_name:  aes-256-cbc
+      # Base64 encode encrypted data without newlines
+      encoding:     :base64strict
+      version:      1
+
+production:
+  # Since the key to encrypt and decrypt with must NOT be stored along with the
+  # source code, we only hold a RSA key that is used to unlock the file
+  # containing the actual symmetric encryption key
+  private_rsa_key: |
+    -----BEGIN RSA PRIVATE KEY-----
+    MIIEpAIBAAKCAQEAy6UmlgZFM2f70i5/xINHdxZVbxPRgUrfO643LGUC1gfZVsNn
+    kus5xoAjZKgdlS2o47X8PYFi8gR96NBWPAQYS9M3p6KDbs9Yt+Imcb0LeHCamMin
+    AvhE5QBlf+A13oYY5xOTrwJMq1hSGB8rC3gbZMgSJBbjAiW+zgwzLzjXaphTwulP
+    8/Ht9PucvZE8arxsmvi7dGXr5B3uDZjAeS9qCl9LOMwHtOLeKD8GvKniN0tLUaSA
+    SWgI3z46KonSiYelzAMdhkwP4K5SqUITp9Uv7SVCoPoM7Xm640BnD0MJWxKH6lVi
+    56YJnT5xuIDC4zGwGdZG4dJS0ep1uSX0ZQ2xhwIDAQABAoIBAQCgn8brlk6G2YG6
+    qoqEibeYqrkAP/WDsXaaMDO8hH/UKaS31rCfJYIQm4lPH3sV60nHMgeey6srkXdu
+    ZsVd2S0AwbyoMHrSsCEeCPahx6aAfPCzibCRmxlcNw/X6RUUS1jhCoP2Ci5HCAbY
+    l9zv0vBocZY9eP/c9cCl7OGCYacnn0zZNf8dRZ6qPkOA8ySejPbgzmhQTt1JAJUw
+    2HaWo0tyCu0cE6FL//b+a+gblLc0e/2Y45BSnWbzXtxSfz/jKrpeqU1fW0lHVxd8
+    dFHLcQTvTu/R1JIVmC0RM9ZnsVTObJ8rTfazHYIt7/IsR+gj5E3MZmDJ7PzNv0kl
+    v01Iml0BAoGBAPpicmI3lTuyAwm8e7XXMbC4T7QinLN9XJeTc87EMM/KKFhiVjtr
+    gzcxUH0EqdfSd5bLU8fjW9H/xgQM82QNQzV2+AWY7wn2Lda1AE7xZYIjpBg+awV9
+    kKnRfDf3ThqKl5nmkmOQtYGNKKwn/u1ZTOSlQ1E2BqISdCNhupPhUZehAoGBANA2
+    WuBoU3IPKge/ELREz4GEdYSaHXZ8R3Au1vTXZQIRCUB/GJEoG2SmXxV1YFJMAm0B
+    6/ZkWvhANf1BU4rcVMYuKJwS9XSFIlW0Npq8uMZKP4A8dnw+bz53XZJr5DsaPoWy
+    jm65UC+Tbqg0mZV0mJ5JMKiH5Ezfu03mJUuYmJgnAoGAVcFOB9GdrRpk6/rALCGO
+    BUa7FakdHmR7R/banSCYzzIf61WSzzsdb9PWC1uDiEWva9gr07RNCHmfqld9LPFV
+    6YPbop8kj7bfMEBB4MfQymfGlf8azICbAW6cKtbqyzBYh/9ud+diIwLjwULZjxUc
+    vtrTWYc1cmD7ofqg2nE7bsECgYEAqCtOyTPaOiS/WNRcpI1zYHPhC0IDDAEjHhvm
+    6IjUf4/M/jfpWsyfG3M5Fzbfnnjf+LV1pWO3Cg2qzaum02BUZGFB0ZWKhRtG+Rv+
+    goptX1L26Rdsx7sR1M1KWYolJAt1dj0ax5mLh3G4Dcm2Rr2Oy0HoOCbSIbkPKsL5
+    Wo6cqT8CgYAwMtF9qJYeEJtjgxuRVwlEUzcvxsNiuuUSFq9RpAXYL+F2U/P0SdQw
+    06nf1JLvkcG2CyMbIB62BnQcuUyGAuhjtbpcsSn4MG00vfDNMPkaxOJ9W4S3mmnt
+    U2mXWYauJDvNdLEr42bVX3bTPTfR4zrIqe+oJJCH61Jcu/3ekpSkkA==
+    -----END RSA PRIVATE KEY-----
+
+
+  # List Symmetric Key files in the order of current / latest first
+  ciphers:
+    -
+      # Filename containing Symmetric Encryption Key encrypted using the
+      # RSA public key derived from the private key above
+      key_filename: config/keys/dummy_production.key
+      iv_filename:  config/keys/dummy_production.iv
+      cipher_name:  aes-256-cbc
+      # Base64 encode encrypted data without newlines
+      encoding:     :base64strict
+      version:      1

data/db/ddl.sql

@@ -1,10 +1,41 @@
 CREATE TABLE `kaui_users` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kb_tenant_id` varchar(255) DEFAULT NULL,
   `kb_username` varchar(255) NOT NULL,
   `kb_session_id` varchar(255) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `index_kaui_users_on_kb_tenant_id_and_kb_username` (`kb_tenant_id`,`kb_username`)
+  UNIQUE KEY `index_kaui_users_on_kb_username` (`kb_username`)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+CREATE TABLE `kaui_tenants` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `kb_tenant_id` varchar(255) DEFAULT NULL,
+  `api_key` varchar(255) DEFAULT NULL,
+  `encrypted_api_secret` varchar(255) DEFAULT NULL,
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `kaui_allowed_users` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `kb_username` varchar(255) DEFAULT NULL,
+  `description` varchar(255) DEFAULT NULL,
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `kaui_allowed_users_idx` (`kb_username`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `kaui_allowed_user_tenants` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `kaui_allowed_user_id` int(11) DEFAULT NULL,
+  `kaui_tenant_id` int(11) DEFAULT NULL,
+  `created_at` datetime NOT NULL,
+  `updated_at` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `kaui_allowed_users_tenants_uniq` (`kaui_allowed_user_id`,`kaui_tenant_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+

data/db/migrate/20130812155313_devise_create_kaui_users.rb

@@ -2,13 +2,11 @@ class DeviseCreateKauiUsers < ActiveRecord::Migration
   def change
     create_table(:kaui_users) do |t|
       # From Kill Bill
-      t.string :kb_tenant_id, :null => true
       t.string :kb_username,  :null => false
       t.string :kb_session_id,  :null => true
-
       t.timestamps
     end
 
-    add_index :kaui_users, [:kb_tenant_id, :kb_username], :unique => true
+    add_index :kaui_users, [:kb_username], :unique => true
   end
 end

data/db/migrate/20150109214021_create_kaui_tenants.rb

@@ -0,0 +1,12 @@
+class CreateKauiTenants < ActiveRecord::Migration
+  def change
+    create_table :kaui_tenants do |t|
+      t.string :name
+      t.string :kb_tenant_id
+      t.string :api_key
+      t.string :encrypted_api_secret
+
+      t.timestamps
+    end
+  end
+end