thecore_auth_commons 2.3.4 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef336ba07dfb2b7045b03c7c6ddd046cc57f9494563917a728877f9ee2830191
-  data.tar.gz: e71c6255f11bca1c7c625e0eaf150d5ece5a38104285be9d15f3b7a95fdd3b3c
+  metadata.gz: 7cc83c087063b265fbfe2abdb852b0f494c194dff7964d55cab60a181f4e7ead
+  data.tar.gz: f2cee22705f90cef98d2d4b3a7d716835f67a356ff1c7c5a0856568d673b8627
 SHA512:
-  metadata.gz: a5d025b7c10645755d7e550da428eff612e2fb8e671eeef0c0f711d725b7086312b63053e5880d75ec897ce82e177a56c6090786b9ba53b1cedd8f039f459c6a
-  data.tar.gz: 037a7431dd095a9cd2452847aab62e08d7d7e34a643a1bb2b49870ff01d81dbbcef64ad740c08efab5e8c27abe7741c1dd1ca979a72816903763baf7a5395010
+  metadata.gz: 4375e7e47cdb1a6655b810d71d762f7c9173f732d3fdc3b3016e1ae8f7ff3578940a424ea7b6a498f3a6c41f177737d53a1c622c45d5ce7fe2aba61dffa0b8b2
+  data.tar.gz: 63be69b8c6df27abc45de8f9b091550d4a99a48d24bf5f525e6b93aa927cb0676823937a66d333da537428ab21466e5e5dce84a7fd5bd0d13a0ac290a72b1fc4

data/app/models/user.rb

@@ -10,7 +10,15 @@ class User < ApplicationRecord
   # devise :rememberable
   # devise :trackable
   # devise :validatable
-  # devise :timeoutable, timeout_in: 30.minutes 
+  # devise :timeoutable, timeout_in: 30.minutes
+          
+  before_validation on: :create do
+    # If the generated uuid is not already present, then create the user with the proposed uuid
+    # Otherwise, try to generate another one
+    begin
+        self.access_token = SecureRandom.uuid #urlsafe_base64(32)
+    end while ::User.exists?(access_token: self.access_token)
+  end
   # REFERENCES
   has_many :role_users, dependent: :destroy, inverse_of: :user
   has_many :roles, through: :role_users, inverse_of: :users
@@ -19,6 +27,7 @@ class User < ApplicationRecord
   validates :password, presence: true, on: :create
   validates :password_confirmation, presence: true, on: :create
   validate :check_password_and_confirmation_equal
+  validates :access_token, uniqueness: true
   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

data/db/migrate/20210415154152_add_access_token_to_user.rb

@@ -0,0 +1,5 @@
+class AddAccessTokenToUser < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :access_token, :uuid
+  end
+end

data/db/seeds.rb

@@ -10,6 +10,16 @@ unless User.where(admin: true).exists?
     u.save(validate: false)
 end
 
+# If there are previous users without the access_token, create it:
+User.all.each do |u|
+    if u.access_token.blank?
+        begin
+            u.access_token = SecureRandom.uuid #urlsafe_base64(32)
+        end while ::User.exists?(access_token: u.access_token)
+        u.save(validate: false)
+    end
+end
+
 @values = {
     predicates: %i[can cannot],
     actions: %i[manage create read update destroy],

data/lib/thecore_auth_commons.rb

@@ -1,6 +1,8 @@
 require 'devise'
 require 'cancancan'
 require 'kaminari'
+require 'activerecord-nulldb-adapter'
+require 'active_record/hierarchical_query'
 require 'abilities/thecore_auth_commons'
 
 require "thecore_auth_commons/engine"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_auth_commons
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.9
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: activerecord-nulldb-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: activerecord-hierarchical_query
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +142,7 @@ files:
 - db/migrate/20200306153136_add_lock_version_to_role.rb
 - db/migrate/20200516215346_add_locked_to_user.rb
 - db/migrate/20200518082821_create_permissions.rb
+- db/migrate/20210415154152_add_access_token_to_user.rb
 - db/seeds.rb
 - lib/abilities/thecore_auth_commons.rb
 - lib/tasks/thecore_auth_commons_tasks.rake
@@ -141,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Common Auth methods and models to be used in thecore components.