thecore_auth_commons 2.3.2 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7820a25717ab5c4d9ff19a5dea6e7ab02c54a497348eef6d27e53dc459204f4
-  data.tar.gz: 22775ef09abefa8bbe2cbdbff7dc3d3e48a097153bd3af1f73ab584d149e9dab
+  metadata.gz: 50b41bd961e584ec0ec2aa0e47ac5d7ec17671c7f523559dd928c4cc76e9694e
+  data.tar.gz: fe1566aeab26f20fd8194cf49017536c4cfde26ac6ef7c2dcc45bef544db2fd5
 SHA512:
-  metadata.gz: cbf7e8777abfdbea0deee34773d812a1dca5adc48dfcb3a5bacda983f489c18cd0cff586c6dad777ed59a1b0ccca3988296bddb12c9262d03bd4a20b3a44e163
-  data.tar.gz: ade3d82b997977aa4710e89ee9d77fda100b4c9ea2de2c812898afaa774c9936634b4b3218e1ee05ab11c8624113eb9d0e494b38f2b93d4274ca4812144cb178
+  metadata.gz: c2a6cfbd265adbc2f8e3e6293b02bf7ef06e69b092f33db4e89a7b4ee4bf525d8dd8c4c35172b64f84e8238c00a77e3368093c2c427d71ae5a349af9363c5652
+  data.tar.gz: a99b60ded5a87765de4a2a03d570de6d13463d8b7d7d81593ac42ca8da89317d2b548b15fba34a495b7614f8e79a28180f3c1d7da26b5f3cccb57380e72ce46e

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

@@ -2,12 +2,23 @@ puts "Loading ThecoreAuthCommons seeds"
 email = ENV["ADMIN_EMAIL"].presence || "admin@example.com"
 psswd = ENV["ADMIN_PASSWORD"].presence || "changeme"
 
-u = User.find_or_initialize_by(email: email)
-u.username = "Administrator"
-u.password = u.password_confirmation = psswd
-u.admin = true
-u.save(validate: false)
+unless User.where(admin: true).exists?
+    u = User.find_or_initialize_by(email: email)
+    u.username = "Administrator"
+    u.password = u.password_confirmation = psswd
+    u.admin = true
+    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: self.access_token)
+        u.save(validate: false)
+    end
+end
 
 @values = {
     predicates: %i[can cannot],

data/lib/thecore_auth_commons.rb

@@ -1,6 +1,7 @@
 require 'devise'
 require 'cancancan'
 require 'kaminari'
+require 'activerecord-nulldb-adapter'
 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.2
+  version: 2.3.7
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.2.1
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +66,20 @@ 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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +128,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
@@ -147,7 +156,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.