lesli_shield 1.1.0 → 1.1.2

data/app/controllers/lesli_shield/roles_controller.rb

@@ -32,16 +32,10 @@ Building a better future, one line of code at a time.
 
 module LesliShield
     class RolesController < ApplicationController
-        before_action :set_role, only: %i[ show update destroy ]
+        before_action :set_role, only: %i[ show update destroy deploy ]
 
         def deploy
-            pp params[:id]
-            pp params[:id]
-            pp params[:id]
-            pp params[:id]
-
-            RolePrivilegeService.new.synchronize(Lesli::Role.first)
-
+            RolePrivilegeService.new.synchronize(@role.result)
             respond_with_lesli(
                 :turbo => stream_notification_success("success")
             )

data/app/controllers/lesli_shield/sessions_controller.rb

@@ -1,64 +1,38 @@
 module LesliShield
-  class SessionsController < ApplicationController
-    before_action :set_session, only: %i[ show edit update destroy ]
-
-    # GET /sessions
-    def index
-        @sessions = respond_with_pagination(UserSessionService.new(current_user, query).index())
-        respond_with_lesli(
-            :html => @sessions,
-            :json => @sessions
-        )
-    end
-
-    # GET /sessions/1
-    def show
-    end
-
-    # GET /sessions/new
-    def new
-      @session = Session.new
-    end
-
-    # GET /sessions/1/edit
-    def edit
-    end
-
-    # POST /sessions
-    def create
-      @session = Session.new(session_params)
-
-      if @session.save
-        redirect_to @session, notice: "Session was successfully created."
-      else
-        render :new, status: :unprocessable_entity
-      end
-    end
-
-    # PATCH/PUT /sessions/1
-    def update
-      if @session.update(session_params)
-        redirect_to @session, notice: "Session was successfully updated.", status: :see_other
-      else
-        render :edit, status: :unprocessable_entity
-      end
+    class SessionsController < ApplicationController
+        before_action :set_session, only: %i[ show edit update destroy ]
+
+        # GET /sessions
+        def index
+            @sessions = respond_with_pagination(UserSessionService.new(current_user, query).index())
+            respond_with_lesli(
+                :html => @sessions,
+                :json => @sessions
+            )
+        end
+
+        # GET /sessions/1
+        def show
+        end
+
+        # PATCH/PUT /sessions/1
+        def update
+        end
+
+        # DELETE /sessions/1
+        def destroy
+        end
+
+        private
+
+        # Use callbacks to share common setup or constraints between actions.
+        def set_session
+            @session = Session.find(params.expect(:id))
+        end
+
+        # Only allow a list of trusted parameters through.
+        def session_params
+            params.fetch(:session, {})
+        end
     end
-
-    # DELETE /sessions/1
-    def destroy
-      @session.destroy!
-      redirect_to sessions_path, notice: "Session was successfully destroyed.", status: :see_other
-    end
-
-    private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_session
-        @session = Session.find(params.expect(:id))
-      end
-
-      # Only allow a list of trusted parameters through.
-      def session_params
-        params.fetch(:session, {})
-      end
-  end
 end

data/app/models/concerns/lesli_shield/user_security.rb

@@ -57,7 +57,7 @@ module LesliShield
                     active: true
                 ).exists?
             rescue => exception
-                L2.danger(exception.to_s)
+                Termline.danger(exception.to_s)
                 return false
             end
         end

data/app/services/lesli_shield/role_action_service.rb

@@ -21,20 +21,21 @@ module LesliShield
 
             Role::Action.with_deleted.joins(action: :parent)
             .where(:role_id => role_id)
+            .order('parents_lesli_resources.route')
             .select(
                 :id,
                 :role_id,
                 :deleted_at,
                 "parents_lesli_resources.id as controller_id",
                 "parents_lesli_resources.label as controller_name",
+                "parents_lesli_resources.route as controller_route",
                 "lesli_resources.action as action_name",
                 "lesli_resources.id as action_id",
                 "case when lesli_shield_role_actions.deleted_at is null then TRUE else FALSE end active"
             ).each do |action|
 
-                unless role_actions.has_key?(action[:controller_name])
-                    role_actions[action[:controller_name]] = {
-                        list:nil,
+                unless role_actions.has_key?(action[:controller_route])
+                    role_actions[action[:controller_route]] = {
                         index: nil,
                         show:nil,
                         create:nil,
@@ -43,28 +44,24 @@ module LesliShield
                     }
                 end
 
-                if  action[:action_name] == "list"
-                    role_actions[action[:controller_name]][:list] = clean(action)
-                end
-
                 if  action[:action_name] == "index"
-                    role_actions[action[:controller_name]][:index] = clean(action)
+                    role_actions[action[:controller_route]][:index] = clean(action)
                 end
 
                 if  action[:action_name] == "show"
-                    role_actions[action[:controller_name]][:show] = clean(action)
+                    role_actions[action[:controller_route]][:show] = clean(action)
                 end
 
                 if  action[:action_name] == "create"
-                    role_actions[action[:controller_name]][:create] = clean(action)
+                    role_actions[action[:controller_route]][:create] = clean(action)
                 end
 
                 if  action[:action_name] == "update"
-                    role_actions[action[:controller_name]][:update] = clean(action)
+                    role_actions[action[:controller_route]][:update] = clean(action)
                 end
 
                 if  action[:action_name] == "destroy"
-                    role_actions[action[:controller_name]][:destroy] = clean(action)
+                    role_actions[action[:controller_route]][:destroy] = clean(action)
                 end
             end
 

data/app/services/lesli_shield/role_privilege_service.rb

@@ -62,7 +62,7 @@ module LesliShield
                 lesli_shield_role_actions.role_id as role_id,
                 resource_controllers.route as controller, 
                 resource_actions.action as action,
-                lesli_shield_role_actions.deleted_at IS NULL as active
+                case when lesli_shield_role_actions.deleted_at is null then TRUE else FALSE end active
             )).with_deleted
 
             # get privileges only for the given role, this is needed to sync only modified roles

data/app/views/lesli_shield/role/actions/_form.html.erb

@@ -2,8 +2,6 @@
 <%
 columns = [{
     label: "Controller"
-}, {
-    label: "List"
 }, {
     label: "Index"
 }, {
@@ -14,8 +12,6 @@ columns = [{
     label: "Update"
 }, {
     label: "Destroy"
-}, {
-    label: ""
 }]
 %>
 

data/lib/lesli_shield/version.rb

@@ -1,4 +1,4 @@
 module LesliShield
-  VERSION = "1.1.0"
-  BUILD = "1774678451"
+  VERSION = "1.1.2"
+  BUILD = "1777694371"
 end

data/lib/tasks/lesli_shield_tasks.rake

@@ -39,10 +39,9 @@ namespace :lesli_shield do
 
     # Drop, build, migrate & seed database (development only)
     def lesli_shield_privileges
-
         Lesli::Role.all.each do |role|
-            L2.info("LesliShield: Syncing privileges for #{role.name} role.")
             LesliShield::RolePrivilegeService.new(nil).synchronize(role)
+            Termline.success("LesliShield: Syncing privileges for #{role.name} role.")
         end
     end
 end

data/readme.md

@@ -1,6 +1,6 @@
 <div align="center">
     <img width="100" alt="LesliShield logo" src="./app/assets/images/lesli_shield/shield-logo.svg" />
-    <h3 align="center">Administration area for the Lesli Framework.</h3>
+    <h3 align="center">Users & Security Management for the Lesli Framework.</h3>
 </div>
 
 <br />
@@ -33,15 +33,16 @@
 
 ### Installation
 
-```shell
+```ruby
+
 # Add LesliShield engine gem
 bundle add lesli_shield
 
+
 # Setup & initialize the database
 rake lesli:db:setup
-```
 
-```ruby
+
 # Load LesliShield engine
 Rails.application.routes.draw do
     mount LesliShield::Engine => "/shield"
@@ -49,12 +50,12 @@ end
 ```
 
 <br />
-<hr/>
+<hr />
 <br />
 
 ### Development 
 
-```shell
+```ruby
 # clone the lesli repo inside your engine folder: RailsApp/engines
 git clone https://github.com/LesliTech/LesliShield.git
 
@@ -70,7 +71,7 @@ rake lesli:db:setup
 ```
 
 <br />
-<hr/>
+<hr />
 <br />
 
 ### Demo
@@ -86,9 +87,9 @@ rake lesli:db:setup
 
 ### Connect with Lesli
 
-* [X: @LesliTech](https://x.com/LesliTech)
-* [Email: hello@lesli.tech](hello@lesli.tech)
-* [Website: https://www.lesli.tech](https://www.lesli.tech)
+* [@LesliTech](https://x.com/LesliTech)
+* [hello@lesli.tech](hello@lesli.tech)
+* [https://www.lesli.tech](https://www.lesli.tech)
 
 
 ### License
@@ -108,7 +109,6 @@ 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/.
 
-<br />
 <hr />
 <br />
 <br />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lesli_shield
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - The Lesli Development Team