kaui 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a81e6e3a3619f778099f358dc74d3225cb53e8
-  data.tar.gz: 20c0ac946eeb47e2a1caf16b916b5d9541ec12ff
+  metadata.gz: f76c44debafe012a786bfaad08689567c41e67c1
+  data.tar.gz: 685ef282ca6ec11ce123b672803827ed3ab6bdca
 SHA512:
-  metadata.gz: 8e0c097898fc8ef1a2950043724888498061d9e4132bf0986e7060ef216098f8a575a98a84486580e2cd8039600543f793b5fa30f3fba8fe0e677feec723418b
-  data.tar.gz: d7e88959ca5f56094c30586856b3ead2d09dea34ca1620ee9029da414823950a3a03564b6d77d0426b701c2f8f0a08f6f20fe928dfc23c91da1764ea682c7107
+  metadata.gz: d5e837d361a21b06f0fbb19202170733fcd3fb7e5b5413e7e17aed117b8c7c81af34e55df61f317a2f1acd640143e791b7d574b4e609233bd0c1eb6b5c78dfe6
+  data.tar.gz: 2a86fe5e70491f0e8b5fc472f44282371d7ce68e1b044ce82ff028d07443ce3883569aa63e9777e5dd6ca9df79a8fdf65d7f107caa3fbdb92ec86a0960df53de

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    kaui (0.8.0)
+    kaui (0.8.1)
       cancan (~> 1.6.10)
       carmen-rails (~> 1.0.0)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.10.1)
+      killbill-client (~> 0.10.4)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       symmetric-encryption (~> 3.6.0)
@@ -45,11 +45,8 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.3)
     bcrypt (3.1.10)
-    bcrypt (3.1.10-java)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    bcrypt-ruby (3.1.5-java)
-      bcrypt (>= 3.1.3)
     builder (3.0.4)
     cancan (1.6.10)
     carmen (1.0.1)
@@ -79,8 +76,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.2)
-    json (1.8.2-java)
-    killbill-client (0.10.3)
+    killbill-client (0.10.4)
       json (>= 1.2.0)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -136,7 +132,6 @@ GEM
       coercible (>= 1.0.0)
     thor (0.19.1)
     thread_safe (0.3.4)
-    thread_safe (0.3.4-java)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot

data/README.md

@@ -87,3 +87,37 @@ Then, install and run it from a local directory:
 Alternatively, you can run the `kaui` script under `bin` by setting your loadpath correctly:
 
     ruby -Ilib bin/kaui /path/to/rails/app --path=$PWD --skip-bundle
+    
+
+Multi-Tenancy
+===========
+
+KAUI has been enhanced to support multi-tenancy. In order to benefit from that mode, remove the properties `KillBillClient.api_key` and `KillBillClient.api_secret` from the config/initializers directory.
+
+Admin User Roles
+-------------------------
+
+In multi-tenancy mode, there are two kind of users:
+
+* The **multi-tenant admin** user, which has the rights to configure the tenant information (creation of tenant, add allowed users for specific tenant, upload catalog, ...)
+* The **per-tenant admin** user, which operates just a given tenant
+
+Those roles and permissions are defined the same way other permissions are defined: The Shiro configuration (static config file, LDAP) in Kill Bill, will determine for each user its associated role, and the roles will have a set of available [permissions](https://github.com/killbill/killbill-api/blob/master/src/main/java/org/killbill/billing/security/Permission.java). The new permissions have been created:
+
+* TENANT_CAN_VIEW
+* TENANT_CAN_CREATE
+* OVERDUE_CAN_UPLOAD
+* CATALOG_CAN_UPLOAD 
+
+The [enforcement in KAUI](https://github.com/killbill/killbill-admin-ui/blob/master/app/models/kaui/ability.rb) is based on the CanCan gem.
+
+Multi-tenancy screens
+------------------------------
+
+KAUI has been enriched with new models and new screens to manage the multi-tenancy, and those are available for the multi-tenant admin user:
+
+* The `kaui_tenants` table will list the available tenants (from KAUI point of view); note that this is redundant with the Kill Bill `tenants` table, and the reason is that the `api_secret` needs to maintained in KAUI as well, so listing the existing tenants from Kill Bill would not work since that key is encrypted and cannot be returned. A new screen mounted on `/admin_tenants` allows to configure new tenants. The view allows to create the new tenant in Kill Bill or simply updates the local KAUI config if the tenant already exists.
+* The `kaui_allowed_users` table along with the join table `kaui_allowed_user_tenants` will list all the users in the system that can access specific tenants. The join table is required since a given user could access multiple tenants (e.g multi-tenant admin user), and at the same time many users could access the same tenant. A new screen mounted on `/admin_allowed_users` allows to configure the set of allowed users associated to specific tenants.
+
+
+

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -22,14 +22,22 @@ module Kaui
       end
 
       begin
-        # Create the tenant in Kill Bill
-        new_tenant = Kaui::AdminTenant.new
-        new_tenant.external_key = param_tenant[:name]
-        new_tenant.api_key = param_tenant[:api_key]
-        new_tenant.api_secret = param_tenant[:api_secret]
 
         options = tenant_options_for_client
-        new_tenant = new_tenant.create(options[:username], nil, comment, options)
+        new_tenant = nil
+
+        if params[:create_tenant]
+          # Create the tenant in Kill Bill
+          new_tenant = Kaui::AdminTenant.new
+          new_tenant.external_key = param_tenant[:name]
+          new_tenant.api_key = param_tenant[:api_key]
+          new_tenant.api_secret = param_tenant[:api_secret]
+          new_tenant = new_tenant.create(options[:username], nil, comment, options)
+        else
+          options[:api_key] = param_tenant[:api_key]
+          options[:api_secret] = param_tenant[:api_secret]
+          new_tenant = Kaui::AdminTenant.find_by_api_key(param_tenant[:api_key], options)
+        end
 
         # Transform object to Kaui model
         tenant_model = Kaui::Tenant.new

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

@@ -24,6 +24,13 @@
             </div>
           </div>
 
+          <div class="control-group">
+            <%= f.label :create_tenant, 'Create tenant', :class => 'control-label' %>
+            <div class="controls">
+              <%= check_box_tag(:create_tenant) %>
+            </div>
+          </div>
+
           <div class="form-actions">
             <%= button_tag 'Configure a new Tenant', :class => 'btn btn-primary' %>
           </div>

data/kaui.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'money-rails', '~> 0.8.1'
   s.add_dependency 'd3_rails', '~> 3.2.8'
   s.add_dependency 'twitter-bootstrap-rails', '~> 2.2.8'
-  s.add_dependency 'killbill-client', '~> 0.10.1'
+  s.add_dependency 'killbill-client', '~> 0.10.4'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
   s.add_dependency 'carmen-rails', '~> 1.0.0'

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement