kaname 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfebd9bb80d51a53c5a41afa453e0288fa8ed664
-  data.tar.gz: 1259abbf32f2b632cb94914e349c2ceb4fc59131
+  metadata.gz: 4d343b35548ff490c4cf6c6d66f48bf895d5655b
+  data.tar.gz: 109027072e13cb3d96ecee4bf32c652314e31c5a
 SHA512:
-  metadata.gz: b43a0ac06ebe402266865f0bf4e147a4b911b3c5d1bf5dda01ea03d45d659065453204ef8f877338d09eb30e1baccbb1e43ba6cb9dca2e3e79af1694bc62d984
-  data.tar.gz: f760c17207e6bb2f75c9603b83cf3837779e57b545f1067f834214eaf246e63b5e93965a1fb50f9b77fd03889a7fb3f5e2cb066adc26154eaa62b95c0205715e
+  metadata.gz: cfd3964b238935cb1f23967b8185640bdeda8f0b5ffe1c201d54f5ae461a246d7389470109be220ec95e3ad5a18c79600740458394f662d38141ef8345ac7069
+  data.tar.gz: 594a5f5eb3d613e268260ffa2816dae8e73410e1316b22fb9fc151ff140bfd1090a691cd70dba73c13b83d9b09017795d48e7d3bce970655fdc16fa312c45254

data/lib/kaname/adapter/read_only.rb

@@ -22,11 +22,19 @@ module Kaname
         @_roles ||= Yao::Role.list
       end
 
+      def list_role_assignments
+        unless @_role_assignments
+          @_role_assignments ||= Yao::RoleAssignment.list
+          Yao::Auth.try_new
+        end
+        @_role_assignments
+      end
+
       def users_hash
         @_user_hash ||= list_users.each_with_object(Hash.new { |h,k| h[k] = {} }) do |u,uh|
           next if ignored_users.include?(u.name)
           uh[u.name]["email"] = u.email
-          uh[u.name]["tenants"] = tenant_role_hash(u.name)
+          uh[u.name]["tenants"] = tenant_role_hash(u.id)
         end
       end
 
@@ -54,10 +62,11 @@ module Kaname
 
       private
 
-      def tenant_role_hash(user_name)
-        list_tenants.each_with_object(Hash.new) do |t,th|
-          r = Yao::Role.list_for_user(user_name, on: t.name)
-          th[t.name] = r.first.name if r.size > 0
+      def tenant_role_hash(user_id)
+        list_role_assignments.each_with_object(Hash.new) do |t,th|
+          if t.user.id == user_id
+            th[list_tenants.find {|ts| ts.id == t.scope["project"]["id"]}["name"]] = list_roles.find {|r| r.id == t.role.id }['name']
+          end
         end
       end
 

data/lib/kaname/version.rb

@@ -1,3 +1,3 @@
 module Kaname
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaname
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yao