lesli 5.0.3 → 5.0.5

data/app/helpers/lesli/general_helper.rb

@@ -35,7 +35,7 @@ module Lesli
     module GeneralHelper
         # build a url path to change locales
         def language_url(locale)
-            "/language?locale=#{locale}"
+            "/lesli/language?locale=#{locale}"
         end
 
         # return flag code according to locale code

data/app/helpers/lesli/navigation_helper.rb

@@ -32,6 +32,14 @@ Building a better future, one line of code at a time.
 
 module Lesli
     module NavigationHelper
+
+        # Prints a separator line
+        def navigation_separator
+            content_tag(:li) do
+                content_tag(:hr)
+            end
+        end
+
         # Prints a html link inside a list item
         def navigation_item(path, label, icon = nil, reload: false)
             # default vue router links for single page applications
@@ -58,15 +66,9 @@ module Lesli
             end
         end
 
-        # Prints a separator line
-        def navigation_separator
-            content_tag(:li) do
-                content_tag(:hr)
-            end
-        end
-
         # 00.00 System administration
         def navigation_engine_admin(title: "Administration", subtitle: "Users, privileges, access roles.")
+            return unless defined? LesliAdmin
             navigation_engine_item(title, subtitle, "admin", lesli_admin.root_path, controller_path.include?("lesli_admin"))
         end
 
@@ -243,10 +245,10 @@ module Lesli
 
         # 07.02 Help engine
         def navigation_engine_help(title: "Help", subtitle: "Support Ticket System")
-            return unless defined? CloudHelp
+            return unless defined? LesliHelp
 
-            navigation_engine_item(title, subtitle, "help", cloud_help.root_path,
-                                   controller_path.include?("cloud_help"))
+            navigation_engine_item(title, subtitle, "help", lesli_help.root_path,
+                                   controller_path.include?("lesli_help"))
         end
 
         # 07.03 Portal engine
@@ -267,12 +269,11 @@ module Lesli
 
         # SECURITY & PRIVACY
 
-        # 08.01 Vault engine
-        def navigation_engine_vault(title: "Vault", subtitle: "")
-            return unless defined? LesliVault
-
-            navigation_engine_item(title, subtitle, "vault", lesli_vault.root_path,
-                                    controller_path.include?("lesli_vault"))
+        # 08.01 Guard engine
+        def navigation_engine_guard(title: "Guard", subtitle: "Users, privileges and access roles.")
+            return unless defined? LesliGuard
+            navigation_engine_item(title, subtitle, "guard", lesli_guard.root_path,
+                                    controller_path.include?("lesli_guard"))
         end
 
         # 08.03 Audit engine

data/app/lib/lesli/system.rb

@@ -17,17 +17,17 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see http://www.gnu.org/licenses/.
 
-Lesli · Your Smart Business Assistant.
+Lesli · Ruby on Rails SaaS Development Framework.
 
 Made with ♥ by https://www.lesli.tech
 Building a better future, one line of code at a time.
 
 @contact  hello@lesli.tech
-@website  https://lesli.tech
+@website  https://www.lesli.tech
 @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
 
-// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-// ·
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
 =end
 
 module Lesli
@@ -81,6 +81,15 @@ module Lesli
             name.sub("Lesli", "")
         end
 
-        LESLI_ENGINES = ["Lesli", "LesliAdmin", "LesliBabel", "LesliAudit", "LesliBell", "LesliDriver"]
+        LESLI_ENGINES = [
+            "Lesli", 
+            "LesliAdmin", 
+            "LesliBabel", 
+            "LesliAudit", 
+            "LesliBell", 
+            "LesliDriver",
+            "LesliGuard",
+            "LesliHelp"
+        ]
     end
 end

data/app/mailers/lesli/application_lesli_mailer.rb

@@ -75,26 +75,27 @@ module Lesli
 =end
         #after_action :log_mail_requests
 
-        default(template_path: "lesli/emails/devise_mailer")
+        #default(template_path: "lesli/emails/devise_mailer")
 
         def initialize
 
             super
 
             # some @email data is defined on: LesliMails/src/partials/data.html
-            @custom = {}
+            
             @email = {}
-            @data = {}
-            @app = {}
+            @custom = {}
+            @params = {
+                :host => default_url_options[:host] || ""
+            }
 
         end
 
         protected
 
-        def email(data={}, to:, subject:, template_name:) 
+        def email(params={}, user:nil, to:, subject:, template_name:) 
 
-            @app[:host] = default_url_options[:host]
-            @data = @data.merge(data)
+            @params = @params.merge(params)
 
             mail(
                 to: to, 
@@ -106,18 +107,6 @@ module Lesli
 
         private
 
-
-        def build_data_from_params(params, data={})
-
-            # make custom data available in mailer method and mailer template
-            @data = @data.merge(data)
-
-            build_app_from_params(params)
-
-            build_customization_from_params(params)
-
-        end
-
         def build_app_from_params(params)
 
             @app[:host] = default_url_options[:host]

data/app/mailers/lesli/devise_mailer.rb

@@ -1,6 +1,32 @@
 module Lesli
     class DeviseMailer < ApplicationLesliMailer
-        def confirmation_instructions(record, token, opts = {})
+
+        default(template_path: "lesli/emails/devise_mailer")
+
+        # Sends an email with instructions to allow the user reset the password
+        def reset_password_instructions(user, token, opts = {})
+
+            # defaults for new accounts/users
+            email_template = "reset_password_instructions"
+            email_subject = I18n.t("core.users/confirmations.mailer_email_verification")
+
+            # email parameters
+            params = {
+                url: "/password/edit?reset_password_token=#{token}",
+                user_name: user.full_name
+            }
+
+            # send email
+            pp email(
+                params,
+                to: user.email, 
+                subject: email_subject,
+                template_name: email_template
+            )
+        end 
+
+        # Sends an email to allow the user confirm the email address
+        def confirmation_instructions(user, token, opts = {})
 
             # defaults for new accounts/users
             email_template = "confirmation_instructions"
@@ -14,9 +40,9 @@ module Lesli
 
             # Depending on wheter there is a new user or they are changing their email, 
             # one or another field will be used
-            email_recipient = record.unconfirmed_email || record.email
+            email_recipient = user.unconfirmed_email || user.email
 
-            # email custom data
+            # email parameters
             params = {
                 url: "/confirmation?confirmation_token=#{token}"
             }

data/app/models/concerns/account_initializer.rb

@@ -0,0 +1,100 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+=end
+
+module AccountInitializer
+    extend ActiveSupport::Concern
+
+
+    # initialize minimum resources needed for the account
+    def initialize_account
+
+        # create initial descriptors
+        descriptor_owner = self.descriptors.find_or_create_by(name: "owner")
+        descriptor_sysadmin = self.descriptors.find_or_create_by(name: "sysadmin")
+        descriptor_profile = self.descriptors.find_or_create_by(name: "profile")
+
+        # create default roles for the new account
+        owner = self.roles.create({ name: "owner", active: true, object_level_permission: 2147483647 })
+
+        # platform administrator role
+        sysadmin = self.roles.create({ name: "sysadmin", active: true, object_level_permission: 100000 })
+
+        # access only to user profile
+        limited = self.roles.create({ name: "limited", active: true, object_level_permission: 10, path_default: "/administration/profile" })
+
+        # assign descriptors with appropriate privileges
+        owner.powers.create(:descriptor => descriptor_owner)
+        sysadmin.powers.create(:descriptor => descriptor_sysadmin)
+        limited.powers.create(:descriptor => descriptor_profile)
+    end
+
+
+    # initialize engines for new accounts
+    def initialize_engines
+
+        # 01.01 LesliAdmin - Lesli administration area
+        if defined? LesliAdmin
+            if self.admin.blank?
+                self.admin = LesliAdmin::Account.new
+                self.admin.account = self
+                self.admin.save!
+            end
+        end
+
+        # 03.01 LesliDriver - Unified calendar app
+        if defined? LesliDriver
+            if self.driver.blank?
+                self.driver = LesliDriver::Account.new
+                self.driver.account = self
+                self.driver.save!
+            end
+        end
+
+        # 07.02 LesliHelp - Support Ticket System
+        if defined? LesliHelp
+            if self.help.blank?
+                self.help = LesliHelp::Account.new
+                self.help.account = self
+                self.help.save!
+            end
+        end
+
+        # 08.03 LesliAudit - System analytics
+        if defined? LesliAudit
+            if self.audit.blank?
+                self.audit = LesliAudit::Account.new
+                self.audit.account = self
+                self.audit.save!
+            end
+        end
+    end
+end

data/app/models/concerns/{user_guard.rb → user_security.rb}

@@ -33,7 +33,7 @@ Building a better future, one line of code at a time.
 
 # User extension methods
 # Custom methods that belongs to a instance user
-module UserGuard
+module UserSecurity
     extend ActiveSupport::Concern
 
 
@@ -71,14 +71,13 @@ module UserGuard
     #     actions = ["index", "update"]
     #
     #     current_user.has_privileges?(controllers, actions)
-    def has_privileges?(controller, action)
+    def has_privileges_for?(controller, action)
         begin
-            !self.privileges
-            .where("role_privileges.controller = ?", controller)
-            .where("role_privileges.action = ?", action)
-            .first.blank?
+            return !self.privileges
+            .where("lesli_role_privileges.controller = ?", controller)
+            .where("lesli_role_privileges.action = ?", action)
+            .first.blank?            
         rescue => exception
-            #Honeybadger.notify(exception)
             return false
         end
     end
@@ -191,7 +190,7 @@ module UserGuard
         role = role.first
 
         # return the path of the role if is limited to a that specific path
-        return role.path_default_ if role.path_limited == true 
+        return role.path_default if role.path_limited == true 
 
         # return nil if role has no limits
         return nil

data/app/models/lesli/account.rb

@@ -33,6 +33,8 @@ Building a better future, one line of code at a time.
 module Lesli
     class Account < ApplicationLesliRecord
 
+        include AccountInitializer
+
 
         # accounts always belongs to a user
         belongs_to :user, optional: true
@@ -48,10 +50,14 @@ module Lesli
         has_many :locations
         has_many :feedbacks
         has_many :descriptors
-        has_many :activities, class_name: "Account::Activity"
-        has_many :currencies, class_name: "Account::Currency"
+        has_many :activities
+        has_many :currencies
         has_many :logs
 
+        has_one :help, class_name: "LesliHelp::Account"
+        has_one :audit, class_name: "LesliAudit::Account"
+        has_one :admin, class_name: "LesliAdmin::Account"
+        has_one :driver, class_name: "LesliDriver::Account"
 
 
         # account statuses
@@ -77,30 +83,7 @@ module Lesli
 
         # initializers for new accounts
         after_create :initialize_account
+        after_create :initialize_engines
 
-
-        def initialize_account
-
-            # create initial descriptors
-            descriptor_owner = self.descriptors.find_or_create_by(name: "owner")
-            descriptor_sysadmin = self.descriptors.find_or_create_by(name: "sysadmin")
-            descriptor_profile = self.descriptors.find_or_create_by(name: "profile")
-    
-    
-            # create default roles for the new account
-            owner = self.roles.create({ name: "owner", active: true, object_level_permission: 2147483647 })
-    
-            # platform administrator role
-            sysadmin = self.roles.create({ name: "sysadmin", active: true, object_level_permission: 100000 })
-    
-            # access only to user profile
-            limited = self.roles.create({ name: "limited", active: true, object_level_permission: 10, path_default: "/administration/profile" })
-    
-    
-            # assign descriptors with appropriate privileges
-            #owner.descriptors.create(:descriptor => descriptor_owner)
-            #sysadmin.descriptors.create(:descriptor => descriptor_sysadmin)
-            #limited.descriptors.create(:descriptor => descriptor_profile)
-        end
     end
 end

data/app/models/lesli/application_lesli_record.rb

@@ -31,7 +31,8 @@ Building a better future, one line of code at a time.
 =end
 
 module Lesli 
-    class ApplicationLesliRecord < ApplicationRecord
+    class ApplicationLesliRecord < ActiveRecord::Base
         self.abstract_class = true
+        acts_as_paranoid
     end
 end

data/app/models/lesli/descriptor/privilege.rb

@@ -0,0 +1,38 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+=end
+
+module Lesli
+    class Descriptor::Privilege < ApplicationLesliRecord
+        belongs_to :descriptor
+        belongs_to :action, class_name: "SystemController::Action"
+    end
+end

data/app/models/lesli/descriptor.rb

@@ -33,9 +33,26 @@ Building a better future, one line of code at a time.
 module Lesli
     class Descriptor < ApplicationLesliRecord
         belongs_to :account
-        #has_many :privileges
+        has_many :privileges
         #has_many :role_descriptors
+
+        # this scope is needed to allow to join with deleted descriptors
+        # join with deleted descriptors is needed to know which privileges we have to remove from the
+        # role_privileges table when a descriptor is removed from role_describers
+        has_many :role_descriptors_all, -> { with_deleted }, foreign_key: "descriptors_id", class_name: "Role::Descriptor"
         
         validates :name, presence: true
+
+        after_create :initialize_descriptor_privileges
+
+        def initialize_descriptor_privileges
+
+            descriptor_operator = DescriptorPrivilegeOperator.new(self)
+    
+            descriptor_operator.add_profile_privileges(self) if self.name == "profile"
+    
+            descriptor_operator.add_owner_privileges(self) if ["owner", "sysadmin"].include?(self.name)
+    
+        end
     end
 end

data/app/models/lesli/role/power.rb

@@ -0,0 +1,70 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+=end
+
+module Lesli 
+    class Role::Power < ApplicationLesliRecord
+        belongs_to :role
+        belongs_to :descriptor
+
+        after_save :synchronize_privileges
+        after_destroy :synchronize_privileges
+
+        def synchronize_privileges
+            RolePowerOperator.new(self.role.id).synchronize
+        end
+
+        def self.index current_user, query, role
+
+            #role.descriptors
+            Descriptor
+            .joins(:privileges)
+            .left_joins(:role_descriptors)
+            .joins(%(
+                inner join system_controller_actions  
+                on system_controller_actions.id = descriptor_privileges.system_controller_action_id
+            )).joins(%(
+                inner join system_controllers  
+                on system_controllers.id = system_controller_actions.system_controller_id
+            ))
+            .select(
+                "coalesce(role_descriptors.descriptor_id, descriptors.id) as id", 
+                "descriptors.name as name", 
+                "system_controllers.reference as reference", 
+                "system_controllers.route as controller", 
+                #"descriptors.category as action", 
+                "system_controller_actions.name as action", 
+                "system_controllers.engine as engine", 
+                "case when role_descriptors.descriptor_id is null then false else true end as active"
+            )
+        end
+    end
+end

data/app/models/lesli/role/privilege.rb

@@ -0,0 +1,38 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+=end
+
+module Lesli
+    class Role::Privilege < Lesli::ApplicationLesliRecord
+        belongs_to :role
+        has_many   :descriptors
+    end
+end

data/app/models/lesli/role.rb

@@ -32,24 +32,36 @@ Building a better future, one line of code at a time.
 
 module Lesli
     class Role < ApplicationLesliRecord
-
         belongs_to :account
 
-
         # Role resources
         has_many :activities
-        has_many :descriptors, dependent: :delete_all
-        has_many :privileges, class_name: "Role::Privilege", dependent: :delete_all
-        
+        has_many :powers, dependent: :delete_all
+        has_many :privileges,  dependent: :delete_all
+
+        # validations
+        validates :name, presence: :true
+        validates :object_level_permission, presence: :true
 
         # initializers for new roles
         after_create :after_create_role
 
+        # Return a list of roles that the user is able to work with
+        # according to object level permission
+        def self.list(current_user, query, params)
+            current_user.account.roles
+            .where("object_level_permission <= ?", current_user.max_object_level_permission)
+            .order(object_level_permission: :desc, name: :asc)
+            .select(:id, :name, :object_level_permission)
+        end
 
-        # validations
-        validates :name, presence: :true
-        validates :object_level_permission, presence: :true
+        # @return [Boolean]
+        # @description Returns if a role is assigned to users.
+        def has_users?
+            User::Role.where(role: self).count > 0
+        end
 
+        private
 
         def after_create_role
 
@@ -66,13 +78,6 @@ module Lesli
             self.update_attribute("code", role_code)
         end
 
-
-        # @return [Boolean]
-        # @description Returns if a role is assigned to users.
-        def has_users?
-            User::Role.where(role: self).count > 0
-        end
-
         # @return [void]
         # @param current_user [::User] The user that deleted the role
         # @param [Role] The role that was deleted