thecore_auth_commons 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 682d5dea983ef3b65ae55f50803c0d8810ce04b8357f22bf05a6ab0cf7bd83f8
-  data.tar.gz: 4ed90e7731d83da42faa85231203ea7affe2f8a7f8890b26e77293ece0f75257
+  metadata.gz: 6658e7b11fc2130ad0e983ec82108eeb8b05b06cde2805066eb4f28ff56940f1
+  data.tar.gz: 0da3f0a0ce0e21eb8200e66d139ae4cbeda186ac2af3d2242455aeede8fcbbea
 SHA512:
-  metadata.gz: b7f02c82f2388cf594af33f6203a78b46f8d1a5d71be783d7606517daeca4321130bfb37ee9d1c3ebd70dc2a41f8014469f0f22b180dbe707ee56dfd43cfc4aa
-  data.tar.gz: 490b7d2c7994c846bfba308ba22f71e21362de89c7d4ecc87e5f17905c491c9f158db90fdad8f3ad3033e2f93728ee6c7d5ee20e98358d01b8554a5a9102d579
+  metadata.gz: e364680b74013a0c40c0f10f1bfb008fcd79273e2be3b94ac1ca60fa6ffae78927115fa1bf8c1ce26b1e68d31780515527dfb36e958badfe68d5c825af167964
+  data.tar.gz: a747a61fe39467eb57c0f7edf4742dad4a49eda842398b92deaf32a678c2e40a3e3a119367d5c3c37d4814425309a65082968bf23327c5d3275934be3bbcf57e

data/app/models/user.rb

@@ -1,4 +1,41 @@
 class User < ApplicationRecord
-    # Get the minimum password length from the Environemnt or set it to 8
-    devise :database_authenticatable, :rememberable, :trackable, :timeoutable, :validatable, password_length: ENV.fetch('MIN_PASSWORD_LENGTH', 8).to_i..128, timeout_in: ENV.fetch('SESSION_TIMEOUT_IN_MINUTES', 31).to_i.minutes
+  # Get the minimum password length from the Environemnt or set it to 8
+  devise :database_authenticatable, :rememberable, :trackable, :timeoutable, :validatable, password_length: ENV.fetch('MIN_PASSWORD_LENGTH', 8).to_i..128, timeout_in: ENV.fetch('SESSION_TIMEOUT_IN_MINUTES', 31).to_i.minutes
+
+  # REFERENCES
+  has_many :role_users, dependent: :destroy, inverse_of: :user
+  has_many :roles, through: :role_users, inverse_of: :users
+  # VALIDATIONS
+  validates :email, uniqueness: { case_sensitive: false }, presence: true, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
+  validates :password, presence: true, on: :create
+  validates :password_confirmation, presence: true, on: :create
+  validate :check_password_and_confirmation_equal
+  validates_each :password do |record, attr, value|
+    # Password must contain at least one uppercase letter, one lowercase letter, one number, and one special character or be blank
+    record.errors.add(attr, I18n.t("validation.errors.password_must_contain_uppercase_lowercase_number_special_character")) unless value.blank? || (value =~ /[A-Z]/ && value =~ /[a-z]/ && value =~ /[0-9]/ && value =~ /[^A-Za-z0-9]/)
+  end
+  validates_each :admin do |record, attr, value|
+    # Don't want admin == false if the current user is the only admin
+    record.errors.add(attr, I18n.t("validation.errors.cannot_unadmin_last_admin")) if record.admin_changed? && record.admin_was == true && User.where(admin: true).count == 1
+  end
+  validates_each :locked do |record, attr, value|
+    # Don't want locked == true if the current user is the only admin
+    record.errors.add(attr, I18n.t("validation.errors.cannot_lock_last_admin")) if record.locked_changed? && record.locked_was == false && User.where(locked: false).count == 1
+  end
+  
+  def display_name
+    email
+  end
+  
+  def has_role? role
+    roles.include? role.to_s
+  end
+  
+  def authenticate password
+    self&.valid_password?(password) ? self : nil
+  end
+  
+  def check_password_and_confirmation_equal
+    errors.add(:password, I18n.t("validation.errors.password_and_confirm_must_be_the_same")) unless password == password_confirmation
+  end
 end

data/config/initializers/after_initialize.rb

@@ -3,11 +3,7 @@ Rails.application.configure do
         # In development be sure to load all the namespaces
         # in order to have working reflection
         Zeitwerk::Loader.eager_load_all if Rails.env.development?
-
-        # Devise.timeout_in = ENV.fetch('SESSION_TIMEOUT_IN_MINUTES', 31).to_i.minutes
-        # Devise.password_length = ENV.fetch('MIN_PASSWORD_LENGTH', 8).to_i..128
         
         Ability.send(:include, ThecoreAuthCommonsCanCanCanConcern)
-        User.send(:include, ThecoreAuthCommonsUserConcern)
     end
 end

data/lib/thecore_auth_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreAuthCommons
-  VERSION = "3.3.1".freeze
+  VERSION = "3.3.2".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: thecore_auth_commons
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Gabriele Tassoni
 bindir: bin
 cert_chain: []
-date: 2025-03-05 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -191,7 +191,6 @@ files:
 - config/initializers/add_to_db_migrations.rb
 - config/initializers/after_initialize.rb
 - config/initializers/concern_cancancan.rb
-- config/initializers/concern_user.rb
 - config/locales/en.permissions.yml
 - config/locales/en.thecore_auth_commons.yml
 - config/locales/it.permissions.yml

data/config/initializers/concern_user.rb

@@ -1,42 +0,0 @@
-module ThecoreAuthCommonsUserConcern
-  extend ActiveSupport::Concern
-
-  included do
-    # REFERENCES
-    has_many :role_users, dependent: :destroy, inverse_of: :user
-    has_many :roles, through: :role_users, inverse_of: :users
-    # VALIDATIONS
-    validates :email, uniqueness: { case_sensitive: false }, presence: true, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i }
-    validates :password, presence: true, on: :create
-    validates :password_confirmation, presence: true, on: :create
-    validate :check_password_and_confirmation_equal
-    validates_each :password do |record, attr, value|
-      # Password must contain at least one uppercase letter, one lowercase letter, one number, and one special character or be blank
-      record.errors.add(attr, I18n.t("validation.errors.password_must_contain_uppercase_lowercase_number_special_character")) unless value.blank? || (value =~ /[A-Z]/ && value =~ /[a-z]/ && value =~ /[0-9]/ && value =~ /[^A-Za-z0-9]/)
-    end
-    validates_each :admin do |record, attr, value|
-      # Don't want admin == false if the current user is the only admin
-      record.errors.add(attr, I18n.t("validation.errors.cannot_unadmin_last_admin")) if record.admin_changed? && record.admin_was == true && User.where(admin: true).count == 1
-    end
-    validates_each :locked do |record, attr, value|
-      # Don't want locked == true if the current user is the only admin
-      record.errors.add(attr, I18n.t("validation.errors.cannot_lock_last_admin")) if record.locked_changed? && record.locked_was == false && User.where(locked: false).count == 1
-    end
-    
-    def display_name
-      email
-    end
-    
-    def has_role? role
-      roles.include? role.to_s
-    end
-    
-    def authenticate password
-      self&.valid_password?(password) ? self : nil
-    end
-    
-    def check_password_and_confirmation_equal
-      errors.add(:password, I18n.t("validation.errors.password_and_confirm_must_be_the_same")) unless password == password_confirmation
-    end
-  end
-end