lesli 5.0.5 → 5.0.6

data/app/controllers/lesli/system_controllers_controller.rb

@@ -0,0 +1,63 @@
+=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 SystemControllersController < ApplicationLesliController
+        before_action :set_system_controller, only: [:show, :update, :destroy]
+
+        # GET /system_controllers
+        def index
+            respond_to do |format|
+                format.html {}
+                format.json do
+                    respond_with_successful(Lesli::SystemController.index())
+                end
+            end
+        end
+
+        def options 
+            respond_to do |format|
+                format.html {}
+                format.json do
+                    respond_with_successful(SystemController.options(current_user, @query))
+                end
+            end
+        end 
+
+        private
+
+        # Only allow a list of trusted parameters through.
+        def system_controller_params
+            []
+        end
+    end
+end

data/app/controllers/users/sessions_controller.rb

@@ -109,7 +109,8 @@ class Users::SessionsController < Devise::SessionsController
 
         # respond successful and send the path user should go
         #respond_with_successful({ default_path: user.has_role_with_default_path?() })
-        respond_with_successful({ default_path: "/" })
+        respond_with_successful({ default_path: Lesli.config.path_after_login || "/" })
+
     end
 
     private 

data/app/helpers/lesli/navigation_helper.rb

@@ -140,12 +140,12 @@ module Lesli
                                    controller_path.include?("cloud_focus"))
         end
 
-        # 03.05 Text engine
-        def navigation_engine_text(title: "Text", subtitle: "cloud_text/text-logo.svg")
-            return unless defined? CloudText
+        # 03.05 Letter engine
+        def navigation_engine_letter(title: "Letter", subtitle: "Notes & Notebooks")
+            return unless defined? LesliLetter
 
-            navigation_engine_item(title, subtitle, "text", cloud_text.root_path,
-                                   controller_path.include?("cloud_text"))
+            navigation_engine_item(title, subtitle, "letter", lesli_letter.root_path,
+                                   controller_path.include?("lesli_letter"))
         end
 
         # 03.07 Social engine
@@ -244,11 +244,11 @@ module Lesli
         end
 
         # 07.02 Help engine
-        def navigation_engine_help(title: "Help", subtitle: "Support Ticket System")
-            return unless defined? LesliHelp
+        def navigation_engine_support(title: "Support", subtitle: "Support Ticket System")
+            return unless defined? LesliSupport
 
-            navigation_engine_item(title, subtitle, "help", lesli_help.root_path,
-                                   controller_path.include?("lesli_help"))
+            navigation_engine_item(title, subtitle, "support", lesli_support.root_path,
+                                   controller_path.include?("lesli_support"))
         end
 
         # 07.03 Portal engine

data/app/lib/lesli/system.rb

@@ -89,7 +89,8 @@ module Lesli
             "LesliBell", 
             "LesliDriver",
             "LesliGuard",
-            "LesliHelp"
+            "LesliLetter",
+            "LesliSupport"
         ]
     end
 end

data/app/models/concerns/account_initializer.rb

@@ -52,9 +52,9 @@ module AccountInitializer
         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)
+        owner.powers.create(:descriptor => descriptor_owner, :plist => true, :pindex => true, :pshow => true, :pcreate => true, :pcreate => true, :pupdate => true, :pdestroy => true)
+        sysadmin.powers.create(:descriptor => descriptor_sysadmin, :plist => true, :pindex => true, :pshow => true, :pcreate => true, :pcreate => true, :pupdate => true, :pdestroy => true)
+        limited.powers.create(:descriptor => descriptor_profile, :plist => true, :pindex => true, :pshow => true, :pcreate => true, :pcreate => true, :pupdate => true, :pdestroy => true)
     end
 
 
@@ -79,6 +79,24 @@ module AccountInitializer
             end
         end
 
+        # 03.05 LesliNotes - Notes & Notebooks
+        if defined? LesliLetter
+            if self.letter.blank?
+                self.letter = LesliLetter::Account.new
+                self.letter.account = self
+                self.letter.save!
+            end
+        end
+
+        # 05.02 LesliAudit - System analytics
+        if defined? LesliAudit
+            if self.audit.blank?
+                self.audit = LesliAudit::Account.new
+                self.audit.account = self
+                self.audit.save!
+            end
+        end
+
         # 07.02 LesliHelp - Support Ticket System
         if defined? LesliHelp
             if self.help.blank?
@@ -88,12 +106,12 @@ module AccountInitializer
             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!
+        # 08.01 LesliGuard - Security Management Module
+        if defined? LesliGuard
+            if self.guard.blank?
+                self.guard = LesliGuard::Account.new
+                self.guard.account = self
+                self.guard.save!
             end
         end
     end

data/app/models/concerns/user_extensions.rb

@@ -101,14 +101,16 @@ module UserExtensions
     #      locale = User.last.locle
     #      will print something like: :es
     def locale
-        user_locale = settings.find_by(name: "locale")
+        user_locale = self.settings.find_by(name: "locale")
 
-        if user_locale
-            return user_locale.value.to_sym
-        end
+        # return the desire locale by the user
+        return user_locale.value.to_sym if user_locale
+
+        # create a desire locale if the record does not exist 
+        self.settings.create_with(:value => I18n.locale).find_or_create_by(:name => "locale")
 
-        # return current locale
-        I18n.locale 
+        # reevaluate
+        self.locale()
     end
 
 

data/app/models/concerns/user_security.rb

@@ -111,7 +111,7 @@ module UserSecurity
     def can_work_with_role?(role)
 
         # get the role if only id is given
-        role = self.account.roles.find_by(:id => role) unless role.class.name == "Role"
+        role = self.account.roles.find_by(:id => role) unless role.class.name == "Lesli::Role"
 
         # false if role not found
         return false if role.blank?

data/app/models/lesli/account.rb

@@ -32,7 +32,6 @@ Building a better future, one line of code at a time.
 
 module Lesli
     class Account < ApplicationLesliRecord
-
         include AccountInitializer
 
 
@@ -54,10 +53,13 @@ module Lesli
         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"
+        has_one :letter, class_name: "LesliLetter::Account"
+        has_one :guard, class_name: "LesliGuard::Account"
 
 
         # account statuses

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

@@ -34,5 +34,6 @@ module Lesli
     class Descriptor::Privilege < ApplicationLesliRecord
         belongs_to :descriptor
         belongs_to :action, class_name: "SystemController::Action"
+        belongs_to :system_controller_action, class_name: "SystemController::Action", foreign_key: "action_id"
     end
 end

data/app/models/lesli/descriptor.rb

@@ -34,7 +34,6 @@ module Lesli
     class Descriptor < ApplicationLesliRecord
         belongs_to :account
         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
@@ -43,14 +42,12 @@ module Lesli
         
         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

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

@@ -35,11 +35,11 @@ module Lesli
         belongs_to :role
         belongs_to :descriptor
 
-        after_save :synchronize_privileges
-        after_destroy :synchronize_privileges
+        after_commit :synchronize_privileges
+        #after_destroy :synchronize_privileges
 
         def synchronize_privileges
-            RolePowerOperator.new(self.role.id).synchronize
+            RoleDescriptorOperator.new(self.role.id).synchronize
         end
 
         def self.index current_user, query, role

data/app/models/lesli/user/session.rb

@@ -17,7 +17,7 @@ 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 Development Platform.
+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.
@@ -27,7 +27,7 @@ Building a better future, one line of code at a time.
 @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-// ·
+// · 
 =end
 
 require "bcrypt"
@@ -40,13 +40,13 @@ module Lesli
 
         enum session_sources: {
             dispatcher_standar_session: "dispatcher_standar_session",
-            devise_standar_session: "devise_standar_session",
+            devise_standard_session: "devise_standar_session",
             cloud_shared_public: "cloud_shared_public",
         }
 
         def set_session_token
 
-            return if self.session_source == "devise_standar_session"
+            return if self.session_source == "devise_standard_session"
 
             return unless self.session_token.blank?
 
@@ -67,29 +67,6 @@ module Lesli
 
         end
 
-        def self.index(current_user, query, params, current_session_id)
-            user_id = params[:user_id]
-
-            User::Session.all
-            .joins(:user)
-            .where(user_id: user_id)
-            .where("users.account_id = ?", current_user.account.id)
-            .where("expiration_at > ? or expiration_at is ?", Time.now.utc, nil)
-            .select(
-                :id,
-                :user_agent,
-                :session_source,
-                Date2.new.date_time.db_timestamps("user_sessions"),
-                Date2.new.date_time.db_column("expiration_at"),
-                Date2.new.date_time.db_column("last_used_at"),
-                "case when #{current_session_id} = user_sessions.id then true else false end as current_session"
-            )
-            .page(query[:pagination][:page])
-            .per(query[:pagination][:perPage])
-            .order(updated_at: :desc)
-
-        end
-
         def active?
             if self.deleted_at.present?
                 return false

data/app/models/lesli/user.rb

@@ -32,7 +32,6 @@ Building a better future, one line of code at a time.
 
 module Lesli
     class User < ApplicationLesliRecord
-
         include UserSecurity
         include UserExtensions
         #include UserActivities
@@ -88,7 +87,7 @@ module Lesli
 
         # callbacks
         before_create :before_create_user
-        #after_create :after_confirmation_user, if: :confirmed?
+        after_create :after_confirmation_user, if: :confirmed?
         #after_create :after_account_assignation
         #after_update :update_associated_services
 
@@ -116,7 +115,7 @@ module Lesli
             self.set_alias
 
             # create user details
-            #User::Detail.find_or_create_by({ user: self })
+            User::Detail.find_or_create_by({ user: self })
 
             # Minimum security settings required
             self.settings.create_with(:value => false).find_or_create_by(:name => "mfa_enabled")

data/app/operators/lesli/descriptor_privilege_operator.rb

@@ -65,7 +65,7 @@ module Lesli
         def add_owner_privileges(descriptor)
 
             # Adding default system actions for profile descriptor
-            actions = SystemController::Action.all
+            actions = SystemController::Action.all 
 
             actions.each do |action|
                 descriptor.privileges.find_or_create_by(action: action)

data/app/operators/lesli/{role_power_operator.rb → role_descriptor_operator.rb}

@@ -31,7 +31,7 @@ Building a better future, one line of code at a time.
 =end
 
 module Lesli
-    class RolePowerOperator < Lesli::ApplicationLesliService
+    class RoleDescriptorOperator < Lesli::ApplicationLesliService
 
         @roles;
 
@@ -48,6 +48,12 @@ module Lesli
             # is get the controllers and actions assigned to a descriptor through the 
             # system_descriptor_privileges table and create an array of hashes with
             # all the raw privileges (this includes duplicated privileges)
+            # IMPORTANT: A descriptor privilege is evaluated as active if:
+            #   - the role has assigned the descriptor through the power association
+            #   - the descriptor has assigned the privilege through the controller actions table
+            #   - the power has active that group of actions, this means that, if the power has
+            #     not marked as active the pshow, pindex, etc column the power is not active
+            #     even if it is assigned and active to a descriptor
             records = Descriptor.joins(%(
                 INNER JOIN lesli_descriptor_privileges
                 ON lesli_descriptor_privileges.descriptor_id = lesli_descriptors.id
@@ -60,12 +66,23 @@ module Lesli
             )).joins(%(
                 INNER JOIN lesli_role_powers 
                 ON lesli_role_powers.descriptor_id = lesli_descriptors.id
-            )).select(
-                "lesli_system_controllers.route as controller", 
-                "lesli_system_controller_actions.name as action",
-                "case when lesli_role_powers.deleted_at is null then true else false end as active",
-                "lesli_role_powers.role_id as role_id"
-            ).with_deleted
+            )).select(%(
+                lesli_system_controllers.route as controller, 
+                lesli_system_controller_actions.name as action,
+                case 
+                when lesli_role_powers.deleted_at is not null then false
+                when NULLIF(lesli_system_controller_actions.name = 'list' and lesli_role_powers.plist = true, false) then true
+                when NULLIF(lesli_system_controller_actions.name = 'index' and lesli_role_powers.pindex = true, false) then true
+                when NULLIF(lesli_system_controller_actions.name = 'show' and lesli_role_powers.pshow = true, false) then true
+                when NULLIF(lesli_system_controller_actions.name = 'new' and lesli_role_powers.pcreate = true, false) then true
+                when NULLIF(lesli_system_controller_actions.name = 'create' and lesli_role_powers.pcreate = true, false) then true
+                when NULLIF(lesli_system_controller_actions.name = 'edit' and lesli_role_powers.pupdate = true, false) then true
+                when NULLIF(lesli_system_controller_actions.name = 'update' and lesli_role_powers.pupdate = true, false) then true
+                when NULLIF(lesli_system_controller_actions.name = 'destroy' and lesli_role_powers.pdestroy = true, false) then true
+                else false 
+                end as active,
+                lesli_role_powers.role_id as role_id
+            )).with_deleted
 
 
             # get privileges only for the given role, this is needed to sync only modified roles

data/app/views/lesli/partials/_application-data.html.erb

@@ -34,11 +34,18 @@ Building a better future, one line of code at a time.
 
 <%
 
+# Should I move this to a base controller?
+
 # add company information (account)
 @lesli[:company] = {
     name: current_user.account.company_name,
 }
 
+# set user information
+@lesli[:current_user] = {
+    id: current_user.id
+}
+
 
 # Include defaults to account
 @lesli[:instance] = Rails.application.credentials.dig(:instance) || lesli_instance_code

data/app/views/lesli/partials/_application-lesli-engines.html.erb

@@ -49,9 +49,9 @@ Building a better future, one line of code at a time.
 
     <%# Productivity & teamwork %>
     <%= navigation_engine_driver %>
+    <%= navigation_engine_letter %>
     <%= navigation_engine_work %>
     <%= navigation_engine_focus %>
-    <%= navigation_engine_text %>
     <%= navigation_engine_social %>
     <%= navigation_engine_bell %>
     <%= navigation_engine_time %>
@@ -64,9 +64,9 @@ Building a better future, one line of code at a time.
 
     <%# IT & Help desk %>
     <%= navigation_engine_kb %>
-    <%= navigation_engine_help %>
     <%= navigation_engine_portal %>
     <%= navigation_engine_shared %>
+    <%= navigation_engine_support %>
 
     <%# Security & privacy %>
     <%= navigation_engine_audit %>