egov_utils 0.7.4 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ce0843ebb4bc70b8389b530dd43dd45c232cea4c741ec014995c77cb259e61
-  data.tar.gz: 954dbe830452f604e681b87a6d33b8cefea419bcf141fbd5cebd088b3316e7c9
+  metadata.gz: 46866bd8cd323b73b2c99ad7f027e7b3ae9042f871d93b9b5ca0f45677fe643e
+  data.tar.gz: b233828c37f7dc42a4093aaee39ec5339f28e11ddd539910004803ba035be4eb
 SHA512:
-  metadata.gz: b7394626c5d9f1771c679de090479739c1d78f212d9cada20f4dafbc6eebfcbedc336348c7b2b34192f6ce6b20165136cbc9d3750090f5b06318001038d56675
-  data.tar.gz: 1f3f2e7c890eac9696bcf862d856758cee4280fe49e9ff5bc20d98af8884ee020d2ebff85e4fbe644f3050ddc0365ef1972d093a334f38d212ea331116028415
+  metadata.gz: 5b165226cc59161621b0645957accb50a58e153c4f139aaf6a22b19772a22900f75b7a99b4ab84899a732820d25e43c14bea28546ac7b648e8205f64a6a476c5
+  data.tar.gz: e25fd828cad3f7116847a65471415624493ccf04011987f5584a96bfb67598e3cff944ddc300947226b24232946bf696fa07b5b80d6c4e636ed9815dbf53fadd

data/app/models/egov_utils/user.rb

@@ -133,9 +133,7 @@ module EgovUtils
     end
 
     def all_role_names
-      @all_role_names ||= Rails.cache.fetch("#{cache_key}/all_role_names", expires_in: 1.hours) do
-                            groups.collect{|g| g.roles}.reduce([], :concat) + roles
-                          end
+      @all_role_names ||= groups.map(&:roles).flatten + roles
       @all_role_names << DEFAULT_ROLE if DEFAULT_ROLE && !@all_role_names.any?
       @all_role_names
     end
@@ -144,25 +142,8 @@ module EgovUtils
       all_role_names.map{|rn| EgovUtils::UserUtils::Role.find(rn) }.compact.collect{|cls| cls.new }
     end
 
-    def groups
-      super.to_a.concat( Array.wrap(ldap_groups) )
-    end
-
-    def ldap_dn
-      @ldap_dn ||= ( dn = auth_source.send(:get_user_dn, login) ) && dn[:dn]
-    end
-
     def ldap_groups
-      if provider.present?
-        group_ids = persisted? && Rails.cache.read("#{cache_key}/ldap_group_ids", expires_in: 30.minutes)
-        if group_ids
-          groups = EgovUtils::Group.where(id: group_ids).to_a
-        else
-          groups = EgovUtils::Group.where(provider: provider).to_a.select{|g| auth_source.member?(ldap_dn, g.external_uid) }
-          Rails.cache.write("#{cache_key}/ldap_group_ids", groups.collect(&:id), expires_in: 30.minutes) if persisted?
-        end
-        groups
-      end
+      groups.where.not(ldap_uid: nil)
     end
 
     def must_change_password?

data/app/services/egov_utils/refresh_user_groups.rb

@@ -0,0 +1,39 @@
+module EgovUtils
+  class RefreshUserGroups
+
+    def initialize(user)
+      @user = user
+    end
+
+    def call
+      group_ids = (current_non_ldap_group + ldap_groups).compact.map(&:id)
+      user.group_ids = group_ids
+      user
+    end
+
+    private
+
+    attr_reader :user
+
+    def ldap_dn
+      @ldap_dn ||= begin
+        dn = user.auth_source.send(:get_user_dn, user.login)
+        dn[:dn] if dn
+      end
+    end
+
+    def ldap_groups
+      return [] if user.provider.blank?
+
+      @ldap_groups ||= begin
+        EgovUtils::Group.where(provider: user.provider).to_a.select do |g|
+          user.auth_source.member?(ldap_dn, g.external_uid)
+        end
+      end
+    end
+
+    def current_non_ldap_group
+      @current_non_ldap_groups ||= user.groups.where(ldap_uid: nil)
+    end
+  end
+end

data/app/views/egov_utils/users/_users_tab.html.haml

@@ -7,7 +7,7 @@
       %th= EgovUtils::User.human_attribute_name('groups')
       %th= t('label_actions')
   %tbody
-    - users.entities.each do |user|
+    - users.entities.includes(:groups).each do |user|
       %tr
         %td{title: user.login}= user.fullname
         %td= user.provider

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.7.4'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 1.0.1
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -549,6 +549,7 @@ files:
 - app/schemas/egov_utils/natural_person_schema.rb
 - app/schemas/egov_utils/person_schema.rb
 - app/schemas/egov_utils/user_schema.rb
+- app/services/egov_utils/refresh_user_groups.rb
 - app/validators/birthday_validator.rb
 - app/validators/email_validator.rb
 - app/validators/fileuid_validator.rb