easy-admin-rails 0.2.5 → 0.2.7

data/lib/generators/easy_admin/permissions/templates/migrations/create_permission_tables.rb

@@ -1,6 +1,6 @@
 class CreateEasyAdminPermissionTables < ActiveRecord::Migration<%= migration_version %>
   def change
-    # Roles table - only table needed, permissions are stored in JSON field
+    # Roles table
     create_table :easy_admin_roles do |t|
       t.string :name, null: false
       t.string :slug, null: false
@@ -13,15 +13,45 @@ class CreateEasyAdminPermissionTables < ActiveRecord::Migration<%= migration_ver
       t.index :active
     end
 
-    # User-Role join table (simplified - no permissions table needed)
+    # User-Role join table with support for scoped and temporary permissions
     create_table :easy_admin_user_roles do |t|
       t.references :user, null: false, foreign_key: true
       t.references :role, null: false, foreign_key: { to_table: :easy_admin_roles }
+      
+      # For scoped permissions (e.g., role applies only to specific organization/project)
+      t.string :context_type
+      t.integer :context_id
+      
+      # For temporary permissions
+      t.datetime :expires_at
+      
+      # Track who granted this role
+      t.integer :granted_by_id
+      
       t.boolean :active, default: true
       t.timestamps
 
-      t.index [:user_id, :role_id], unique: true, name: 'index_easy_admin_user_roles_unique'
+      # Unique constraint for user-role-context combination
+      t.index [:user_id, :role_id, :context_type, :context_id], 
+              unique: true, 
+              name: 'index_easy_admin_user_roles_unique'
+      
+      # Performance indexes
       t.index [:user_id, :active], name: 'index_easy_admin_user_roles_active'
+      t.index [:user_id, :context_type, :context_id], name: 'index_easy_admin_user_roles_context'
+      t.index [:context_type, :context_id], name: 'index_easy_admin_user_roles_on_context'
+      t.index :expires_at
+    end
+    
+    # Add permissions_cache to admin_users if needed
+    unless column_exists?(:easy_admin_admin_users, :permissions_cache)
+      add_column :easy_admin_admin_users, :permissions_cache, :json, default: {}
+      add_index :easy_admin_admin_users, :permissions_cache
+    end
+    
+    # Add role_id to admin_users for default role assignment
+    unless column_exists?(:easy_admin_admin_users, :role_id)
+      add_reference :easy_admin_admin_users, :role, foreign_key: { to_table: :easy_admin_roles }
     end
   end
 end

data/lib/generators/easy_admin/two_factor/templates/README

@@ -0,0 +1,29 @@
+===============================================================================
+
+Two-Factor Authentication has been added to EasyAdmin!
+
+To complete the setup, you'll need to:
+
+1. Install the required gems for 2FA functionality:
+
+   gem 'rotp', '~> 6.3'        # TOTP generation/validation
+   gem 'rqrcode', '~> 2.2'      # QR code generation
+
+2. Run the migration:
+
+   rails db:migrate
+
+3. Restart your server
+
+4. Two-factor authentication is now available in user settings!
+
+Features:
+• Optional 2FA (disabled by default)
+• TOTP-based (compatible with Google Authenticator, Authy, etc.)  
+• QR code setup for easy configuration
+• Backup codes for account recovery
+• Admin can view/manage 2FA status for users
+
+Without the optional gems, 2FA features will be gracefully hidden.
+
+===============================================================================

data/lib/generators/easy_admin/two_factor/templates/migration.rb

@@ -0,0 +1,10 @@
+class AddTwoFactorToEasyAdminAdminUsers < ActiveRecord::Migration[<%= ActiveRecord::VERSION::MAJOR %>.<%= ActiveRecord::VERSION::MINOR %>]
+  def change
+    add_column :easy_admin_admin_users, :otp_secret, :string
+    add_column :easy_admin_admin_users, :otp_required_for_login, :boolean, default: false, null: false
+    add_column :easy_admin_admin_users, :otp_backup_codes, :json
+    add_column :easy_admin_admin_users, :last_otp_at, :datetime
+    
+    add_index :easy_admin_admin_users, :otp_secret, unique: true
+  end
+end

data/lib/generators/easy_admin/two_factor/two_factor_generator.rb

@@ -0,0 +1,22 @@
+require 'rails/generators'
+
+module EasyAdmin
+  module Generators
+    class TwoFactorGenerator < Rails::Generators::Base
+      source_root File.expand_path('templates', __dir__)
+      
+      desc "Add two-factor authentication fields to EasyAdmin AdminUser model"
+
+      def create_migration
+        timestamp = Time.current.utc.strftime("%Y%m%d%H%M%S")
+        migration_file = "#{timestamp}_add_two_factor_to_easy_admin_admin_users.rb"
+        
+        template 'migration.rb', "db/migrate/#{migration_file}"
+      end
+
+      def show_readme
+        readme "README" if behavior == :invoke
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-admin-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Slaurmagan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-04 00:00:00.000000000 Z
+date: 2025-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -261,6 +261,7 @@ files:
 - app/components/easy_admin/fields/show/text_component.rb
 - app/components/easy_admin/fields/show/textarea_component.rb
 - app/components/easy_admin/filters_component.rb
+- app/components/easy_admin/form_layout_component.rb
 - app/components/easy_admin/form_tabs_component.rb
 - app/components/easy_admin/infinite_scroll_component.rb
 - app/components/easy_admin/lazy_chart_card_component.rb
@@ -271,6 +272,10 @@ files:
 - app/components/easy_admin/pagination_component.rb
 - app/components/easy_admin/permissions/user_role_assignment_component.rb
 - app/components/easy_admin/permissions/user_role_permissions_component.rb
+- app/components/easy_admin/profile/change_password_modal_component.rb
+- app/components/easy_admin/profile/profile_tab_component.rb
+- app/components/easy_admin/profile/security_tab_component.rb
+- app/components/easy_admin/profile/settings_component.rb
 - app/components/easy_admin/quick_filters_component.rb
 - app/components/easy_admin/resource_pagination_component.rb
 - app/components/easy_admin/resources/index_component.rb
@@ -286,12 +291,16 @@ files:
 - app/components/easy_admin/sidebar_component.rb
 - app/components/easy_admin/turbo/response_component.rb
 - app/components/easy_admin/turbo/stream_component.rb
+- app/components/easy_admin/two_factor/backup_codes_component.rb
+- app/components/easy_admin/two_factor/setup_component.rb
+- app/components/easy_admin/two_factor/status_component.rb
 - app/components/easy_admin/versions/diff_component.rb
 - app/components/easy_admin/versions/diff_modal_component.rb
 - app/components/easy_admin/versions/history_component.rb
 - app/components/easy_admin/versions/pagination_component.rb
 - app/components/easy_admin/versions/timeline_component.rb
 - app/concerns/easy_admin/resource_versions.rb
+- app/controllers/concerns/easy_admin/two_factor.rb
 - app/controllers/easy_admin/application_controller.rb
 - app/controllers/easy_admin/batch_actions_controller.rb
 - app/controllers/easy_admin/concerns/belongs_to_editing.rb
@@ -304,6 +313,7 @@ files:
 - app/controllers/easy_admin/dashboard_controller.rb
 - app/controllers/easy_admin/dashboards_controller.rb
 - app/controllers/easy_admin/passwords_controller.rb
+- app/controllers/easy_admin/profile_controller.rb
 - app/controllers/easy_admin/registrations_controller.rb
 - app/controllers/easy_admin/resources_controller.rb
 - app/controllers/easy_admin/row_actions_controller.rb
@@ -351,6 +361,7 @@ files:
 - app/javascript/easy_admin/controllers/toggle_switch_controller.js
 - app/javascript/easy_admin/controllers/turbo_stream_redirect.js
 - app/javascript/easy_admin/controllers/version_revert_controller.js
+- app/javascript/easy_admin/controllers/vertical_tabs_controller.js
 - app/models/easy_admin/admin_user.rb
 - app/models/easy_admin/application_record.rb
 - app/policies/admin_user_policy.rb
@@ -366,6 +377,18 @@ files:
 - app/views/easy_admin/dashboards/show.turbo_stream.erb
 - app/views/easy_admin/passwords/edit.html.erb
 - app/views/easy_admin/passwords/new.html.erb
+- app/views/easy_admin/profile/backup_codes_regenerated.turbo_stream.erb
+- app/views/easy_admin/profile/change_password.html.erb
+- app/views/easy_admin/profile/index.html.erb
+- app/views/easy_admin/profile/password_error.turbo_stream.erb
+- app/views/easy_admin/profile/password_invalid_current.turbo_stream.erb
+- app/views/easy_admin/profile/password_updated.turbo_stream.erb
+- app/views/easy_admin/profile/two_factor_backup_codes.html.erb
+- app/views/easy_admin/profile/two_factor_enabled.turbo_stream.erb
+- app/views/easy_admin/profile/two_factor_invalid_code.turbo_stream.erb
+- app/views/easy_admin/profile/two_factor_not_enabled.turbo_stream.erb
+- app/views/easy_admin/profile/two_factor_setup.html.erb
+- app/views/easy_admin/profile/two_factor_unavailable.turbo_stream.erb
 - app/views/easy_admin/registrations/new.html.erb
 - app/views/easy_admin/resources/_redirect.turbo_stream.erb
 - app/views/easy_admin/resources/_table_rows.html.erb
@@ -382,6 +405,8 @@ files:
 - app/views/easy_admin/resources/show.html.erb
 - app/views/easy_admin/resources/update_belongs_to_attached.turbo_stream.erb
 - app/views/easy_admin/sessions/new.html.erb
+- app/views/easy_admin/sessions/two_factor_verification.html.erb
+- app/views/easy_admin/sessions/verify_2fa_error.turbo_stream.erb
 - app/views/easy_admin/settings/_form.html.erb
 - app/views/easy_admin/settings/index.html.erb
 - app/views/layouts/easy_admin/application.html.erb
@@ -401,6 +426,24 @@ files:
 - lib/easy_admin/delete_action.rb
 - lib/easy_admin/engine.rb
 - lib/easy_admin/field.rb
+- lib/easy_admin/layouts.rb
+- lib/easy_admin/layouts/builders/base_layout_builder.rb
+- lib/easy_admin/layouts/builders/form_layout_builder.rb
+- lib/easy_admin/layouts/builders/index_layout_builder.rb
+- lib/easy_admin/layouts/builders/show_layout_builder.rb
+- lib/easy_admin/layouts/dsl.rb
+- lib/easy_admin/layouts/layout_context.rb
+- lib/easy_admin/layouts/nodes/base_node.rb
+- lib/easy_admin/layouts/nodes/divider.rb
+- lib/easy_admin/layouts/nodes/field_node.rb
+- lib/easy_admin/layouts/nodes/grid.rb
+- lib/easy_admin/layouts/nodes/render_node.rb
+- lib/easy_admin/layouts/nodes/root.rb
+- lib/easy_admin/layouts/nodes/section.rb
+- lib/easy_admin/layouts/nodes/spacer.rb
+- lib/easy_admin/layouts/nodes/stubs.rb
+- lib/easy_admin/layouts/nodes/tab.rb
+- lib/easy_admin/layouts/nodes/tabs.rb
 - lib/easy_admin/permissions.rb
 - lib/easy_admin/permissions/component.rb
 - lib/easy_admin/permissions/configuration.rb
@@ -418,12 +461,10 @@ files:
 - lib/easy_admin/resource/configuration.rb
 - lib/easy_admin/resource/dsl.rb
 - lib/easy_admin/resource/field_registry.rb
-- lib/easy_admin/resource/form_builder.rb
-- lib/easy_admin/resource/layout_builder.rb
 - lib/easy_admin/resource/scope_manager.rb
-- lib/easy_admin/resource/show_builder.rb
 - lib/easy_admin/resource_modules.rb
 - lib/easy_admin/resource_registry.rb
+- lib/easy_admin/two_factor_authentication.rb
 - lib/easy_admin/types/json_type.rb
 - lib/easy_admin/version.rb
 - lib/easy_admin/versioning.rb
@@ -436,7 +477,6 @@ files:
 - lib/generators/easy_admin/permissions/install_generator.rb
 - lib/generators/easy_admin/permissions/templates/initializers/permissions.rb
 - lib/generators/easy_admin/permissions/templates/migrations/create_permission_tables.rb
-- lib/generators/easy_admin/permissions/templates/migrations/update_users_for_permissions.rb
 - lib/generators/easy_admin/permissions/templates/models/permission.rb
 - lib/generators/easy_admin/permissions/templates/models/role.rb
 - lib/generators/easy_admin/permissions/templates/models/role_permission.rb
@@ -444,9 +484,6 @@ files:
 - lib/generators/easy_admin/permissions/templates/policies/application_policy.rb
 - lib/generators/easy_admin/permissions/templates/policies/user_policy.rb
 - lib/generators/easy_admin/permissions/templates/seeds/permissions.rb
-- lib/generators/easy_admin/rbac/rbac_generator.rb
-- lib/generators/easy_admin/rbac/templates/add_rbac_to_admin_users.rb
-- lib/generators/easy_admin/rbac/templates/super_admin.rb
 - lib/generators/easy_admin/resource_generator.rb
 - lib/generators/easy_admin/templates/AUTH_README
 - lib/generators/easy_admin/templates/README
@@ -454,6 +491,9 @@ files:
 - lib/generators/easy_admin/templates/devise.rb
 - lib/generators/easy_admin/templates/easy_admin.rb
 - lib/generators/easy_admin/templates/resource.rb
+- lib/generators/easy_admin/two_factor/templates/README
+- lib/generators/easy_admin/two_factor/templates/migration.rb
+- lib/generators/easy_admin/two_factor/two_factor_generator.rb
 - lib/tasks/easy_admin_tasks.rake
 homepage: https://github.com/Slaurmagan/easy-admin
 licenses:

data/lib/easy_admin/resource/form_builder.rb

@@ -1,123 +0,0 @@
-module EasyAdmin
-  module ResourceModules
-    # FormBuilder class for form DSL
-    # Handles all form tab and field definitions within forms
-    class FormBuilder
-      def initialize(resource_class)
-        @resource_class = resource_class
-        @current_tab = nil
-      end
-
-      def tab(name = "General", **options, &block)
-        tab_config = {
-          name: name,
-          label: options[:label] || name,
-          icon: options[:icon],
-          fields: []
-        }
-
-        @current_tab = tab_config
-        @resource_class.add_form_tab(tab_config)
-
-        instance_eval(&block) if block_given?
-        @current_tab = nil
-      end
-
-      # Field definition methods within tabs - delegate to resource
-      def field(name, type = :string, **options)
-        field_config = @resource_class.build_field_config(name, type, **options)
-
-        if @current_tab
-          @current_tab[:fields] << field_config
-        end
-
-        # Also add to main fields_config for compatibility
-        @resource_class.add_field_to_registry(field_config)
-      end
-
-      # Convenience methods for form fields
-      def text_field(name, **options)
-        field(name, :string, **options)
-      end
-
-      def textarea_field(name, **options)
-        field(name, :text, **options)
-      end
-
-      def number_field(name, **options)
-        field(name, :number, **options)
-      end
-
-      def email_field(name, **options)
-        field(name, :email, **options)
-      end
-
-      def date_field(name, **options)
-        field(name, :date, **options)
-      end
-
-      def datetime_field(name, **options)
-        field(name, :datetime, **options)
-      end
-
-      def boolean_field(name, **options)
-        field(name, :boolean, **options)
-      end
-
-      def select_field(name, options:, **other_options)
-        field(name, :select, options: options, **other_options)
-      end
-
-      def belongs_to_field(name, **options)
-        field(name, :belongs_to, **options)
-      end
-
-      def has_many_field(name, **options)
-        field(name, :has_many, **options)
-      end
-
-      def file_field(name, **options)
-        field(name, :file, **options)
-      end
-
-      def json_field(name, **options)
-        field(name, :json, **options)
-      end
-
-      def password_field(name = :password, **options)
-        field(name, :password, **options)
-        field("#{name}_confirmation".to_sym, :password, 
-              label: options[:confirmation_label] || "Confirm #{name.to_s.humanize}",
-              **options.except(:confirmation_label))
-      end
-
-      # Support for rendering custom components in forms
-      def render(component_class_or_instance, **options)
-        content_config = {
-          type: :custom_component,
-          component_class: component_class_or_instance.class,
-          component_options: options,
-          component_instance: component_class_or_instance
-        }
-        
-        if @current_tab
-          @current_tab[:fields] << content_config
-        end
-        
-        component_class_or_instance
-      end
-
-      # Support for custom content blocks in forms  
-      def content(&block)
-        content_config = {
-          type: :custom_content,
-          block: block
-        }
-        
-        if @current_tab
-          @current_tab[:fields] << content_config
-        end
-      end
-    end
-  end
-end

data/lib/easy_admin/resource/layout_builder.rb

@@ -1,249 +0,0 @@
-module EasyAdmin
-  module ResourceModules
-    # LayoutBuilder module for handling form and show layout configuration
-    # Manages form tabs and show page layout elements
-    module LayoutBuilder
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :form_tabs_config, :show_layout_config
-
-        def self.initialize_layout_builder
-          self.form_tabs_config = []
-          self.show_layout_config = []
-        end
-      end
-
-      class_methods do
-        # Form tabs management
-        def add_form_tab(tab_config)
-          self.form_tabs_config = (self.form_tabs_config || []) + [tab_config]
-        end
-
-        def form_tabs
-          form_tabs_config
-        end
-
-        def has_form_tabs?
-          form_tabs_config.any?
-        end
-
-        def clear_form_tabs
-          self.form_tabs_config = []
-        end
-
-        # Show layout management
-        def add_show_layout_element(element_config)
-          self.show_layout_config = (self.show_layout_config || []) + [element_config]
-        end
-
-        def show_layout
-          show_layout_config
-        end
-
-        def has_show_layout?
-          show_layout_config.any?
-        end
-
-        def clear_show_layout
-          self.show_layout_config = []
-        end
-
-        # Form tab utilities
-        def find_form_tab(tab_name)
-          form_tabs_config.find { |tab| tab[:name].to_s == tab_name.to_s }
-        end
-
-        def form_tab_names
-          form_tabs_config.map { |tab| tab[:name] }
-        end
-
-        def form_tab_fields(tab_name)
-          tab = find_form_tab(tab_name)
-          tab ? tab[:fields] : []
-        end
-
-        def total_form_tabs_count
-          form_tabs_config.count
-        end
-
-        # Show layout utilities
-        def show_layout_rows
-          show_layout_config.select { |element| element[:type] == :row }
-        end
-
-        def show_layout_elements_count
-          count = 0
-          show_layout_config.each do |element|
-            count += count_nested_elements(element)
-          end
-          count
-        end
-
-        def find_show_layout_element(element_type)
-          find_element_in_layout(show_layout_config, element_type)
-        end
-
-        def has_show_layout_tabs?
-          find_show_layout_element(:tabs).present?
-        end
-
-        def has_show_layout_cards?
-          find_show_layout_element(:card).present?
-        end
-
-        def has_metric_cards?
-          find_show_layout_element(:metric_card).present?
-        end
-
-        def has_chart_cards?
-          find_show_layout_element(:chart_card).present?
-        end
-
-        # Layout validation
-        def validate_form_structure
-          errors = []
-          
-          if has_form_tabs?
-            form_tabs_config.each_with_index do |tab, index|
-              unless tab[:name].present?
-                errors << "Form tab at index #{index} is missing a name"
-              end
-              
-              unless tab[:fields].is_a?(Array)
-                errors << "Form tab '#{tab[:name]}' fields must be an array"
-              end
-            end
-          end
-          
-          errors
-        end
-
-        def validate_show_layout_structure
-          errors = []
-          
-          show_layout_config.each_with_index do |element, index|
-            case element[:type]
-            when :row
-              unless element[:columns].is_a?(Array)
-                errors << "Row at index #{index} must have columns array"
-              end
-              
-              if element[:columns].empty?
-                errors << "Row at index #{index} cannot have empty columns"
-              end
-            when :column
-              unless element[:elements].is_a?(Array)
-                errors << "Column at index #{index} must have elements array"
-              end
-            end
-          end
-          
-          errors
-        end
-
-        # Layout rebuild methods
-        def rebuild_form_from_fields
-          return if fields_config.empty?
-          
-          # Create a default tab with all non-readonly fields
-          default_tab = {
-            name: "General",
-            label: "General",
-            icon: nil,
-            fields: fields_config.reject { |field| field[:readonly] }
-          }
-          
-          self.form_tabs_config = [default_tab]
-        end
-
-        def rebuild_show_layout_from_fields
-          return if fields_config.empty?
-          
-          # Create a simple single-column layout with all fields
-          row_config = {
-            type: :row,
-            columns_count: 1,
-            spacing: "medium",
-            columns: [{
-              type: :column,
-              size: 12,
-              elements: [{
-                type: :card,
-                title: "Details",
-                color: "light",
-                padding: "medium",
-                shadow: "small",
-                elements: fields_config.map { |field|
-                  {
-                    type: :field,
-                    name: field[:name],
-                    label: field[:label],
-                    field_type: :default,
-                    format: field[:format],
-                    css_classes: nil,
-                    show_label: true
-                  }
-                }
-              }]
-            }]
-          }
-          
-          self.show_layout_config = [row_config]
-        end
-
-        private
-
-        def count_nested_elements(element)
-          count = 1
-          
-          case element[:type]
-          when :row
-            element[:columns]&.each { |column| count += count_nested_elements(column) }
-          when :column
-            element[:elements]&.each { |child| count += count_nested_elements(child) }
-          when :card
-            element[:elements]&.each { |child| count += count_nested_elements(child) }
-          when :tabs
-            element[:tabs]&.each { |tab| count += count_nested_elements(tab) }
-          when :tab
-            element[:elements]&.each { |child| count += count_nested_elements(child) }
-          end
-          
-          count
-        end
-
-        def find_element_in_layout(layout, element_type)
-          layout.each do |element|
-            return element if element[:type] == element_type
-            
-            case element[:type]
-            when :row
-              element[:columns]&.each do |column|
-                found = find_element_in_layout([column], element_type)
-                return found if found
-              end
-            when :column, :card
-              if element[:elements]
-                found = find_element_in_layout(element[:elements], element_type)
-                return found if found
-              end
-            when :tabs
-              element[:tabs]&.each do |tab|
-                found = find_element_in_layout([tab], element_type)
-                return found if found
-              end
-            when :tab
-              if element[:elements]
-                found = find_element_in_layout(element[:elements], element_type)
-                return found if found
-              end
-            end
-          end
-          
-          nil
-        end
-      end
-    end
-  end
-end