egov_utils 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fcb23ce666217bfad1650aaa7e0358540f66fb020f5536a752b4e707ccfd7e8
-  data.tar.gz: 5939b4825eba28843b06a490df586328b6cb5a5ea5aa915cf3fd43c696c94f88
+  metadata.gz: f5e0d2eacc1f1255140048fa865dfe34378472030cbbd7c51bd39efd2f49c152
+  data.tar.gz: 62675a67d00e5dc9b3ffcdf19a833166979091b00d454ca64cbbcdd2b575b63d
 SHA512:
-  metadata.gz: afd6dc5da66507d7ade7221bd48cc5daff0b3945172101d456f519031fab2231451cb2273a11aae24003dbad4d8c9cada1b06318215f96c08f5157b8bad8aaa0
-  data.tar.gz: 632e86820385975db0555ae76c9d0e506b8dce49b16b8d9d1884d5451c53eb98800943415fd945867ba33bfda0ac858688ed17d1298ebe1bc97eb1068174396b
+  metadata.gz: 182175b3dbe8628155477389a50ed4dc10c5cb4b785115551ff34e9609dd0c14a34989aaea07f01c382137a1533a00e9a1961809c5e8c342fada11238013718d
+  data.tar.gz: f94cd08099878bcd8c0218f2103aa961f2152a8cd88b54cf5b8236a540d1cd1a5c67021cf6a4d0f3fb42c19f98bc5b38ee4eb91ccf506f72b74f0e8fd338d3be

data/app/assets/javascripts/egov_utils/eGovUtilities.coffee.erb

@@ -18,9 +18,10 @@ window.eGovUtilities =
     }
 
 
-  initPage: ()->
-    eGovUtilities.initDatepickers()
-    eGovUtilities.initSelect2()
+  initPage: ($container)->
+    $container ||= $(document)
+    eGovUtilities.initDatepickers($container)
+    eGovUtilities.initSelect2($container)
 
   initDatepickers: ($container)->
     $container ||= $(document)
@@ -64,7 +65,7 @@ window.eGovUtilities =
   setModalContent: ($modal, body, title) ->
     $modal.find('.modal-title').text(title)
     $modal.find('.modal-body').html(body)
-    eGovUtilities.initDatepickers($modal)
+    eGovUtilities.initPage($modal)
 
   showModal: (body, options) ->
     options = options || {}
@@ -75,6 +76,9 @@ window.eGovUtilities =
     delete options['title']
     eGovUtilities.setModalContent($modal, body, title)
     $modal.modal(options)
+    window.setTimeout(()->
+      eGovUtilities.initPage($modal)
+    , 750)
     $modal
 
 $(eGovUtilities.setup)

data/app/controllers/egov_utils/groups_controller.rb

@@ -20,7 +20,7 @@ module EgovUtils
     private
 
       def create_params
-        params.require(:group).permit(:name, :provider, :ldap_uid)
+        params.require(:group).permit(:name, :provider, :ldap_uid, :external_uid)
       end
 
   end

data/app/controllers/egov_utils/people_controller.rb

@@ -0,0 +1,23 @@
+module EgovUtils
+  class PeopleController < ApplicationController
+
+    load_and_authorize_resource
+
+    def index
+      @people_schema = PersonSchema.new
+      @people_schema.from_params(params)
+      respond_to do |format|
+        if params['_type'] == 'query'
+          format.json{ render json: {
+            results: @people_schema.entities.collect do |p|
+                {id: p.id, text: p.to_s, residence: p.residence.to_s}
+              end
+          }}
+        else
+          format.json{ render json: @people_schema }
+        end
+      end
+    end
+
+  end
+end

data/app/models/egov_utils/address.rb

@@ -3,7 +3,7 @@ module EgovUtils
 
     # before_safe :identify_address , if: :changed?
 
-    validates :street, :city, length: 3..255
+    validates :street, :city, length: 2..255
     validates :postcode, numericality: { only_integer: true }
     validates :district, inclusion: { in: :district_names }
     validates :region, inclusion: { in: :region_names }

data/app/models/egov_utils/group.rb

@@ -22,5 +22,9 @@ module EgovUtils
       ldap_members.detect{|mem| mem[:login] == user.login }
     end
 
+    def external_uid
+      super || auth_source.send(:get_group_dn, sid: ldap_uid)
+    end
+
   end
 end

data/app/models/egov_utils/person.rb

@@ -12,5 +12,9 @@ module EgovUtils
       firstname.to_s + ' ' + lastname.to_s
     end
 
+    def to_s
+      "#{fullname} (#{I18n.t(:text_born_on_at, place: birth_place, date: I18n.l(birth_date.to_date))})"
+    end
+
   end
 end

data/app/models/egov_utils/user.rb

@@ -106,7 +106,14 @@ module EgovUtils
 
     def ldap_groups
       if provider.present?
-        EgovUtils::Group.where(provider: provider).to_a.select{|g| auth_source.member?(ldap_dn, g.ldap_uid) }
+        group_ids = 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)
+        end
+        groups
       end
     end
 

data/app/schemas/egov_utils/person_schema.rb

@@ -7,7 +7,7 @@ module EgovUtils
 
     def initialize_available_attributes
       @available_attributes ||= []
-      @available_attributes << Fullname.new(model, 'fullname', 'string')
+      @available_attributes << AzaharaSchema::DerivedAttribute.new(model, 'fullname', :concat, 'firstname', 'lastname', schema: self)
       super
     end
 

data/app/schemas/egov_utils/user_schema.rb

@@ -7,7 +7,7 @@ module EgovUtils
 
     def initialize_available_attributes
       @available_attributes ||= []
-      @available_attributes << Fullname.new(model, 'fullname', 'string')
+      @available_attributes << AzaharaSchema::DerivedAttribute.new(model, 'fullname', :concat, 'firstname', 'lastname', schema: self)
       super
       @available_attributes << AllRoleNames.new(model, 'all_role_names', 'string')
     end

data/config/locales/cs.yml

@@ -53,6 +53,8 @@ cs:
       firstname: Jméno
       lastname: Příjmení
       birth_date: Datum narození
+      birth_place: Místo narození
+      residence: Bydliště
 
 
   models_errors: &my_model_errors

data/config/routes.rb

@@ -10,6 +10,8 @@ EgovUtils::Engine.routes.draw do
     post :approve, on: :member
   end
 
+  resources :people
+
   resources :groups
   resources :roles
 

data/db/migrate/20171109172909_add_external_uid_to_groups.rb

@@ -0,0 +1,5 @@
+class AddExternalUidToGroups < ActiveRecord::Migration[5.1]
+  def change
+    add_column :egov_utils_groups, :external_uid, :string
+  end
+end

data/lib/egov_utils/auth_source.rb

@@ -165,33 +165,19 @@ module EgovUtils
       raise AuthSourceException.new(e.message)
     end
 
-    def member?(user_dn, group_sid)
+    def member?(user_dn, group_dn)
       ldap_con = initialize_ldap_con(options['bind_dn'], options['password'])
-      group_dn = nil
-      Rails.logger.debug("Membership in group for #{user_dn}")
-      ldap_con.search(base: options['base'],
-                      filter: base_group_filter & Net::LDAP::Filter.eq('objectSID', group_sid),
-                      attributes: ['dn']) do |entry|
-        group_dn = get_attr(entry, 'dn')
-      end
-      if group_dn
-        ldap_con.search(base: user_dn,
-                          filter: base_user_filter & Net::LDAP::Filter.ex('memberOf:1.2.840.113556.1.4.1941', group_dn),
-                          attributes: ['dn']) do |entry|
-          return true
-        end
+      Rails.logger.debug("Membership in group (#{group_dn}) for (#{user_dn})")
+      ldap_con.search(base: user_dn,
+                        filter: base_user_filter & Net::LDAP::Filter.ex('memberOf:1.2.840.113556.1.4.1941', group_dn),
+                        attributes: ['dn']) do |entry|
+        return true
       end
       return false
     end
 
-    def group_members(group_sid)
+    def group_members(group_dn)
       ldap_con = initialize_ldap_con(options['bind_dn'], options['password'])
-      group_dn = nil
-      ldap_con.search(base: options['base'],
-                      filter: base_group_filter & Net::LDAP::Filter.eq('objectSID', group_sid),
-                      attributes: ['dn']) do |entry|
-        group_dn = get_attr(entry, 'dn')
-      end
       results = []
       if group_dn
         ldap_con.search(base: options['base'],
@@ -254,7 +240,8 @@ module EgovUtils
          :dn => entry.dn,
          :name => get_attr(entry, 'cn'),
          :provider => provider,
-         :ldap_uid => get_sid_string( get_attr(entry, 'objectSID') )
+         :ldap_uid => get_sid_string( get_attr(entry, 'objectSID') ),
+         :external_uid => entry.dn
         }
       end
 
@@ -297,6 +284,15 @@ module EgovUtils
         attrs
       end
 
+      def get_group_dn(**options)
+        ldap_con = initialize_ldap_con(options['bind_dn'], options['password'])
+        ldap_con.search(base: options['base'],
+                        filter: base_group_filter & ( options[:sid] ? Net::LDAP::Filter.eq('objectSID', options[:sid]) : group_search_filters(options[:name]) ),
+                        attributes: ['dn']) do |entry|
+          return get_attr(entry, 'dn')
+        end
+      end
+
       def search_user_dn(login, password=nil)
         ldap_con = nil
         if options['bind_dn'].include?("$login")

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.1.15'
+  VERSION = '0.1.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -287,11 +287,11 @@ files:
 - app/attributes/egov_utils/all_role_names.rb
 - app/attributes/egov_utils/district.rb
 - app/attributes/egov_utils/full_address.rb
-- app/attributes/egov_utils/fullname.rb
 - app/attributes/egov_utils/region.rb
 - app/controllers/egov_utils/addresses_controller.rb
 - app/controllers/egov_utils/application_controller.rb
 - app/controllers/egov_utils/groups_controller.rb
+- app/controllers/egov_utils/people_controller.rb
 - app/controllers/egov_utils/roles_controller.rb
 - app/controllers/egov_utils/sessions_controller.rb
 - app/controllers/egov_utils/users_controller.rb
@@ -344,6 +344,7 @@ files:
 - db/migrate/20170809150646_create_egov_utils_people.rb
 - db/migrate/20170824111701_create_egov_utils_groups.rb
 - db/migrate/20171103141234_add_birth_place_and_residence_to_people.rb
+- db/migrate/20171109172909_add_external_uid_to_groups.rb
 - lib/bootstrap_form/datetimepicker.rb
 - lib/bootstrap_form/fileuid.rb
 - lib/bootstrap_form/helpers/bootstrap4.rb

data/app/attributes/egov_utils/fullname.rb

@@ -1,15 +0,0 @@
-module EgovUtils
-  class Fullname < AzaharaSchema::Attribute
-
-    def arel_field
-      Arel::Nodes::NamedFunction.new 'CONCAT', [EgovUtils::Person.arel_table[:lastname], Arel::Nodes::SqlLiteral.new('\' \'') , EgovUtils::Person.arel_table[:firstname]]
-    end
-
-    def build_json_options!(options)
-      options[:methods] ||= []
-      options[:methods] << 'fullname'
-      options
-    end
-
-  end
-end