kaui 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373e8cbf4148b25bba71c10080a5e770768424e1
-  data.tar.gz: 892d69a11441a55f70981c6a95cd9e759e74a9e6
+  metadata.gz: 0a9ec1ec7ef252ca12a43f8149f34b8d05f9380e
+  data.tar.gz: 74b4b0292efc15111d1c199572a38dc8d47db671
 SHA512:
-  metadata.gz: dc5dcb3a79055588ca5e1e551cd263496501dc6f8a4787a11210131603c409f124b84d629b4097a601d7405e6a911f617eaa509a8e74893f7f6c51ed94b9e214
-  data.tar.gz: 3cb084a400d0d95c01cc0c1609cb5d1674f144b7c7d9492df52f44d485b1a65d03dfb61087c3e22b9635cd00c35e85e9b8109a2089b959a72c996e3b48811ead
+  metadata.gz: 4d1c6e1c3c01e6e17fa8b124a6211edfb95cd3104770b1f2abaa93a661e96334263564ea5b5bdaa9c450912182daba58efe24915b606d42ac090addaa23055cf
+  data.tar.gz: 5bb0eb6ca5e539d3c8debd3fbca23817d028ae14438e3f7ded0f770d2e73709b2ae59c1ace08db7e3fbde6cc15bb24a1086a55de0d8c3ebb4fc0245b14f84d11

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -71,7 +71,7 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
   def show
     @tenant = safely_find_tenant_by_id(params[:id])
-    @allowed_users = retrieve_allowed_users_for_current_user
+    @allowed_users = @tenant.kaui_allowed_users & retrieve_allowed_users_for_current_user
   end
 
   def upload_catalog
@@ -171,7 +171,13 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
   def remove_allowed_user
     current_tenant = safely_find_tenant_by_id(params[:id])
-    au = Kaui::AllowedUser.find(params[:allowed_user][:id])
+    au = Kaui::AllowedUser.find(params.require(:allowed_user).require(:id))
+
+    if Kaui.root_username != current_user.kb_username
+      render :json => {:alert => 'Only the root user can remove users from tenants'}.to_json, :status => 401
+      return
+    end
+
     # remove the association
     au.kaui_tenants.delete current_tenant
     render :json => '{}', :status => 200

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

@@ -30,9 +30,11 @@
                 <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="fa fa-times"></span>
-                  </button>
+                  <% if Kaui.root_username == current_user.kb_username %>
+                      <button type="button" class="btn btn-default btn-sm" id="<%= "allowed-user-remove-#{u.id}" %>">
+                        <span class="fa fa-times"></span>
+                      </button>
+                  <% end %>
                 </td>
               </tr>
           <% end %>

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = '0.14.1'
+  VERSION = '0.14.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Killbill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails