thecore_auth_commons 2.3.0 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 502bc9400ed04c0c637b9298e1997c8f310535d76edb06324bf495b044e32267
-  data.tar.gz: bc1d951e09c235f4907a6f67bf287fdb3d4703f47b4b32c4662e0d2b2b95c337
+  metadata.gz: 82192c45c694161639f30330e90570d71caa1e768cf294deb07fbd488291ebe5
+  data.tar.gz: 0b7719cc7d0ea1658a65904fbef7fadd940d57334db04f9794168ebdc9fde61f
 SHA512:
-  metadata.gz: 4cad4cd8fb0864c65afb9b14dfcafe7f89209f8607d608de029ed8128f470f42c57c6dcdee1aa0bc2706e4f42a83119ce7c3e87dd50e47fdea316b90ae4a3729
-  data.tar.gz: 9de160e2037cae69e75dd41a520b6bad75ab7445136a337328288dd3bcd3e1e15cbd91e0bfd080a7232908f57958cf658df298068052bb9cb0164d267fbf87ab
+  metadata.gz: 6e1885d41fda299bc79545e5fc038cd99478360f80c5a7d558dd217bfcc1a5d9daa1cf05eec09725959d8661795861c3380def8eec5e6b1ffce6b5b0cb09df5e
+  data.tar.gz: 962787a67397861a5849b440f5df1a67adaa50e534de7ff58e5af50740b2b099b387bfa2e1f1d8fb3fd33aa94c67f6e56257fe2ab110763b131e882d24a47e95

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/20200518082821_create_permissions.rb

@@ -1,32 +1,31 @@
 class CreatePermissions < ActiveRecord::Migration[6.0]
   def change
-    @values = {
-      predicates: %i[can cannot],
-      actions: %i[manage create read update destroy],
-      targets: ApplicationRecord.subclasses.map {|d| d.to_s.underscore}.to_a.unshift(:all)
-    }
-
-    def create_and_fill table
-      create_table table do |t|
-        t.string :name
-        t.bigint :lock_version
+    # Predicates
+    create_table :predicates do |t|
+      t.string :name
+      t.bigint :lock_version
 
-        t.timestamps
-      end
-      add_index table, :name, unique: true
-      model = table.to_s.classify.constantize
-      model.reset_column_information
-      model.upsert_all @values[table].map { |p| {name: p, created_at: Time.now, updated_at: Time.now} }, unique_by: [:name]
+      t.timestamps
     end
-
-    # Predicates
-    create_and_fill :predicates
+    add_index :predicates, :name, unique: true
     
     # Actions
-    create_and_fill :actions
+    create_table :actions do |t|
+      t.string :name
+      t.bigint :lock_version
+
+      t.timestamps
+    end
+    add_index :actions, :name, unique: true
     
     # Targets
-    create_and_fill :targets
+    create_table :targets do |t|
+      t.string :name
+      t.bigint :lock_version
+
+      t.timestamps
+    end
+    add_index :targets, :name, unique: true
 
     create_table :permissions do |t|
       t.references :predicate, null: false, foreign_key: true

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

@@ -0,0 +1,27 @@
+puts "Loading ThecoreAuthCommons seeds"
+email = ENV["ADMIN_EMAIL"].presence || "admin@example.com"
+psswd = ENV["ADMIN_PASSWORD"].presence || "changeme"
+
+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
+
+@values = {
+    predicates: %i[can cannot],
+    actions: %i[manage create read update destroy],
+    targets: ApplicationRecord.subclasses.map {|d| d.to_s.underscore}.to_a.unshift(:all)
+}
+
+def fill table
+    model = table.to_s.classify.constantize
+    model.reset_column_information
+    model.upsert_all @values[table].map { |p| {name: p, created_at: Time.now, updated_at: Time.now} }, unique_by: [:name]
+end
+
+fill :predicates
+fill :actions
+fill :targets

data/lib/tasks/thecore_auth_commons_tasks.rake

@@ -2,3 +2,13 @@
 # task :thecore_auth_commons do
 #   # Task goes here
 # end
+namespace :thecore do
+    namespace :db do
+        desc "Load seeds from thecore engines seed files, it also runs rails db:seed as last action"
+        task seed: :environment do
+            Thecore::Base.thecore_engines.each { |engine| engine.send :load_seed }
+            Rake::Task["db:seed"].reenable
+            Rake::Task["db:seed"].invoke
+        end
+    end
+end

data/lib/thecore_auth_commons.rb

@@ -8,3 +8,12 @@ require "thecore_auth_commons/engine"
 module ThecoreAuthCommons
   # Your code goes here...
 end
+
+module Thecore
+  class Base
+    @@thecore_engines = []
+    def self.thecore_engines
+      @@thecore_engines
+    end
+  end
+end

data/lib/thecore_auth_commons/engine.rb

@@ -1,6 +1,11 @@
 module ThecoreAuthCommons
   class Engine < ::Rails::Engine
+    # https://stackoverflow.com/questions/12161376/rails-3-2-adding-seed-tasks-from-a-mountable-engine
+
     initializer 'thecore_auth_commons.add_to_migrations' do |app|
+      # Adds the list of Thecore Engines, so to manage seeds loading, i.e.:
+      # Thecore::Base.thecore_engines.each { |engine| engine.load_seed }
+      Thecore::Base.thecore_engines << self.class
       unless app.root.to_s.match root.to_s
         # APPEND TO MAIN APP MIGRATIONS FROM THIS GEM
         config.paths['db/migrate'].expanded.each do |expanded_path|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_auth_commons
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.5
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-05-28 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
@@ -114,13 +108,14 @@ files:
 - config/routes.rb
 - db/migrate/20200306143408_create_users.rb
 - db/migrate/20200306151046_add_admin_field_to_user.rb
-- db/migrate/20200306151541_add_first_admin_user.rb
 - db/migrate/20200306152740_create_roles.rb
 - db/migrate/20200306152816_create_role_users.rb
 - db/migrate/20200306153125_add_lock_version_to_user.rb
 - 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
 - lib/thecore_auth_commons.rb
@@ -147,7 +142,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.

data/db/migrate/20200306151541_add_first_admin_user.rb

@@ -1,60 +0,0 @@
-class AddFirstAdminUser < ActiveRecord::Migration[6.0]
-  class User < ApplicationRecord
-    # Include default devise modules. Others available are:
-    # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
-    devise :database_authenticatable, :trackable, :validatable
-    # TODO: If it works, these must be added to another gem one which deal 
-    # more with sessions
-    # devise :database_authenticatable
-    # devise :rememberable
-    # devise :trackable
-    # devise :validatable
-    # devise :timeoutable, timeout_in: 30.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 :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
-  
-    def display_name
-      email
-    end
-  
-    def has_role? role
-      roles.include? role
-    end
-  
-    protected
-  
-    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
-
-  def up
-    email = "admin@example.com"
-    User.reset_column_information
-    u=User.find_or_initialize_by(email: email)
-    psswd = SecureRandom.hex(5)
-    u.password = psswd
-    u.password_confirmation = psswd
-    u.admin = true
-    u.save!
-    puts "\nPlease find generated initial admin password in .passwords file."
-    File.open('.passwords', 'w') do |f|
-      f.write(psswd)
-    end
-  end
-
-  def down
-    email = "admin@example.com"
-    User.find_by(email: email).destroy
-  end
-end