egov_utils 0.7.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ffb5c5318fad10c8c77a83b96426625793b74fddcc163c1675df14b677dc90
-  data.tar.gz: 6bf65c30c149638229aa5961ab525678e90cff0bfde805eb7e72b5610cd7ec07
+  metadata.gz: 364918936845de99fd8aedf7dbf6121dbf33276e91c6ffd7a4f91dde07d80e7b
+  data.tar.gz: cfefd77e3f788be67a03ebe4bfddb46418fdeff608aae35c6844adae70859f73
 SHA512:
-  metadata.gz: 42e49457996959049edf85de48ab50a0dd0efbc085ee000ae94b58c083a3de1eb329ac75a7edc93a020fef91ddfc4a9b6233ef1ffc96f0c5037b863bb90046ce
-  data.tar.gz: dec8ff52fcce2ec3911e81b4b4fe56ef986ea15ad652ab757160d1fa0d8125d86c4b1e07a5613ec989a015726aae9a1f4900844eca0981a8d46c88505759b4a5
+  metadata.gz: 0de59c3058922aeb88c0d8267edccf5e104f7bc485c64eea968d7445234816a8f0594ecd1e21bd7c18eacafbc02682380ceda2f3d0693f9cb28c52de1a3f80d5
+  data.tar.gz: 7f90602a7b4418c3d5fcc4f746c4821a19df5a5a595421c56a9ca47be74c08283e10785f70a1787464c9d7691cf1aa2fcc84dafde496507d80e090b8f685ced9

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: 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/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.7.5'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 1.0.0
 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