thecore_auth_commons 3.5.7 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27bf0b1187752a6de3f29fe3b2d0e15057bba9a925eb7f9860236d9d8c505966
-  data.tar.gz: 342497749ab4022507a43b88c1ef948bf02d47d8a04bb36f15b27ff8cb260ddc
+  metadata.gz: b1eb9060882d36e90d8c5b1b77c6df18be6969382eba49fd59df9a30f5196433
+  data.tar.gz: 3f5bb4bd1029d7d3646ef0aede9129ff18eb893ba35915386eebbd498e7094cb
 SHA512:
-  metadata.gz: 7115ff0b2fd8cd6ba55ae9d8a63c9b90d63550e585c972b71a682432dd0af2ac78be0ae646db3177956bffbb508fe31c424a695c5be6f9e35386f7c020637c68
-  data.tar.gz: 26d704084b0cebfe63a21eb2f2c8e8439a0787691fc7d08c87d8b4d946c18c0d75c064d55b481eae2dcfd77952c79017cfc0b0dda604d5de497b5fce1928bcda
+  metadata.gz: dc229651cf4cdda2944b339d4329d472efa031409ae2968e61e43ad9d744eaa804945cb10e759b6d4b04ae9bedcade5836d85f4b351db33b4b6db83c9c1e1cd8
+  data.tar.gz: 98b4790b2c327802296b0dc624f770134cf5d829e644f7211bbc036914df990d16834fff8997ffa945c364e4c2e5e43837b88215dcbfff896ee2e25aa23db941

data/app/services/ldap/authenticator.rb

@@ -53,7 +53,7 @@ module Ldap
         entry = auth_on_single_server(server)
         if entry
           Rails.logger.info("Authentication: LDAP authentication succeeded for #{email} on server #{server.name}")
-          return find_or_create_user(entry, server.id)
+          return find_or_create_user(entry, server)
         else
           Rails.logger.info("Authentication: LDAP authentication failed for #{email} on server #{server.name}")
         end
@@ -66,8 +66,8 @@ module Ldap
 
     attr_reader :email, :password
 
-    def find_or_create_user(entry, server_id)
-      ThecoreAuthCommons.align_user email, entry, server_id
+    def find_or_create_user(entry, server)
+      ThecoreAuthCommons.align_user email, entry, server
     end
   end
 end

data/db/migrate/20251216110301_add_ldap_match_fields_to_ldap_server.rb

@@ -0,0 +1,10 @@
+class AddLdapMatchFieldsToLdapServer < ActiveRecord::Migration[7.2]
+  def change
+    add_column :ldap_servers, :name, :string
+    add_index :ldap_servers, :name
+    add_column :ldap_servers, :surname, :string
+    add_index :ldap_servers, :surname
+    add_column :ldap_servers, :phone, :string
+    add_index :ldap_servers, :phone
+  end
+end

data/db/migrate/20251216111217_add_code_to_ldap_server.rb

@@ -0,0 +1,6 @@
+class AddCodeToLdapServer < ActiveRecord::Migration[7.2]
+  def change
+    add_column :ldap_servers, :code, :string
+    add_index :ldap_servers, :code
+  end
+end

data/lib/thecore_auth_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreAuthCommons
-  VERSION = "3.5.7".freeze
+  VERSION = "3.5.8".freeze
 end

data/lib/thecore_auth_commons.rb

@@ -73,25 +73,28 @@ module ThecoreAuthCommons
         puts "Importando utente: #{email}"
 
         # Password must contain at least one uppercase letter, one lowercase letter, one number and one special character
-        ThecoreAuthCommons.align_user email, entry, server.id
+        ThecoreAuthCommons.align_user email, entry, server
         imported_count += 1
       end
     end
 
     puts "== Completato. Utenti importati: #{imported_count} =="
   end
-  # Your code goes here...
-  def self.align_user(email, entry, server_id)
+
+  def self.align_user(email, entry, server)
     user = User.find_or_initialize_by(email: email)
-    user.auth_source = "ldap #{server_id}"
+    user.auth_source = "ldap #{server.id}"
 
     # Password don't need to be changed, just created, otherwise it will invalidate the current user session if it's logged in
     user.password = user.password_confirmation = ThecoreAuthCommons.generate_secure_password if user.new_record?
 
     # Eventuale mapping LDAP -> campi User
-    user.name = entry[:givenname]&.first if user.respond_to?(:name)
+    user.name = entry[server.name]&.first if user.respond_to?(:name) && server.name.present?
+    user.surname = entry[server.surname]&.first if user.respond_to?(:surname) && server.surname.present?
+    user.phone = entry[server.phone]&.first if user.respond_to?(:phone) && server.phone.present?
+    user.code = entry[server.code]&.first if user.respond_to?(:code) && server.code.present?
 
-    # Recupera dala entry i gruppi di cui fa parte l'utente e crea i relativi record in Role assegnandoli all'utente corrente
+    # Recupera dalla entry i gruppi di cui fa parte l'utente e crea i relativi record in Role assegnandoli all'utente corrente
     is_admin = false
     entry[:memberOf].each do |group|
       group_name = group.split(",").first.split("=").last

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thecore_auth_commons
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.8
 platform: ruby
 authors:
 - Gabriele Tassoni
@@ -270,6 +270,8 @@ files:
 - db/migrate/20160209153816_create_permissions_chain.rb
 - db/migrate/20250516074016_create_ldap_servers.rb
 - db/migrate/20250516075204_add_auth_source_to_user.rb
+- db/migrate/20251216110301_add_ldap_match_fields_to_ldap_server.rb
+- db/migrate/20251216111217_add_code_to_ldap_server.rb
 - db/seeds.rb
 - lib/tasks/ldap.rake
 - lib/tasks/thecore_auth_commons_tasks.rake